From 64d353a1ee1b3642fa9b8e072f567b7ae980ffe5 Mon Sep 17 00:00:00 2001 From: roy_lee Date: Tue, 17 Apr 2018 17:13:00 +0800 Subject: [PATCH] [platform] correct SYS_OBJECT_ID and replace local file write API to one in onlplib. Signed-off-by: roy_lee --- .../onlp/builds/src/module/src/platform_lib.c | 31 +------------------ .../x86_64_accton_as7326_56x_r0/__init__.py | 2 +- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/onlp/builds/src/module/src/platform_lib.c b/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/onlp/builds/src/module/src/platform_lib.c index 2758d9b3..c3e61500 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/onlp/builds/src/module/src/platform_lib.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/onlp/builds/src/module/src/platform_lib.c @@ -5,41 +5,12 @@ #include "x86_64_accton_as7326_56x_log.h" -static int _onlp_file_write(char *filename, char *buffer, int buf_size, int data_len) -{ - int fd; - int len; - - if ((buffer == NULL) || (buf_size < 0)) { - return -1; - } - - if ((fd = open(filename, O_WRONLY, S_IWUSR)) == -1) { - return -1; - } - - if ((len = write(fd, buffer, buf_size)) < 0) { - close(fd); - return -1; - } - - if ((close(fd) == -1)) { - return -1; - } - - if ((len > buf_size) || (data_len != 0 && len != data_len)) { - return -1; - } - - return 0; -} - int onlp_file_write_integer(char *filename, int value) { char buf[8] = {0}; sprintf(buf, "%d", value); - return _onlp_file_write(filename, buf, (int)strlen(buf), 0); + return onlp_file_write((uint8_t*)buf, strlen(buf), filename); } int onlp_file_read_binary(char *filename, char *buffer, int buf_size, int data_len) diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/python/x86_64_accton_as7326_56x_r0/__init__.py b/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/python/x86_64_accton_as7326_56x_r0/__init__.py index 24e9a914..3f34ef71 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/python/x86_64_accton_as7326_56x_r0/__init__.py +++ b/packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/python/x86_64_accton_as7326_56x_r0/__init__.py @@ -6,7 +6,7 @@ class OnlPlatform_x86_64_accton_as7326_56x_r0(OnlPlatformAccton, PLATFORM='x86-64-accton-as7326-56x-r0' MODEL="AS7326-56X" - SYS_OBJECT_ID=".7326.54" + SYS_OBJECT_ID=".7326.56" def baseconfig(self): self.insmod('optoe')