From 58d6801e57c36cc4d5fd1a324f40ea1df109ca7f Mon Sep 17 00:00:00 2001 From: "shaohua.xiong" Date: Tue, 27 Feb 2018 18:42:15 +0800 Subject: [PATCH] modified the comment and module name for ag6248c and ag6248c_poe --- .../module/auto/arm_delta_ag6248c.yml | 30 +++--- .../inc/arm_delta_ag6248c/arm_delta_ag6248c.x | 7 +- .../arm_delta_ag6248c_config.h | 70 +++++++------- .../arm_delta_ag6248c/arm_delta_ag6248c_dox.h | 13 +-- .../arm_delta_ag6248c_porting.h | 96 +++++++++---------- .../module/src/arm_delta_ag6248c_config.c | 59 ++++++------ .../module/src/arm_delta_ag6248c_enums.c | 7 +- .../module/src/arm_delta_ag6248c_int.h | 13 +-- .../module/src/arm_delta_ag6248c_log.c | 13 +-- .../module/src/arm_delta_ag6248c_log.h | 13 +-- .../module/src/arm_delta_ag6248c_module.c | 10 +- .../module/src/arm_delta_ag6248c_ucli.c | 10 +- .../module/src/arm_delta_i2c.c | 11 +-- .../module/src/arm_delta_i2c.h | 10 +- .../src/arm_delta_ag6248c/module/src/fani.c | 4 +- .../module/src/platform_lib.c | 2 +- .../src/arm_delta_ag6248c/module/src/sysi.c | 8 +- 17 files changed, 149 insertions(+), 227 deletions(-) diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/auto/arm_delta_ag6248c.yml b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/auto/arm_delta_ag6248c.yml index 80f1a97d..c807d0c5 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/auto/arm_delta_ag6248c.yml +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/auto/arm_delta_ag6248c.yml @@ -1,13 +1,7 @@ ############################################################ # # -# Copyright 2014, 2015 Big Switch Networks, Inc. -# -# Licensed under the Eclipse Public License, Version 1.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.eclipse.org/legal/epl-v10.html +# Copyright 2018, Delta Networks, Inc. # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an @@ -23,39 +17,39 @@ ############################################################ cdefs: &cdefs -- ONLPSIM_CONFIG_INCLUDE_LOGGING: +- ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING: doc: "Include or exclude logging." default: 1 -- ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT: +- ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT: doc: "Default enabled log options." default: AIM_LOG_OPTIONS_DEFAULT -- ONLPSIM_CONFIG_LOG_BITS_DEFAULT: +- ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT: doc: "Default enabled log bits." default: AIM_LOG_BITS_DEFAULT -- ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT: +- ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT: doc: "Default enabled custom log bits." default: 0 -- ONLPSIM_CONFIG_PORTING_STDLIB: +- ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB: doc: "Default all porting macros to use the C standard libraries." default: 1 -- ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS: +- ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS: doc: "Include standard library headers for stdlib porting macros." - default: ONLPSIM_CONFIG_PORTING_STDLIB -- ONLPSIM_CONFIG_INCLUDE_UCLI: + default: ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB +- ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI: doc: "Include generic uCli support." default: 0 -- ONLPSIM_CONFIG_SFP_COUNT: +- ARM_DELTA_AG6248C_CONFIG_SFP_COUNT: doc: "SFP Count." default: 0 definitions: cdefs: - ONLPSIM_CONFIG_HEADER: + ARM_DELTA_AG6248C_CONFIG_HEADER: defs: *cdefs basename: arm_delta_ag6248c_config portingmacro: - ONLPSIM: + ARM_DELTA_AG6248C: macros: - malloc - free diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c.x b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c.x index f15500cc..fe36b7c6 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c.x +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c.x @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_config.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_config.h index 68664185..33b217e1 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_config.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_config.h @@ -1,14 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html - * + * Copyright 2018, Delta Networks, Inc. + * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, @@ -32,96 +26,96 @@ * @{ * *****************************************************************************/ -#ifndef __ONLPSIM_CONFIG_H__ -#define __ONLPSIM_CONFIG_H__ +#ifndef __ARM_DELTA_AG6248C_CONFIG_H__ +#define __ARM_DELTA_AG6248C_CONFIG_H__ #ifdef GLOBAL_INCLUDE_CUSTOM_CONFIG #include #endif -#ifdef ONLPSIM_INCLUDE_CUSTOM_CONFIG +#ifdef ARM_DELTA_AG6248C_INCLUDE_CUSTOM_CONFIG #include #endif -/* */ +/* */ #include /** - * ONLPSIM_CONFIG_INCLUDE_LOGGING + * ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING * * Include or exclude logging. */ -#ifndef ONLPSIM_CONFIG_INCLUDE_LOGGING -#define ONLPSIM_CONFIG_INCLUDE_LOGGING 1 +#ifndef ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING +#define ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING 1 #endif /** - * ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT + * ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT * * Default enabled log options. */ -#ifndef ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT -#define ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT +#ifndef ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT +#define ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT #endif /** - * ONLPSIM_CONFIG_LOG_BITS_DEFAULT + * ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT * * Default enabled log bits. */ -#ifndef ONLPSIM_CONFIG_LOG_BITS_DEFAULT -#define ONLPSIM_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT +#ifndef ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT +#define ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT #endif /** - * ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT + * ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT * * Default enabled custom log bits. */ -#ifndef ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT -#define ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0 +#ifndef ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT +#define ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0 #endif /** - * ONLPSIM_CONFIG_PORTING_STDLIB + * ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB * * Default all porting macros to use the C standard libraries. */ -#ifndef ONLPSIM_CONFIG_PORTING_STDLIB -#define ONLPSIM_CONFIG_PORTING_STDLIB 1 +#ifndef ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB +#define ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB 1 #endif /** - * ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS + * ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS * * Include standard library headers for stdlib porting macros. */ -#ifndef ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS -#define ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS ONLPSIM_CONFIG_PORTING_STDLIB +#ifndef ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS +#define ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB #endif /** - * ONLPSIM_CONFIG_INCLUDE_UCLI + * ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI * * Include generic uCli support. */ -#ifndef ONLPSIM_CONFIG_INCLUDE_UCLI -#define ONLPSIM_CONFIG_INCLUDE_UCLI 0 +#ifndef ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI +#define ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI 0 #endif /** - * ONLPSIM_CONFIG_SFP_COUNT + * ARM_DELTA_AG6248C_CONFIG_SFP_COUNT * * SFP Count. */ -#ifndef ONLPSIM_CONFIG_SFP_COUNT -#define ONLPSIM_CONFIG_SFP_COUNT 0 +#ifndef ARM_DELTA_AG6248C_CONFIG_SFP_COUNT +#define ARM_DELTA_AG6248C_CONFIG_SFP_COUNT 0 #endif @@ -154,9 +148,9 @@ const char* arm_delta_ag6248c_config_lookup(const char* setting); */ int arm_delta_ag6248c_config_show(struct aim_pvs_s* pvs); -/* */ +/* */ #include "arm_delta_ag6248c_porting.h" -#endif /* __ONLPSIM_CONFIG_H__ */ +#endif /* __ARM_DELTA_AG6248C_CONFIG_H__ */ /* @} */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_dox.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_dox.h index 20f312ed..bc2e4f7a 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_dox.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_dox.h @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -28,8 +23,8 @@ * arm_delta_ag6248c Doxygen Header * ***********************************************************/ -#ifndef __ONLPSIM_DOX_H__ -#define __ONLPSIM_DOX_H__ +#ifndef __ARM_DELTA_AG6248C_DOX_H__ +#define __ARM_DELTA_AG6248C_DOX_H__ /** * @defgroup arm_delta_ag6248c arm_delta_ag6248c - onlpsim Description @@ -48,4 +43,4 @@ The documentation overview for this module should go here. * */ -#endif /* __ONLPSIM_DOX_H__ */ +#endif /* __ARM_DELTA_AG6248C_DOX_H__ */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_porting.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_porting.h index 19853401..15f715f3 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_porting.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/inc/arm_delta_ag6248c/arm_delta_ag6248c_porting.h @@ -1,13 +1,7 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html + * Copyright 2018, Delta Networks, Inc. * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -32,12 +26,12 @@ * @{ * ***********************************************************/ -#ifndef __ONLPSIM_PORTING_H__ -#define __ONLPSIM_PORTING_H__ +#ifndef __ARM_DELTA_AG6248C_PORTING_H__ +#define __ARM_DELTA_AG6248C_PORTING_H__ /* */ -#if ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1 +#if ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1 #include #include #include @@ -45,88 +39,88 @@ #include #endif -#ifndef ONLPSIM_MALLOC +#ifndef ARM_DELTA_AG6248C_MALLOC #if defined(GLOBAL_MALLOC) - #define ONLPSIM_MALLOC GLOBAL_MALLOC - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_MALLOC malloc + #define ARM_DELTA_AG6248C_MALLOC GLOBAL_MALLOC + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_MALLOC malloc #else - #error The macro ONLPSIM_MALLOC is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_MALLOC is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_FREE +#ifndef ARM_DELTA_AG6248C_FREE #if defined(GLOBAL_FREE) - #define ONLPSIM_FREE GLOBAL_FREE - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_FREE free + #define ARM_DELTA_AG6248C_FREE GLOBAL_FREE + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_FREE free #else - #error The macro ONLPSIM_FREE is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_FREE is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_MEMSET +#ifndef ARM_DELTA_AG6248C_MEMSET #if defined(GLOBAL_MEMSET) - #define ONLPSIM_MEMSET GLOBAL_MEMSET - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_MEMSET memset + #define ARM_DELTA_AG6248C_MEMSET GLOBAL_MEMSET + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_MEMSET memset #else - #error The macro ONLPSIM_MEMSET is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_MEMSET is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_MEMCPY +#ifndef ARM_DELTA_AG6248C_MEMCPY #if defined(GLOBAL_MEMCPY) - #define ONLPSIM_MEMCPY GLOBAL_MEMCPY - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_MEMCPY memcpy + #define ARM_DELTA_AG6248C_MEMCPY GLOBAL_MEMCPY + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_MEMCPY memcpy #else - #error The macro ONLPSIM_MEMCPY is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_MEMCPY is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_STRNCPY +#ifndef ARM_DELTA_AG6248C_STRNCPY #if defined(GLOBAL_STRNCPY) - #define ONLPSIM_STRNCPY GLOBAL_STRNCPY - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_STRNCPY strncpy + #define ARM_DELTA_AG6248C_STRNCPY GLOBAL_STRNCPY + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_STRNCPY strncpy #else - #error The macro ONLPSIM_STRNCPY is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_STRNCPY is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_VSNPRINTF +#ifndef ARM_DELTA_AG6248C_VSNPRINTF #if defined(GLOBAL_VSNPRINTF) - #define ONLPSIM_VSNPRINTF GLOBAL_VSNPRINTF - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_VSNPRINTF vsnprintf + #define ARM_DELTA_AG6248C_VSNPRINTF GLOBAL_VSNPRINTF + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_VSNPRINTF vsnprintf #else - #error The macro ONLPSIM_VSNPRINTF is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_VSNPRINTF is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_SNPRINTF +#ifndef ARM_DELTA_AG6248C_SNPRINTF #if defined(GLOBAL_SNPRINTF) - #define ONLPSIM_SNPRINTF GLOBAL_SNPRINTF - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_SNPRINTF snprintf + #define ARM_DELTA_AG6248C_SNPRINTF GLOBAL_SNPRINTF + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_SNPRINTF snprintf #else - #error The macro ONLPSIM_SNPRINTF is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_SNPRINTF is required but cannot be defined. #endif #endif -#ifndef ONLPSIM_STRLEN +#ifndef ARM_DELTA_AG6248C_STRLEN #if defined(GLOBAL_STRLEN) - #define ONLPSIM_STRLEN GLOBAL_STRLEN - #elif ONLPSIM_CONFIG_PORTING_STDLIB == 1 - #define ONLPSIM_STRLEN strlen + #define ARM_DELTA_AG6248C_STRLEN GLOBAL_STRLEN + #elif ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB == 1 + #define ARM_DELTA_AG6248C_STRLEN strlen #else - #error The macro ONLPSIM_STRLEN is required but cannot be defined. + #error The macro ARM_DELTA_AG6248C_STRLEN is required but cannot be defined. #endif #endif /* */ -#endif /* __ONLPSIM_PORTING_H__ */ +#endif /* __ARM_DELTA_AG6248C_PORTING_H__ */ /* @} */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_config.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_config.c index 6447135c..e116934f 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_config.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_config.c @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -25,50 +20,50 @@ #include -/* */ +/* */ #define __arm_delta_ag6248c_config_STRINGIFY_NAME(_x) #_x #define __arm_delta_ag6248c_config_STRINGIFY_VALUE(_x) __arm_delta_ag6248c_config_STRINGIFY_NAME(_x) arm_delta_ag6248c_config_settings_t arm_delta_ag6248c_config_settings[] = { -#ifdef ONLPSIM_CONFIG_INCLUDE_LOGGING - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_INCLUDE_LOGGING), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_INCLUDE_LOGGING) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING) }, #else -{ ONLPSIM_CONFIG_INCLUDE_LOGGING(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_INCLUDE_LOGGING(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT) }, #else -{ ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_LOG_BITS_DEFAULT - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_BITS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_BITS_DEFAULT) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT) }, #else -{ ONLPSIM_CONFIG_LOG_BITS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT) }, #else -{ ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_PORTING_STDLIB - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_PORTING_STDLIB), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_PORTING_STDLIB) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB) }, #else -{ ONLPSIM_CONFIG_PORTING_STDLIB(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_PORTING_STDLIB(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) }, #else -{ ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_INCLUDE_UCLI - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_INCLUDE_UCLI), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_INCLUDE_UCLI) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI) }, #else -{ ONLPSIM_CONFIG_INCLUDE_UCLI(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif -#ifdef ONLPSIM_CONFIG_SFP_COUNT - { __arm_delta_ag6248c_config_STRINGIFY_NAME(ONLPSIM_CONFIG_SFP_COUNT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_SFP_COUNT) }, +#ifdef ARM_DELTA_AG6248C_CONFIG_SFP_COUNT + { __arm_delta_ag6248c_config_STRINGIFY_NAME(ARM_DELTA_AG6248C_CONFIG_SFP_COUNT), __arm_delta_ag6248c_config_STRINGIFY_VALUE(ARM_DELTA_AG6248C_CONFIG_SFP_COUNT) }, #else -{ ONLPSIM_CONFIG_SFP_COUNT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, +{ ARM_DELTA_AG6248C_CONFIG_SFP_COUNT(__arm_delta_ag6248c_config_STRINGIFY_NAME), "__undefined__" }, #endif { NULL, NULL } }; @@ -97,5 +92,5 @@ arm_delta_ag6248c_config_show(struct aim_pvs_s* pvs) return i; } -/* */ +/* */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_enums.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_enums.c index 2a14c2cc..f8b2d375 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_enums.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_enums.c @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_int.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_int.h index 8dfd2c7c..d87656ee 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_int.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_int.h @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -23,10 +18,10 @@ * ***********************************************************/ -#ifndef __ONLPSIM_INT_H__ -#define __ONLPSIM_INT_H__ +#ifndef __ARM_DELTA_AG6248C_INT_H__ +#define __ARM_DELTA_AG6248C_INT_H__ #include -#endif /* __ONLPSIM_INT_H__ */ +#endif /* __ARM_DELTA_AG6248C_INT_H__ */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.c index 1941f294..772566b5 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.c @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -30,9 +25,9 @@ * arm_delta_ag6248c log struct. */ AIM_LOG_STRUCT_DEFINE( - ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT, - ONLPSIM_CONFIG_LOG_BITS_DEFAULT, + ARM_DELTA_AG6248C_CONFIG_LOG_OPTIONS_DEFAULT, + ARM_DELTA_AG6248C_CONFIG_LOG_BITS_DEFAULT, NULL, /* Custom log map */ - ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT + ARM_DELTA_AG6248C_CONFIG_LOG_CUSTOM_BITS_DEFAULT ); diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.h index 13d00bc5..3d5d1e79 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_log.h @@ -1,13 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. + * Copyright 2018, Delta Networks, Inc. * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -23,10 +18,10 @@ * ***********************************************************/ -#ifndef __ONLPSIM_LOG_H__ -#define __ONLPSIM_LOG_H__ +#ifndef __ARM_DELTA_AG6248C_LOG_H__ +#define __ARM_DELTA_AG6248C_LOG_H__ #define AIM_LOG_MODULE_NAME arm_delta_ag6248c #include -#endif /* __ONLPSIM_LOG_H__ */ +#endif /* __ARM_DELTA_AG6248C_LOG_H__ */ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_module.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_module.c index fdb080f0..c2e8bad5 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_module.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_module.c @@ -1,13 +1,7 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html + * Copyright 2018, Delta Networks, Inc. * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -30,7 +24,7 @@ static int datatypes_init__(void) { -#define ONLPSIM_ENUMERATION_ENTRY(_enum_name, _desc) AIM_DATATYPE_MAP_REGISTER(_enum_name, _enum_name##_map, _desc, AIM_LOG_INTERNAL); +#define ARM_DELTA_AG6248C_ENUMERATION_ENTRY(_enum_name, _desc) AIM_DATATYPE_MAP_REGISTER(_enum_name, _enum_name##_map, _desc, AIM_LOG_INTERNAL); #include return 0; } diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_ucli.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_ucli.c index 4dbeeed0..b99ca825 100644 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_ucli.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_ag6248c_ucli.c @@ -1,13 +1,7 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html + * Copyright 2018, Delta Networks, Inc. * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -25,7 +19,7 @@ #include -#if ONLPSIM_CONFIG_INCLUDE_UCLI == 1 +#if ARM_DELTA_AG6248C_CONFIG_INCLUDE_UCLI == 1 #include #include diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.c index a7a83e0e..6a280e65 100755 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.c @@ -1,15 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * Copyright 2016 Accton Technology Corporation. - * Copyright 2017 Delta Networks, Inc - * Copyright 2017 Delta Networks, Inc - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html + * Copyright 2018 Delta Technology Corporation. + * Copyright 2018 Delta Networks, Inc * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.h b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.h index 76c35cbb..5b24b76d 100755 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.h +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/arm_delta_i2c.h @@ -1,14 +1,8 @@ /************************************************************ * * - * Copyright 2014, 2015 Big Switch Networks, Inc. - * Copyright 2016 Accton Technology Corporation. - * Copyright 2017 Delta Networks, Inc - * Licensed under the Eclipse Public License, Version 1.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.eclipse.org/legal/epl-v10.html + * Copyright 2018 Delta Technology Corporation. + * Copyright 2018 Delta Networks, Inc * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/fani.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/fani.c index b0c16526..e511eca6 100755 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/fani.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/fani.c @@ -64,7 +64,7 @@ enum onlp_fan_id #define MAKE_FAN_INFO_NODE_ON_MAIN_BOARD(id) \ { \ { ONLP_FAN_ID_CREATE(FAN_##id##_ON_MAIN_BOARD), "Chassis Fan "#id, 0 }, \ - ONLP_FAN_STATUS_B2F | ONLP_FAN_STATUS_PRESENT, \ + ONLP_FAN_STATUS_F2B | ONLP_FAN_STATUS_PRESENT, \ (ONLP_FAN_CAPS_SET_PERCENTAGE |ONLP_FAN_CAPS_SET_RPM| ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE), \ 0, \ 0, \ @@ -74,7 +74,7 @@ enum onlp_fan_id #define MAKE_FAN_INFO_NODE_ON_PSU(psu_id, fan_id) \ { \ { ONLP_FAN_ID_CREATE(FAN_##fan_id##_ON_PSU##psu_id), "Chassis PSU-"#psu_id " Fan "#fan_id, 0 }, \ - ONLP_FAN_STATUS_B2F | ONLP_FAN_STATUS_PRESENT, \ + ONLP_FAN_STATUS_F2B | ONLP_FAN_STATUS_PRESENT, \ (ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE), \ 0, \ 0, \ diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/platform_lib.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/platform_lib.c index 118cc437..a5b27735 100755 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/platform_lib.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/platform_lib.c @@ -37,7 +37,7 @@ psu_type_t get_psu_type(int id) { if ((id == PSU1_ID)||(id == PSU2_ID)) - return PSU_TYPE_AC_B2F; + return PSU_TYPE_AC_F2B; return PSU_TYPE_UNKNOWN; } diff --git a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/sysi.c b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/sysi.c index b8b0adec..649a4e04 100755 --- a/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/sysi.c +++ b/packages/platforms/delta/armel/arm-delta-ag6248c/src/arm_delta_ag6248c/module/src/sysi.c @@ -165,13 +165,13 @@ onlp_sysi_platform_manage_fans(void) } /* Get temperature */ - rc = onlp_thermali_info_get(ONLP_THERMAL_ID_CREATE(1), &ti1); + rc = onlp_thermal_info_get(ONLP_THERMAL_ID_CREATE(1), &ti1); if (rc != ONLP_STATUS_OK) { return rc; } - rc = onlp_thermali_info_get(ONLP_THERMAL_ID_CREATE(2), &ti2); + rc = onlp_thermal_info_get(ONLP_THERMAL_ID_CREATE(2), &ti2); if (rc != ONLP_STATUS_OK) { return rc; @@ -192,8 +192,8 @@ onlp_sysi_platform_manage_fans(void) return ONLP_STATUS_OK; } - onlp_fani_rpm_set(ONLP_FAN_ID_CREATE(1),new_rpm); - onlp_fani_rpm_set(ONLP_FAN_ID_CREATE(2),new_rpm); + onlp_fan_rpm_set(ONLP_FAN_ID_CREATE(1),new_rpm); + onlp_fan_rpm_set(ONLP_FAN_ID_CREATE(2),new_rpm); return ONLP_STATUS_OK;