From e3b4724d8dd8101d3def5e6cbcea6d02113557cc Mon Sep 17 00:00:00 2001 From: Brandon Chuang Date: Wed, 20 Sep 2017 15:13:56 +0800 Subject: [PATCH] [as5916-54x] Modify source code to follow coding standards --- .../x86_64_accton_as5916_54x_config.h | 60 +++++++++---------- .../x86_64_accton_as5916_54x_dox.h | 6 +- .../x86_64_accton_as5916_54x_porting.h | 24 ++++---- .../onlp/builds/src/module/src/fani.c | 51 ---------------- .../onlp/builds/src/module/src/ledi.c | 9 --- .../src/x86_64_accton_as5916_54x_config.c | 48 +++++++-------- .../module/src/x86_64_accton_as5916_54x_log.c | 6 +- 7 files changed, 72 insertions(+), 132 deletions(-) diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_config.h b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_config.h index 15a5af00..43572880 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_config.h +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_config.h @@ -7,96 +7,96 @@ * @{ * *****************************************************************************/ -#ifndef __x86_64_accton_as5916_54x_CONFIG_H__ -#define __x86_64_accton_as5916_54x_CONFIG_H__ +#ifndef __X86_64_ACCTON_AS5916_54X_CONFIG_H__ +#define __X86_64_ACCTON_AS5916_54X_CONFIG_H__ #ifdef GLOBAL_INCLUDE_CUSTOM_CONFIG #include #endif -#ifdef x86_64_accton_as5916_54x_INCLUDE_CUSTOM_CONFIG +#ifdef X86_64_ACCTON_AS5916_54X_INCLUDE_CUSTOM_CONFIG #include #endif -/* */ +/* */ #include /** - * x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING + * X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING * * Include or exclude logging. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING -#define x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING 1 +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING +#define X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING 1 #endif /** - * x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT + * X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT * * Default enabled log options. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT -#define x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT +#define X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT #endif /** - * x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT + * X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT * * Default enabled log bits. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT -#define x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT +#define X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT #endif /** - * x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT + * X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT * * Default enabled custom log bits. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT -#define x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0 +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT +#define X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0 #endif /** - * x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB + * X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB * * Default all porting macros to use the C standard libraries. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB -#define x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB 1 +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB +#define X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB 1 #endif /** - * x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS + * X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS * * Include standard library headers for stdlib porting macros. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS -#define x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS +#define X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB #endif /** - * x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI + * X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI * * Include generic uCli support. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI -#define x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI 0 +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI +#define X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI 0 #endif /** - * x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION + * X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION * * Assume chassis fan direction is the same as the PSU fan direction. */ -#ifndef x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION -#define x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION 0 +#ifndef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION +#define X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION 0 #endif @@ -129,9 +129,9 @@ const char* x86_64_accton_as5916_54x_config_lookup(const char* setting); */ int x86_64_accton_as5916_54x_config_show(struct aim_pvs_s* pvs); -/* */ +/* */ #include "x86_64_accton_as5916_54x_porting.h" -#endif /* __x86_64_accton_as5916_54x_CONFIG_H__ */ +#endif /* __X86_64_ACCTON_AS5916_54X_CONFIG_H__ */ /* @} */ diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_dox.h b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_dox.h index 85d980e3..67e69645 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_dox.h +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_dox.h @@ -3,8 +3,8 @@ * x86_64_accton_as5916_54x Doxygen Header * *****************************************************************************/ -#ifndef __x86_64_accton_as5916_54x_DOX_H__ -#define __x86_64_accton_as5916_54x_DOX_H__ +#ifndef __X86_64_ACCTON_AS5916_54X_DOX_H__ +#define __X86_64_ACCTON_AS5916_54X_DOX_H__ /** * @defgroup x86_64_accton_as5916_54x x86_64_accton_as5916_54x - x86_64_accton_as5916_54x Description @@ -23,4 +23,4 @@ The documentation overview for this module should go here. * */ -#endif /* __x86_64_accton_as5916_54x_DOX_H__ */ +#endif /* __X86_64_ACCTON_AS5916_54X_DOX_H__ */ diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_porting.h b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_porting.h index adf4e952..e7dcddc8 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_porting.h +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/inc/x86_64_accton_as5916_54x/x86_64_accton_as5916_54x_porting.h @@ -7,12 +7,12 @@ * @{ * *****************************************************************************/ -#ifndef __x86_64_accton_as5916_54x_PORTING_H__ -#define __x86_64_accton_as5916_54x_PORTING_H__ +#ifndef __X86_64_ACCTON_AS5916_54X_PORTING_H__ +#define __X86_64_ACCTON_AS5916_54X_PORTING_H__ /* */ -#if x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1 +#if X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1 #include #include #include @@ -23,7 +23,7 @@ #ifndef x86_64_accton_as5916_54x_MALLOC #if defined(GLOBAL_MALLOC) #define x86_64_accton_as5916_54x_MALLOC GLOBAL_MALLOC - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_MALLOC malloc #else #error The macro x86_64_accton_as5916_54x_MALLOC is required but cannot be defined. @@ -33,7 +33,7 @@ #ifndef x86_64_accton_as5916_54x_FREE #if defined(GLOBAL_FREE) #define x86_64_accton_as5916_54x_FREE GLOBAL_FREE - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_FREE free #else #error The macro x86_64_accton_as5916_54x_FREE is required but cannot be defined. @@ -43,7 +43,7 @@ #ifndef x86_64_accton_as5916_54x_MEMSET #if defined(GLOBAL_MEMSET) #define x86_64_accton_as5916_54x_MEMSET GLOBAL_MEMSET - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_MEMSET memset #else #error The macro x86_64_accton_as5916_54x_MEMSET is required but cannot be defined. @@ -53,7 +53,7 @@ #ifndef x86_64_accton_as5916_54x_MEMCPY #if defined(GLOBAL_MEMCPY) #define x86_64_accton_as5916_54x_MEMCPY GLOBAL_MEMCPY - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_MEMCPY memcpy #else #error The macro x86_64_accton_as5916_54x_MEMCPY is required but cannot be defined. @@ -63,7 +63,7 @@ #ifndef x86_64_accton_as5916_54x_STRNCPY #if defined(GLOBAL_STRNCPY) #define x86_64_accton_as5916_54x_STRNCPY GLOBAL_STRNCPY - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_STRNCPY strncpy #else #error The macro x86_64_accton_as5916_54x_STRNCPY is required but cannot be defined. @@ -73,7 +73,7 @@ #ifndef x86_64_accton_as5916_54x_VSNPRINTF #if defined(GLOBAL_VSNPRINTF) #define x86_64_accton_as5916_54x_VSNPRINTF GLOBAL_VSNPRINTF - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_VSNPRINTF vsnprintf #else #error The macro x86_64_accton_as5916_54x_VSNPRINTF is required but cannot be defined. @@ -83,7 +83,7 @@ #ifndef x86_64_accton_as5916_54x_SNPRINTF #if defined(GLOBAL_SNPRINTF) #define x86_64_accton_as5916_54x_SNPRINTF GLOBAL_SNPRINTF - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_SNPRINTF snprintf #else #error The macro x86_64_accton_as5916_54x_SNPRINTF is required but cannot be defined. @@ -93,7 +93,7 @@ #ifndef x86_64_accton_as5916_54x_STRLEN #if defined(GLOBAL_STRLEN) #define x86_64_accton_as5916_54x_STRLEN GLOBAL_STRLEN - #elif x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB == 1 + #elif X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB == 1 #define x86_64_accton_as5916_54x_STRLEN strlen #else #error The macro x86_64_accton_as5916_54x_STRLEN is required but cannot be defined. @@ -103,5 +103,5 @@ /* */ -#endif /* __x86_64_accton_as5916_54x_PORTING_H__ */ +#endif /* __X86_64_ACCTON_AS5916_54X_PORTING_H__ */ /* @} */ diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/fani.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/fani.c index d8319a0d..6e990cfd 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/fani.c @@ -252,20 +252,6 @@ onlp_fani_info_get(onlp_oid_t id, onlp_fan_info_t* info) return rc; } -/* - * This function sets the speed of the given fan in RPM. - * - * This function will only be called if the fan supprots the RPM_SET - * capability. - * - * It is optional if you have no fans at all with this feature. - */ -int -onlp_fani_rpm_set(onlp_oid_t id, int rpm) -{ - return ONLP_STATUS_E_UNSUPPORTED; -} - /* * This function sets the fan speed of the given OID as a percentage. * @@ -315,40 +301,3 @@ onlp_fani_percentage_set(onlp_oid_t id, int p) return ONLP_STATUS_OK; } - -/* - * This function sets the fan speed of the given OID as per - * the predefined ONLP fan speed modes: off, slow, normal, fast, max. - * - * Interpretation of these modes is up to the platform. - * - */ -int -onlp_fani_mode_set(onlp_oid_t id, onlp_fan_mode_t mode) -{ - return ONLP_STATUS_E_UNSUPPORTED; -} - -/* - * This function sets the fan direction of the given OID. - * - * This function is only relevant if the fan OID supports both direction - * capabilities. - * - * This function is optional unless the functionality is available. - */ -int -onlp_fani_dir_set(onlp_oid_t id, onlp_fan_dir_t dir) -{ - return ONLP_STATUS_E_UNSUPPORTED; -} - -/* - * Generic fan ioctl. Optional. - */ -int -onlp_fani_ioctl(onlp_oid_t id, va_list vargs) -{ - return ONLP_STATUS_E_UNSUPPORTED; -} - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/ledi.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/ledi.c index 31a17cc1..4cb41893 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/ledi.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/ledi.c @@ -245,12 +245,3 @@ onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode) return ONLP_STATUS_OK; } -/* - * Generic LED ioctl interface. - */ -int -onlp_ledi_ioctl(onlp_oid_t id, va_list vargs) -{ - return ONLP_STATUS_E_UNSUPPORTED; -} - diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_config.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_config.c index 7f36f202..3579a89f 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_config.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_config.c @@ -10,45 +10,45 @@ #define __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(_x) __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(_x) x86_64_accton_as5916_54x_config_settings_t x86_64_accton_as5916_54x_config_settings[] = { -#ifdef x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING) }, #else -{ x86_64_accton_as5916_54x_CONFIG_INCLUDE_LOGGING(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_LOGGING(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT) }, #else -{ x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT) }, #else -{ x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT) }, #else -{ x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB) }, #else -{ x86_64_accton_as5916_54x_CONFIG_PORTING_STDLIB(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_STDLIB(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) }, #else -{ x86_64_accton_as5916_54x_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI) }, #else -{ x86_64_accton_as5916_54x_CONFIG_INCLUDE_UCLI(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_UCLI(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION - { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION) }, +#ifdef X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION + { __x86_64_accton_as5916_54x_config_STRINGIFY_NAME(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION), __x86_64_accton_as5916_54x_config_STRINGIFY_VALUE(X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION) }, #else -{ x86_64_accton_as5916_54x_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, +{ X86_64_ACCTON_AS5916_54X_CONFIG_INCLUDE_DEFAULT_FAN_DIRECTION(__x86_64_accton_as5916_54x_config_STRINGIFY_NAME), "__undefined__" }, #endif { NULL, NULL } }; diff --git a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_log.c b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_log.c index 99398f5a..1537e358 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_log.c +++ b/packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/onlp/builds/src/module/src/x86_64_accton_as5916_54x_log.c @@ -10,9 +10,9 @@ * x86_64_accton_as5916_54x log struct. */ AIM_LOG_STRUCT_DEFINE( - x86_64_accton_as5916_54x_CONFIG_LOG_OPTIONS_DEFAULT, - x86_64_accton_as5916_54x_CONFIG_LOG_BITS_DEFAULT, + X86_64_ACCTON_AS5916_54X_CONFIG_LOG_OPTIONS_DEFAULT, + X86_64_ACCTON_AS5916_54X_CONFIG_LOG_BITS_DEFAULT, NULL, /* Custom log map */ - x86_64_accton_as5916_54x_CONFIG_LOG_CUSTOM_BITS_DEFAULT + X86_64_ACCTON_AS5916_54X_CONFIG_LOG_CUSTOM_BITS_DEFAULT );