From 305cd0b696da1c5f009bb7ebd5ce89db0db354d2 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Sun, 25 Dec 2016 21:34:35 +0000 Subject: [PATCH] - Use the new search syntax for locating the device files Allows compatibility between kernels with different sysfs paths. --- .../onlp/builds/src/module/src/thermali.c | 63 ++++--------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/onlp/builds/src/module/src/thermali.c b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/onlp/builds/src/module/src/thermali.c index 81fc220f..425f348e 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/onlp/builds/src/module/src/thermali.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/onlp/builds/src/module/src/thermali.c @@ -29,10 +29,6 @@ #include #include -#define prefix_path "/sys/bus/i2c/devices/" -#define filename "temp1_input" -#define LOCAL_DEBUG 0 - #define VALIDATE(_id) \ do { \ if(!ONLP_OID_IS_THERMAL(_id)) { \ @@ -41,22 +37,7 @@ } while(0) -#define OPEN_READ_FILE(fd,fullpath,data,nbytes,len) \ - if (LOCAL_DEBUG) \ - printf("[Debug][%s][%d][openfile: %s]\n", __FUNCTION__, __LINE__, fullpath); \ - if ((fd = open(fullpath, O_RDONLY)) == -1) \ - return ONLP_STATUS_E_INTERNAL; \ - if ((len = read(fd, r_data, nbytes)) <= 0){ \ - close(fd); \ - return ONLP_STATUS_E_INTERNAL;} \ - if (LOCAL_DEBUG) \ - printf("[Debug][%s][%d][read data: %s]\n", __FUNCTION__, __LINE__, r_data); \ - if (close(fd) == -1) \ - return ONLP_STATUS_E_INTERNAL - - -enum onlp_thermal_id -{ +enum onlp_thermal_id { THERMAL_RESERVED = 0, THERMAL_CPU_CORE, THERMAL_1_ON_MAIN_BROAD, @@ -66,23 +47,22 @@ enum onlp_thermal_id THERMAL_1_ON_PSU2, }; -static char* last_path[] = /* must map with onlp_thermal_id */ -{ +static char* devfiles[] = { /* must map with onlp_thermal_id */ "reserved", NULL, /* CPU_CORE files */ - "61-0048/", - "62-0049/", - "63-004a/", - "57-003c/psu_", - "58-003f/psu_", + "/sys/bus/i2c/devices/61-0048*temp1_input", + "/sys/bus/i2c/devices/62-0049*temp1_input", + "/sys/bus/i2c/devices/63-004a*temp1_input", + "/sys/bus/i2c/devices/57-003c*psu_temp1_input", + "/sys/bus/i2c/devices/58-003f*psu_temp1_input", }; static char* cpu_coretemp_files[] = { - "/sys/devices/platform/coretemp.0/temp2_input", - "/sys/devices/platform/coretemp.0/temp3_input", - "/sys/devices/platform/coretemp.0/temp4_input", - "/sys/devices/platform/coretemp.0/temp5_input", + "/sys/devices/platform/coretemp.0*temp2_input", + "/sys/devices/platform/coretemp.0*temp3_input", + "/sys/devices/platform/coretemp.0*temp4_input", + "/sys/devices/platform/coretemp.0*temp5_input", NULL, }; @@ -141,16 +121,11 @@ onlp_thermali_init(void) int onlp_thermali_info_get(onlp_oid_t id, onlp_thermal_info_t* info) { - int fd, len, nbytes = 10, temp_base=1, local_id; - char r_data[10] = {0}; - char fullpath[50] = {0}; + int local_id; VALIDATE(id); local_id = ONLP_OID_ID_GET(id); - if (LOCAL_DEBUG) - printf("\n[Debug][%s][%d][local_id: %d]", __FUNCTION__, __LINE__, local_id); - /* Set the onlp_oid_hdr_t and capabilities */ *info = linfo[local_id]; @@ -159,17 +134,5 @@ onlp_thermali_info_get(onlp_oid_t id, onlp_thermal_info_t* info) return rv; } - /* get fullpath */ - sprintf(fullpath, "%s%s%s", prefix_path, last_path[local_id], filename); - - OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len); - - info->mcelsius = atoi(r_data)/temp_base; - - if (LOCAL_DEBUG) - printf("\n[Debug][%s][%d][save data: %d]\n", __FUNCTION__, __LINE__, info->mcelsius); - - return ONLP_STATUS_OK; + return onlp_file_read_int(&info->mcelsius, devfiles[local_id]); } - -