From e8e56ceb3ad686278432ca3a9a2b590ba2d976b6 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Thu, 12 Jan 2017 21:21:33 +0000
Subject: [PATCH] Use directory search spec.

---
 .../onlp/builds/src/module/src/thermali.c     | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/onlp/builds/src/module/src/thermali.c b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/onlp/builds/src/module/src/thermali.c
index c3daba65..479c5722 100644
--- a/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/onlp/builds/src/module/src/thermali.c
+++ b/packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/onlp/builds/src/module/src/thermali.c
@@ -28,8 +28,8 @@
 #include <onlp/platformi/thermali.h>
 #include <fcntl.h>
 #include "platform_lib.h"
+#include <onlplib/file.h>
 
-#define prefix_path "/sys/bus/i2c/devices/"
 
 #define VALIDATE(_id)                           \
     do {                                        \
@@ -38,17 +38,6 @@
         }                                       \
     } while(0)
 
-#define OPEN_READ_FILE(fd,fullpath,data,nbytes,len) \
-    DEBUG_PRINT("[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;}         \
-    DEBUG_PRINT("[Debug][%s][%d][read data: %s]\n", __FUNCTION__, __LINE__, r_data); \
-    if (close(fd) == -1)                        \
-        return ONLP_STATUS_E_INTERNAL
-
 enum onlp_thermal_id
 {
     THERMAL_RESERVED = 0,
@@ -59,14 +48,14 @@ enum onlp_thermal_id
     THERMAL_1_ON_PSU2,
 };
 
-static char last_path[][30] =  /* must map with onlp_thermal_id */
+static char* devfiles__[] =  /* must map with onlp_thermal_id */
 {
     "reserved",
-    "10-0048/temp1_input",
-    "10-0049/temp1_input",
-    "10-004a/temp1_input",
-    "18-005b/psu_temp1_input",
-    "17-0058/psu_temp1_input",
+    "/sys/bus/i2c/devices/10-0048*temp1_input",
+    "/sys/bus/i2c/devices/10-0049*temp1_input",
+    "/sys/bus/i2c/devices/10-004a*temp1_input",
+    "/sys/bus/i2c/devices/18-005b*psu_temp1_input",
+    "/sys/bus/i2c/devices/17-0058*psu_temp1_input",
 };
 
 /* Static values */
@@ -116,24 +105,10 @@ 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);
-    DEBUG_PRINT("\n[Debug][%s][%d][local_id: %d]", __FUNCTION__, __LINE__, local_id);
-
-    /* get fullpath */
-    sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
-
     /* Set the onlp_oid_hdr_t and capabilities */
     *info = linfo[local_id];
-
-    OPEN_READ_FILE(fd, fullpath, r_data, nbytes, len);
-    info->mcelsius = atoi(r_data) / temp_base;
-    DEBUG_PRINT("\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]);
 }
-