From 2493d3c0796087001f5d508f9a1ea02d24a2f1c7 Mon Sep 17 00:00:00 2001
From: Jostar Yang <jostar_yang@accton.com>
Date: Mon, 29 Jul 2019 18:12:26 +0800
Subject: [PATCH] Modify read sys eeprom from byte mode

---
 .../x86_64_accton_asgvolt64/module/src/sysi.c | 31 +++++++++++++------
 .../x86_64_accton_asgvolt64_r0/__init__.py    |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/platforms/accton/x86-64/asgvolt64/onlp/builds/x86_64_accton_asgvolt64/module/src/sysi.c b/packages/platforms/accton/x86-64/asgvolt64/onlp/builds/x86_64_accton_asgvolt64/module/src/sysi.c
index 6f521b9d..37b43b1d 100755
--- a/packages/platforms/accton/x86-64/asgvolt64/onlp/builds/x86_64_accton_asgvolt64/module/src/sysi.c
+++ b/packages/platforms/accton/x86-64/asgvolt64/onlp/builds/x86_64_accton_asgvolt64/module/src/sysi.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <onlplib/i2c.h>
 #include <onlplib/file.h>
 #include <onlp/platformi/sysi.h>
 #include <onlp/platformi/ledi.h>
@@ -56,7 +57,7 @@ onlp_sysi_init(void)
     }
     memset(interface, 0x0, 64);
     strncpy(interface, "eth0", strlen("eth0"));
-	strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+    strncpy(ifr.ifr_name, interface, IFNAMSIZ);
     if (ioctl(skfd, SIOCGMIIPHY, &ifr) < 0) {
         if (errno != ENODEV)
             fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n",
@@ -78,17 +79,29 @@ onlp_sysi_init(void)
 int
 onlp_sysi_onie_data_get(uint8_t** data, int* size)
 {
-    uint8_t* rdata = aim_zmalloc(512);
-    if(onlp_file_read(rdata, 512, size, IDPROM_PATH) == ONLP_STATUS_OK) {
-        if(*size == 512) {
-            *data = rdata;
-            return ONLP_STATUS_OK;
+    int ret = ONLP_STATUS_OK;
+    int i = 0;
+    uint8_t* rdata = aim_zmalloc(256);
+  
+    for (i = 0; i < 128; i++) {
+        ret = onlp_i2c_readw(0, 0x57, i*2, ONLP_I2C_F_FORCE);
+        if (ret < 0) {
+            printf ("i=%d, ret<0\n",i);
+            perror("perror:");  
+            printf("strerror:%s\n", strerror(errno));
+            aim_free(rdata);
+            *size = 0;
+            return ret;
         }
+
+        rdata[i*2]   = ret & 0xff;
+        rdata[i*2+1] = (ret >> 8) & 0xff;
     }
 
-    aim_free(rdata);
-    *size = 0;
-    return ONLP_STATUS_E_INTERNAL;
+    *size = 256;
+    *data = rdata;
+
+    return ONLP_STATUS_OK;
 }
 
 int
diff --git a/packages/platforms/accton/x86-64/asgvolt64/platform-config/r0/src/python/x86_64_accton_asgvolt64_r0/__init__.py b/packages/platforms/accton/x86-64/asgvolt64/platform-config/r0/src/python/x86_64_accton_asgvolt64_r0/__init__.py
index 6b4e9af0..b1625628 100755
--- a/packages/platforms/accton/x86-64/asgvolt64/platform-config/r0/src/python/x86_64_accton_asgvolt64_r0/__init__.py
+++ b/packages/platforms/accton/x86-64/asgvolt64/platform-config/r0/src/python/x86_64_accton_asgvolt64_r0/__init__.py
@@ -113,7 +113,7 @@ class OnlPlatform_x86_64_accton_asgvolt64_r0(OnlPlatformAccton,
             self.new_i2c_device('optoe2', 0x50, port)
             subprocess.call('echo port%d > /sys/bus/i2c/devices/%d-0050/port_name' % (port+41, port), shell=True)
         # initiate IDPROM
-        self.new_i2c_device('24c02', 0x57, 0)
+        #self.new_i2c_device('24c02', 0x57, 0)
         
         ir3570_check()