More Module Autogen and Toolchain Cleanup.

- Remove usage of strncpy and require aim_strlcpy instead.
- Fix some broken module autogen files.
This commit is contained in:
Jeffrey Townsend
2019-07-30 19:13:47 +00:00
parent 01d1564b84
commit 1f26352e94
380 changed files with 1503 additions and 2556 deletions

View File

@@ -24,45 +24,44 @@
############################################################
cdefs: &cdefs
- ONLPSIM_CONFIG_INCLUDE_LOGGING:
- ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING:
doc: "Include or exclude logging."
default: 1
- ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT:
- ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT:
doc: "Default enabled log options."
default: AIM_LOG_OPTIONS_DEFAULT
- ONLPSIM_CONFIG_LOG_BITS_DEFAULT:
- ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT:
doc: "Default enabled log bits."
default: AIM_LOG_BITS_DEFAULT
- ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT:
- ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT:
doc: "Default enabled custom log bits."
default: 0
- ONLPSIM_CONFIG_PORTING_STDLIB:
- ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB:
doc: "Default all porting macros to use the C standard libraries."
default: 1
- ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS:
- ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_PORTING_STDLIB
- ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI:
doc: "Include generic uCli support."
default: 0
- ONLPSIM_CONFIG_SFP_COUNT:
- ARM_ACCTON_AS4610_CONFIG_SFP_COUNT:
doc: "SFP Count."
default: 0
definitions:
cdefs:
ONLPSIM_CONFIG_HEADER:
ARM_ACCTON_AS4610_CONFIG_HEADER:
defs: *cdefs
basename: arm_accton_as4610_config
portingmacro:
ONLPSIM:
ARM_ACCTON_AS4610:
macros:
- malloc
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -32,96 +32,96 @@
* @{
*
*****************************************************************************/
#ifndef __ONLPSIM_CONFIG_H__
#define __ONLPSIM_CONFIG_H__
#ifndef __ARM_ACCTON_AS4610_CONFIG_H__
#define __ARM_ACCTON_AS4610_CONFIG_H__
#ifdef GLOBAL_INCLUDE_CUSTOM_CONFIG
#include <global_custom_config.h>
#endif
#ifdef ONLPSIM_INCLUDE_CUSTOM_CONFIG
#ifdef ARM_ACCTON_AS4610_INCLUDE_CUSTOM_CONFIG
#include <arm_accton_as4610_custom_config.h>
#endif
/* <auto.start.cdefs(ONLPSIM_CONFIG_HEADER).header> */
/* <auto.start.cdefs(ARM_ACCTON_AS4610_CONFIG_HEADER).header> */
#include <AIM/aim.h>
/**
* ONLPSIM_CONFIG_INCLUDE_LOGGING
* ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING
*
* Include or exclude logging. */
#ifndef ONLPSIM_CONFIG_INCLUDE_LOGGING
#define ONLPSIM_CONFIG_INCLUDE_LOGGING 1
#ifndef ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING
#define ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING 1
#endif
/**
* ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT
* ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT
#define ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT AIM_LOG_OPTIONS_DEFAULT
#endif
/**
* ONLPSIM_CONFIG_LOG_BITS_DEFAULT
* ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT
#define ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT AIM_LOG_BITS_DEFAULT
#endif
/**
* ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT
* ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT
#define ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT 0
#endif
/**
* ONLPSIM_CONFIG_PORTING_STDLIB
* ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_PORTING_STDLIB
#define ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB 1
#endif
/**
* ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
* ARM_ACCTON_AS4610_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_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
#define ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB
#endif
/**
* ONLPSIM_CONFIG_INCLUDE_UCLI
* ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI
*
* Include generic uCli support. */
#ifndef ONLPSIM_CONFIG_INCLUDE_UCLI
#define ONLPSIM_CONFIG_INCLUDE_UCLI 0
#ifndef ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI
#define ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI 0
#endif
/**
* ONLPSIM_CONFIG_SFP_COUNT
* ARM_ACCTON_AS4610_CONFIG_SFP_COUNT
*
* SFP Count. */
#ifndef ONLPSIM_CONFIG_SFP_COUNT
#define ONLPSIM_CONFIG_SFP_COUNT 0
#ifndef ARM_ACCTON_AS4610_CONFIG_SFP_COUNT
#define ARM_ACCTON_AS4610_CONFIG_SFP_COUNT 0
#endif
@@ -154,9 +154,9 @@ const char* arm_accton_as4610_config_lookup(const char* setting);
*/
int arm_accton_as4610_config_show(struct aim_pvs_s* pvs);
/* <auto.end.cdefs(ONLPSIM_CONFIG_HEADER).header> */
/* <auto.end.cdefs(ARM_ACCTON_AS4610_CONFIG_HEADER).header> */
#include "arm_accton_as4610_porting.h"
#endif /* __ONLPSIM_CONFIG_H__ */
#endif /* __ARM_ACCTON_AS4610_CONFIG_H__ */
/* @} */

View File

@@ -28,8 +28,8 @@
* arm_accton_as4610 Doxygen Header
*
***********************************************************/
#ifndef __ONLPSIM_DOX_H__
#define __ONLPSIM_DOX_H__
#ifndef __ARM_ACCTON_AS4610_DOX_H__
#define __ARM_ACCTON_AS4610_DOX_H__
/**
* @defgroup arm_accton_as4610 arm_accton_as4610 - onlpsim Description
@@ -48,4 +48,4 @@ The documentation overview for this module should go here.
*
*/
#endif /* __ONLPSIM_DOX_H__ */
#endif /* __ARM_ACCTON_AS4610_DOX_H__ */

View File

@@ -32,12 +32,12 @@
* @{
*
***********************************************************/
#ifndef __ONLPSIM_PORTING_H__
#define __ONLPSIM_PORTING_H__
#ifndef __ARM_ACCTON_AS4610_PORTING_H__
#define __ARM_ACCTON_AS4610_PORTING_H__
/* <auto.start.portingmacro(ALL).define> */
#if ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1
#if ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS == 1
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -45,88 +45,78 @@
#include <memory.h>
#endif
#ifndef ONLPSIM_MALLOC
#ifndef ARM_ACCTON_AS4610_MALLOC
#if defined(GLOBAL_MALLOC)
#define ONLPSIM_MALLOC GLOBAL_MALLOC
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_MALLOC malloc
#define ARM_ACCTON_AS4610_MALLOC GLOBAL_MALLOC
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_MALLOC malloc
#else
#error The macro ONLPSIM_MALLOC is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_MALLOC is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_FREE
#ifndef ARM_ACCTON_AS4610_FREE
#if defined(GLOBAL_FREE)
#define ONLPSIM_FREE GLOBAL_FREE
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_FREE free
#define ARM_ACCTON_AS4610_FREE GLOBAL_FREE
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_FREE free
#else
#error The macro ONLPSIM_FREE is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_FREE is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_MEMSET
#ifndef ARM_ACCTON_AS4610_MEMSET
#if defined(GLOBAL_MEMSET)
#define ONLPSIM_MEMSET GLOBAL_MEMSET
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_MEMSET memset
#define ARM_ACCTON_AS4610_MEMSET GLOBAL_MEMSET
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_MEMSET memset
#else
#error The macro ONLPSIM_MEMSET is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_MEMSET is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_MEMCPY
#ifndef ARM_ACCTON_AS4610_MEMCPY
#if defined(GLOBAL_MEMCPY)
#define ONLPSIM_MEMCPY GLOBAL_MEMCPY
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_MEMCPY memcpy
#define ARM_ACCTON_AS4610_MEMCPY GLOBAL_MEMCPY
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_MEMCPY memcpy
#else
#error The macro ONLPSIM_MEMCPY is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_MEMCPY is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define ONLPSIM_STRNCPY GLOBAL_STRNCPY
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_STRNCPY strncpy
#else
#error The macro ONLPSIM_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_VSNPRINTF
#ifndef ARM_ACCTON_AS4610_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define ONLPSIM_VSNPRINTF GLOBAL_VSNPRINTF
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_VSNPRINTF vsnprintf
#define ARM_ACCTON_AS4610_VSNPRINTF GLOBAL_VSNPRINTF
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_VSNPRINTF vsnprintf
#else
#error The macro ONLPSIM_VSNPRINTF is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_VSNPRINTF is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_SNPRINTF
#ifndef ARM_ACCTON_AS4610_SNPRINTF
#if defined(GLOBAL_SNPRINTF)
#define ONLPSIM_SNPRINTF GLOBAL_SNPRINTF
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_SNPRINTF snprintf
#define ARM_ACCTON_AS4610_SNPRINTF GLOBAL_SNPRINTF
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_SNPRINTF snprintf
#else
#error The macro ONLPSIM_SNPRINTF is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_SNPRINTF is required but cannot be defined.
#endif
#endif
#ifndef ONLPSIM_STRLEN
#ifndef ARM_ACCTON_AS4610_STRLEN
#if defined(GLOBAL_STRLEN)
#define ONLPSIM_STRLEN GLOBAL_STRLEN
#elif ONLPSIM_CONFIG_PORTING_STDLIB == 1
#define ONLPSIM_STRLEN strlen
#define ARM_ACCTON_AS4610_STRLEN GLOBAL_STRLEN
#elif ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB == 1
#define ARM_ACCTON_AS4610_STRLEN strlen
#else
#error The macro ONLPSIM_STRLEN is required but cannot be defined.
#error The macro ARM_ACCTON_AS4610_STRLEN is required but cannot be defined.
#endif
#endif
/* <auto.end.portingmacro(ALL).define> */
#endif /* __ONLPSIM_PORTING_H__ */
#endif /* __ARM_ACCTON_AS4610_PORTING_H__ */
/* @} */

View File

@@ -25,50 +25,50 @@
#include <arm_accton_as4610/arm_accton_as4610_config.h>
/* <auto.start.cdefs(ONLPSIM_CONFIG_HEADER).source> */
/* <auto.start.cdefs(ARM_ACCTON_AS4610_CONFIG_HEADER).source> */
#define __arm_accton_as4610_config_STRINGIFY_NAME(_x) #_x
#define __arm_accton_as4610_config_STRINGIFY_VALUE(_x) __arm_accton_as4610_config_STRINGIFY_NAME(_x)
arm_accton_as4610_config_settings_t arm_accton_as4610_config_settings[] =
{
#ifdef ONLPSIM_CONFIG_INCLUDE_LOGGING
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_INCLUDE_LOGGING), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_INCLUDE_LOGGING) },
#ifdef ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING) },
#else
{ ONLPSIM_CONFIG_INCLUDE_LOGGING(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_INCLUDE_LOGGING(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT) },
#ifdef ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT) },
#else
{ ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_LOG_BITS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_BITS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_BITS_DEFAULT) },
#ifdef ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT) },
#else
{ ONLPSIM_CONFIG_LOG_BITS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT) },
#ifdef ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT) },
#else
{ ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_PORTING_STDLIB
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_PORTING_STDLIB), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_PORTING_STDLIB) },
#ifdef ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB) },
#else
{ ONLPSIM_CONFIG_PORTING_STDLIB(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_PORTING_STDLIB(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) },
#ifdef ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS) },
#else
{ ONLPSIM_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_PORTING_INCLUDE_STDLIB_HEADERS(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_INCLUDE_UCLI
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_INCLUDE_UCLI), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_INCLUDE_UCLI) },
#ifdef ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI) },
#else
{ ONLPSIM_CONFIG_INCLUDE_UCLI(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
#ifdef ONLPSIM_CONFIG_SFP_COUNT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ONLPSIM_CONFIG_SFP_COUNT), __arm_accton_as4610_config_STRINGIFY_VALUE(ONLPSIM_CONFIG_SFP_COUNT) },
#ifdef ARM_ACCTON_AS4610_CONFIG_SFP_COUNT
{ __arm_accton_as4610_config_STRINGIFY_NAME(ARM_ACCTON_AS4610_CONFIG_SFP_COUNT), __arm_accton_as4610_config_STRINGIFY_VALUE(ARM_ACCTON_AS4610_CONFIG_SFP_COUNT) },
#else
{ ONLPSIM_CONFIG_SFP_COUNT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
{ ARM_ACCTON_AS4610_CONFIG_SFP_COUNT(__arm_accton_as4610_config_STRINGIFY_NAME), "__undefined__" },
#endif
{ NULL, NULL }
};
@@ -97,5 +97,5 @@ arm_accton_as4610_config_show(struct aim_pvs_s* pvs)
return i;
}
/* <auto.end.cdefs(ONLPSIM_CONFIG_HEADER).source> */
/* <auto.end.cdefs(ARM_ACCTON_AS4610_CONFIG_HEADER).source> */

View File

@@ -23,10 +23,10 @@
*
***********************************************************/
#ifndef __ONLPSIM_INT_H__
#define __ONLPSIM_INT_H__
#ifndef __ARM_ACCTON_AS4610_INT_H__
#define __ARM_ACCTON_AS4610_INT_H__
#include <arm_accton_as4610/arm_accton_as4610_config.h>
#endif /* __ONLPSIM_INT_H__ */
#endif /* __ARM_ACCTON_AS4610_INT_H__ */

View File

@@ -30,9 +30,9 @@
* arm_accton_as4610 log struct.
*/
AIM_LOG_STRUCT_DEFINE(
ONLPSIM_CONFIG_LOG_OPTIONS_DEFAULT,
ONLPSIM_CONFIG_LOG_BITS_DEFAULT,
ARM_ACCTON_AS4610_CONFIG_LOG_OPTIONS_DEFAULT,
ARM_ACCTON_AS4610_CONFIG_LOG_BITS_DEFAULT,
NULL, /* Custom log map */
ONLPSIM_CONFIG_LOG_CUSTOM_BITS_DEFAULT
ARM_ACCTON_AS4610_CONFIG_LOG_CUSTOM_BITS_DEFAULT
);

View File

@@ -23,10 +23,10 @@
*
***********************************************************/
#ifndef __ONLPSIM_LOG_H__
#define __ONLPSIM_LOG_H__
#ifndef __ARM_ACCTON_AS4610_LOG_H__
#define __ARM_ACCTON_AS4610_LOG_H__
#define AIM_LOG_MODULE_NAME arm_accton_as4610
#include <AIM/aim_log.h>
#endif /* __ONLPSIM_LOG_H__ */
#endif /* __ARM_ACCTON_AS4610_LOG_H__ */

View File

@@ -30,7 +30,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_ACCTON_AS4610_ENUMERATION_ENTRY(_enum_name, _desc) AIM_DATATYPE_MAP_REGISTER(_enum_name, _enum_name##_map, _desc, AIM_LOG_INTERNAL);
#include <arm_accton_as4610/arm_accton_as4610.x>
return 0;
}

View File

@@ -25,7 +25,7 @@
#include <arm_accton_as4610/arm_accton_as4610_config.h>
#if ONLPSIM_CONFIG_INCLUDE_UCLI == 1
#if ARM_ACCTON_AS4610_CONFIG_INCLUDE_UCLI == 1
#include <uCli/ucli.h>
#include <uCli/ucli_argparse.h>

View File

@@ -130,7 +130,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
strncmp(model_name, "YM-1151D", strlen("YM-1151D")) == 0 ||
strncmp(model_name, "YM-1601A", strlen("YM-1601A")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_AC_F2B;
}

View File

@@ -41,7 +41,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef POWERPC_ACCTON_AS4600_54T_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define POWERPC_ACCTON_AS4600_54T_STRNCPY GLOBAL_STRNCPY
#elif POWERPC_ACCTON_AS4600_54T_CONFIG_PORTING_STDLIB == 1
#define POWERPC_ACCTON_AS4600_54T_STRNCPY strncpy
#else
#error The macro POWERPC_ACCTON_AS4600_54T_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef POWERPC_ACCTON_AS4600_54T_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define POWERPC_ACCTON_AS4600_54T_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -333,7 +333,7 @@ int as4600_54t_get_psu_type(int pid, char* modelname, int modelname_len)
if(modelname) {
/* Return the model name in the given buffer */
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return ret;

View File

@@ -41,7 +41,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef POWERPC_ACCTON_AS5610_52X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define POWERPC_ACCTON_AS5610_52X_STRNCPY GLOBAL_STRNCPY
#elif POWERPC_ACCTON_AS5610_52X_CONFIG_PORTING_STDLIB == 1
#define POWERPC_ACCTON_AS5610_52X_STRNCPY strncpy
#else
#error The macro POWERPC_ACCTON_AS5610_52X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef POWERPC_ACCTON_AS5610_52X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define POWERPC_ACCTON_AS5610_52X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -529,7 +529,7 @@ as5610_52x_psu_type_t as5610_52x_get_psu_type(int id, char* modelname, int model
if(modelname) {
/* Return the model name in the given buffer */
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return ret;

View File

@@ -54,7 +54,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef POWERPC_ACCTON_AS5710_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define POWERPC_ACCTON_AS5710_54X_STRNCPY GLOBAL_STRNCPY
#elif POWERPC_ACCTON_AS5710_54X_CONFIG_PORTING_STDLIB == 1
#define POWERPC_ACCTON_AS5710_54X_STRNCPY strncpy
#else
#error The macro POWERPC_ACCTON_AS5710_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef POWERPC_ACCTON_AS5710_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define POWERPC_ACCTON_AS5710_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -135,13 +135,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", strlen("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_AC_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", strlen("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_AC_B2F;
}
@@ -154,20 +154,20 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "um400d01G", strlen("um400d01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, 9);
aim_strlcpy(modelname, model_name, 9);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", strlen("um400d01-01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, 12);
aim_strlcpy(modelname, model_name, 12);
}
return PSU_TYPE_DC_48V_F2B;
}
if (strncmp(model_name, "PSU-12V-650", 11) == 0) {
if (modelname) {
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
node = (id == PSU1_ID) ? PSU1_DC_HWMON_NODE(psu_fan_dir) : PSU2_DC_HWMON_NODE(psu_fan_dir);

View File

@@ -41,7 +41,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef POWERPC_ACCTON_AS6700_32X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define POWERPC_ACCTON_AS6700_32X_STRNCPY GLOBAL_STRNCPY
#elif POWERPC_ACCTON_AS6700_32X_CONFIG_PORTING_STDLIB == 1
#define POWERPC_ACCTON_AS6700_32X_STRNCPY strncpy
#else
#error The macro POWERPC_ACCTON_AS6700_32X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef POWERPC_ACCTON_AS6700_32X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define POWERPC_ACCTON_AS6700_32X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -128,13 +128,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", strlen("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_AC_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", strlen("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_AC_B2F;
}
@@ -147,13 +147,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "um400d01G", strlen("um400d01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", strlen("um400d01-01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_DC_48V_F2B;
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS4222_28PE_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS4222_28PE_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS4222_28PE_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS4222_28PE_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS4222_28PE_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS4222_28PE_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS4222_28PE_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -29,7 +29,7 @@
#include <string.h>
#include <fcntl.h>
#include <onlplib/mmap.h>
#include <limits.h>
#include "platform_lib.h"
#define prefix_path "/sys/class/leds/accton_as4222_28pe_led::"
@@ -52,7 +52,7 @@ enum onlp_led_id
LED_FAN,
LED_PSU,
};
enum led_light_mode {
LED_MODE_OFF = 0,
LED_MODE_GREEN,
@@ -128,7 +128,7 @@ static onlp_led_info_t linfo[] =
static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driver_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for (i = 0; i < nsize; i++)
{
if (id == led_map[i].id && driver_led_mode == led_map[i].driver_led_mode)
@@ -136,14 +136,14 @@ static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driv
return led_map[i].onlp_led_mode;
}
}
return 0;
}
static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for(i = 0; i < nsize; i++)
{
if (id == led_map[i].id && onlp_led_mode == led_map[i].onlp_led_mode)
@@ -151,7 +151,7 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return led_map[i].driver_led_mode;
}
}
return 0;
}
@@ -174,15 +174,15 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
@@ -233,13 +233,13 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
if (onlp_file_write_integer(fullpath, onlp_to_driver_led_mode(local_id, mode)) != 0)
{
return ONLP_STATUS_E_INTERNAL;
@@ -256,4 +256,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS4630_54PE_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS4630_54PE_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS4630_54PE_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS4630_54PE_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS4630_54PE_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS4630_54PE_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS4630_54PE_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -109,21 +109,21 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (!strncmp(model_name, "FSH082", strlen("FSH082")))
{
if (modelname)
strncpy(modelname, model_name, strlen("FSH082")<(modelname_len-1)?strlen("FSH082"):(modelname_len-1));
aim_strlcpy(modelname, model_name, strlen("FSH082")<(modelname_len-1)?strlen("FSH082"):(modelname_len-1));
return PSU_TYPE_ACBEL;
}
if (!strncmp(model_name, "YM-2651Y", strlen("YM-2651Y")))
{
if (modelname)
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
return PSU_TYPE_YM2651Y;
}
if (!strncmp(model_name, "YPEB1200A", strlen("YPEB1200A")))
{
if (modelname)
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
return PSU_TYPE_YPEB1200A;
}
return PSU_TYPE_UNKNOWN;

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5512_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5512_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5512_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5512_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5512_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5512_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5512_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -26,6 +26,7 @@
#include <onlp/platformi/fani.h>
#include <onlplib/mmap.h>
#include <fcntl.h>
#include <limits.h>
#include "platform_lib.h"
#define PREFIX_PATH_ON_MAIN_BOARD "/sys/devices/platform/as5512_54x_fan/"
@@ -155,7 +156,7 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan/fanr fault status (turn on when any one fails)
*/
@@ -205,7 +206,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
int psu_id, is_ac=0;
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
psu_type_t psu_type;
/* get fan other cap status according to psu type
@@ -335,7 +336,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -416,5 +417,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -28,7 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <onlplib/mmap.h>
#define VALIDATE(_id) \
@@ -196,7 +196,7 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int fd, len, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -270,7 +270,7 @@ onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int fd, len, driver_mode, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);

View File

@@ -133,13 +133,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", strlen("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_AC_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", strlen("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_AC_B2F;
}
@@ -152,13 +152,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "um400d01G", strlen("um400d01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", strlen("um400d01-01G")) == 0) {
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
return PSU_TYPE_DC_48V_F2B;
}

View File

@@ -41,7 +41,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5712_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5712_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5712_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5712_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5712_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5712_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5712_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -40,20 +40,20 @@ int deviceNodeWrite(char *filename, char *buffer, int buf_size, int data_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);
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;
@@ -71,25 +71,25 @@ int deviceNodeWriteInt(char *filename, int value, int data_len)
}
int deviceNodeReadBinary(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_RDONLY)) == -1) {
return -1;
return -1;
}
if ((len = read(fd, buffer, buf_size)) < 0) {
close(fd);
close(fd);
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((len > buf_size) || (data_len != 0 && len != data_len)) {
@@ -106,7 +106,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
if (data_len >= buf_size || data_len < 0) {
return -1;
}
ret = deviceNodeReadBinary(filename, buffer, buf_size-1, data_len);
if (ret == 0) {
@@ -117,7 +117,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
buffer[buf_size-1] = '\0';
}
}
return ret;
}
@@ -135,25 +135,25 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", STRLEN("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", STRLEN("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
else if (strncmp(model_name, "CPR-6011-2M11", STRLEN("CPR-6011-2M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-6011-2M21", STRLEN("CPR-6011-2M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
@@ -161,20 +161,20 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
/* Check 3Y-Power AC model name */
memset(model_name, 0, sizeof(model_name));
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "YM-2401JCR", STRLEN("YM-2401JCR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JCR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_F2B;
}
else if (strncmp(model_name, "YM-2401JDR", STRLEN("YM-2401JDR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JDR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_B2F;
}
@@ -188,14 +188,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "um400d01G", STRLEN("um400d01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01G")] = 0;
strncpy(modelname, model_name, 10);
aim_strlcpy(modelname, model_name, 10);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", STRLEN("um400d01-01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01-01G")] = 0;
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_DC_48V_F2B;
}
@@ -208,7 +208,7 @@ int psu_ym2401_pmbus_info_get(int id, char *node, int *value)
{
int ret = 0;
char path[64] = {0};
*value = 0;
if (PSU1_ID == id) {
@@ -248,4 +248,3 @@ int psu_ym2401_pmbus_info_set(int id, char *node, int value)
return ONLP_STATUS_OK;
}

View File

@@ -46,7 +46,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5812_54T_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5812_54T_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5812_54T_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5812_54T_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5812_54T_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5812_54T_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5812_54T_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -27,6 +27,7 @@
#include <unistd.h>
#include <onlplib/file.h>
#include <fcntl.h>
#include <limits.h>
#include "platform_lib.h"
#include "x86_64_accton_as5812_54t/x86_64_accton_as5812_54t_config.h"
@@ -44,7 +45,7 @@
#define FAN_1_ON_PSU1 6
#define FAN_1_ON_PSU2 7
#define PROJECT_NAME
#define PROJECT_NAME
#define LEN_FILE_NAME 50
@@ -134,7 +135,7 @@ onlp_fan_info_t linfo[] = {
printf("[Debug][%s][%d][read data: %s]\n", __FUNCTION__, __LINE__, r_data); \
if (close(fd) == -1) \
return ONLP_STATUS_E_INTERNAL
/* PSU relative marco */
#define SET_PSU_TYPE_AC_F2B_FAN(info) \
@@ -144,7 +145,7 @@ onlp_fan_info_t linfo[] = {
#define SET_PSU_TYPE_AC_B2F_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_B2F); \
info->caps |= ONLP_FAN_CAPS_SET_PERCENTAGE | ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE
#define SET_PSU_TYPE_UM400D_F2B_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_F2B)
@@ -157,46 +158,46 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan/fanr fault status (turn on when any one fails)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].status);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
/* get fan/fanr direction (both : the same)
/* get fan/fanr direction (both : the same)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) == 0) /*F2B*/
info->status |= ONLP_FAN_STATUS_F2B;
else
else
info->status |= ONLP_FAN_STATUS_B2F;
/* get fan/fanr speed (take the average of two speeds)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = (info->rpm + atoi(r_data))/2;
/* get speed percentage from rpm */
info->percentage = (info->rpm * 100)/x86_64_accton_as5812_54t_CONFIG_SYS_FAN_FRONT_RPM_MAX;
/* check present */
/* check present */
if (info->rpm > 0)
info->status |= ONLP_FAN_STATUS_PRESENT;
info->status |= ONLP_FAN_STATUS_PRESENT;
return ONLP_STATUS_OK;
}
@@ -211,7 +212,7 @@ _onlp_fani_info_get_fan_on_psu_ym2401(int pid, onlp_fan_info_t* info)
if (psu_ym2401_pmbus_info_get(pid, "psu_fan1_speed_rpm", &val) == ONLP_STATUS_OK) {
info->status |= (val > 0) ? 0 : ONLP_FAN_STATUS_FAILED;
info->rpm = val;
info->percentage = (info->rpm * 100) / 21600;
info->percentage = (info->rpm * 100) / 21600;
}
return ONLP_STATUS_OK;
@@ -223,16 +224,16 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
int psu_id;
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
psu_type_t psu_type;
/* get fan other cap status according to psu type
/* get fan other cap status according to psu type
*/
psu_id = (local_id-FAN_1_ON_PSU1) + 1;
DEBUG_PRINT("[psu_id: %d]", psu_id);
DEBUG_PRINT("[psu_id: %d]", psu_id);
psu_type = get_psu_type(psu_id, NULL, 0); /* psu_id = 1 , present PSU1. pus_id =2 , present PSU2 */
DEBUG_PRINT("[psu_type: %d]", psu_type);
DEBUG_PRINT("[psu_type: %d]", psu_type);
switch (psu_type) {
case PSU_TYPE_AC_COMPUWARE_F2B:
@@ -251,26 +252,26 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
break;
default:
if (LOCAL_DEBUG)
printf("[Debug][%s][%d][psu_type=%d]\n", __FUNCTION__, __LINE__, psu_type);
printf("[Debug][%s][%d][psu_type=%d]\n", __FUNCTION__, __LINE__, psu_type);
break;
}
if (psu_type == PSU_TYPE_AC_COMPUWARE_F2B ||
psu_type == PSU_TYPE_AC_COMPUWARE_B2F )
{
/* get fan fault status
/* get fan fault status
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].status);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
/* get fan speed
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
/* get speed percentage from rpm */
info->percentage = (info->rpm * 100)/19328;
@@ -314,11 +315,11 @@ onlp_fani_info_get(onlp_oid_t id, onlp_fan_info_t* info)
{
case FAN_1_ON_PSU1:
case FAN_1_ON_PSU2:
rc = _onlp_fani_info_get_fan_on_psu(local_id, info);
rc = _onlp_fani_info_get_fan_on_psu(local_id, info);
break;
default:
rc =_onlp_fani_info_get_fan(local_id, info);
rc =_onlp_fani_info_get_fan(local_id, info);
break;
}
@@ -349,10 +350,10 @@ onlp_fani_rpm_set(onlp_oid_t id, int rpm)
*/
int
onlp_fani_percentage_set(onlp_oid_t id, int p)
{
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char data[10] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -362,7 +363,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
if (p == 0){
return ONLP_STATUS_E_INVALID;
}
/* get fullpath */
switch (local_id)
{
@@ -380,7 +381,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
return psu_ym2401_pmbus_info_set(psu_id, "psu_fan1_duty_cycle_percentage", p);
}
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].ctrl_speed);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].ctrl_speed);
break;
}
@@ -397,13 +398,13 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
/* Create output file descriptor */
fd = open(fullpath, O_WRONLY, 0644);
if(fd == -1){
return ONLP_STATUS_E_INTERNAL;
return ONLP_STATUS_E_INTERNAL;
}
len = write (fd, data, (ssize_t) nbytes);
if(len != nbytes){
close(fd);
return ONLP_STATUS_E_INTERNAL;
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
@@ -447,5 +448,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <onlplib/mmap.h>
@@ -58,15 +59,15 @@ enum led_light_mode { /*must be the same with the definition @ kernel driver */
int led_light_map_mode[][2] =
{
{LED_MODE_OFF, ONLP_LED_MODE_OFF},
{LED_MODE_OFF, ONLP_LED_MODE_OFF},
{LED_MODE_GREEN, ONLP_LED_MODE_GREEN},
{LED_MODE_AMBER, ONLP_LED_MODE_ORANGE},
{LED_MODE_RED, ONLP_LED_MODE_RED},
{LED_MODE_RED, ONLP_LED_MODE_RED},
{LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING},
{LED_MODE_AMBER_BLINK, ONLP_LED_MODE_ORANGE_BLINKING},
{LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING},
{LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
};
{LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
};
#define prefix_path "/sys/class/leds/accton_as5812_54t_led::"
@@ -84,7 +85,7 @@ enum onlp_led_id
LED_FAN2,
LED_FAN3,
LED_FAN4,
LED_FAN5,
LED_FAN5,
};
static char last_path[][10] = /* must map with onlp_led_id */
@@ -99,7 +100,7 @@ static char last_path[][10] = /* must map with onlp_led_id */
"fan2",
"fan3",
"fan4",
"fan5",
"fan5",
};
/*
@@ -135,27 +136,27 @@ static onlp_led_info_t linfo[] =
},
{
{ ONLP_LED_ID_CREATE(LED_FAN1), "Chassis LED 6 (FAN1 LED)", 0 },
ONLP_LED_STATUS_PRESENT,
ONLP_LED_STATUS_PRESENT,
ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED,
},
{
{ ONLP_LED_ID_CREATE(LED_FAN2), "Chassis LED 7 (FAN2 LED)", 0 },
ONLP_LED_STATUS_PRESENT,
ONLP_LED_STATUS_PRESENT,
ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED,
},
{
{ ONLP_LED_ID_CREATE(LED_FAN3), "Chassis LED 8 (FAN3 LED)", 0 },
ONLP_LED_STATUS_PRESENT,
ONLP_LED_STATUS_PRESENT,
ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED,
},
{
{ ONLP_LED_ID_CREATE(LED_FAN4), "Chassis LED 9 (FAN4 LED)", 0 },
ONLP_LED_STATUS_PRESENT,
ONLP_LED_STATUS_PRESENT,
ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED,
},
{
{ ONLP_LED_ID_CREATE(LED_FAN5), "Chassis LED 10 (FAN5 LED)", 0 },
ONLP_LED_STATUS_PRESENT,
ONLP_LED_STATUS_PRESENT,
ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_RED,
},
};
@@ -168,7 +169,7 @@ static int convert_led_light_mode_to_onl(int led_ligth_mode)
{
if (led_ligth_mode == led_light_map_mode[i][0])
{
return led_light_map_mode[i][1];
return led_light_map_mode[i][1];
}
}
return ONLP_LED_MODE_ON;
@@ -182,7 +183,7 @@ static int convert_led_light_mode_to_driver(int led_ligth_mode)
{
if (led_ligth_mode == led_light_map_mode[i][1])
{
return led_light_map_mode[i][0];
return led_light_map_mode[i][0];
}
}
return 0;
@@ -208,40 +209,40 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
int fd, len, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
if (strchr(last_path[local_id], '/') != NULL)
{
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
}
else
{
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
}
/* Set the onlp_oid_hdr_t and capabilities */
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
/* Set current mode */
if ((fd = open(fullpath, O_RDONLY)) == -1)
{
{
return ONLP_STATUS_E_INTERNAL;
}
if ((len = read(fd, data, nbytes)) <= 0)
{
close(fd);
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
/* If the read byte count is less, the format is different and calc will be wrong*/
if (close(fd) == -1)
{
{
return ONLP_STATUS_E_INTERNAL;
}
@@ -286,37 +287,37 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int fd, len, driver_mode, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char data[2] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
if (strchr(last_path[local_id], '/') != NULL)
{
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
}
else
{
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
}
driver_mode = convert_led_light_mode_to_driver(mode);
sprintf(data, "%d", driver_mode);
/* Create output file descriptor */
fd = open(fullpath, O_WRONLY, 0644);
if(fd == -1){
return ONLP_STATUS_E_INTERNAL;
return ONLP_STATUS_E_INTERNAL;
}
len = write (fd, data, (ssize_t) nbytes);
if(len != nbytes){
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_OK;
@@ -330,4 +331,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -40,20 +40,20 @@ int deviceNodeWrite(char *filename, char *buffer, int buf_size, int data_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);
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;
@@ -71,25 +71,25 @@ int deviceNodeWriteInt(char *filename, int value, int data_len)
}
int deviceNodeReadBinary(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_RDONLY)) == -1) {
return -1;
return -1;
}
if ((len = read(fd, buffer, buf_size)) < 0) {
close(fd);
close(fd);
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((len > buf_size) || (data_len != 0 && len != data_len)) {
@@ -106,7 +106,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
if (data_len >= buf_size || data_len < 0) {
return -1;
}
ret = deviceNodeReadBinary(filename, buffer, buf_size-1, data_len);
if (ret == 0) {
@@ -117,7 +117,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
buffer[buf_size-1] = '\0';
}
}
return ret;
}
@@ -135,25 +135,25 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", STRLEN("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", STRLEN("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
else if (strncmp(model_name, "CPR-6011-2M11", STRLEN("CPR-6011-2M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-6011-2M21", STRLEN("CPR-6011-2M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
@@ -161,20 +161,20 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
/* Check 3Y-Power AC model name */
memset(model_name, 0, sizeof(model_name));
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "YM-2401JCR", STRLEN("YM-2401JCR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JCR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_F2B;
}
else if (strncmp(model_name, "YM-2401JDR", STRLEN("YM-2401JDR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JDR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_B2F;
}
@@ -188,14 +188,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "um400d01G", STRLEN("um400d01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01G")] = 0;
strncpy(modelname, model_name, 10);
aim_strlcpy(modelname, model_name, 10);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", STRLEN("um400d01-01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01-01G")] = 0;
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_DC_48V_F2B;
}
@@ -208,7 +208,7 @@ int psu_ym2401_pmbus_info_get(int id, char *node, int *value)
{
int ret = 0;
char path[64] = {0};
*value = 0;
if (PSU1_ID == id) {
@@ -248,4 +248,3 @@ int psu_ym2401_pmbus_info_set(int id, char *node, int value)
return ONLP_STATUS_OK;
}

View File

@@ -46,7 +46,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5812_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5812_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5812_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5812_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5812_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5812_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5812_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -27,6 +27,7 @@
#include <unistd.h>
#include <onlplib/file.h>
#include <fcntl.h>
#include <limits.h>
#include "platform_lib.h"
#include "x86_64_accton_as5812_54x/x86_64_accton_as5812_54x_config.h"
@@ -44,7 +45,7 @@
#define FAN_1_ON_PSU1 6
#define FAN_1_ON_PSU2 7
#define PROJECT_NAME
#define PROJECT_NAME
#define LEN_FILE_NAME 50
@@ -53,7 +54,7 @@ typedef struct last_path_S
char status[LEN_FILE_NAME];
char speed[LEN_FILE_NAME];
char direction[LEN_FILE_NAME];
char ctrl_speed[LEN_FILE_NAME];
char ctrl_speed[LEN_FILE_NAME];
char r_status[LEN_FILE_NAME];
char r_speed[LEN_FILE_NAME];
}last_path_T;
@@ -76,10 +77,10 @@ static last_path_T last_path[] = /* must map with onlp_fan_id */
MAKE_FAN_LAST_PATH_ON_MAIN_BOARD(PROJECT_NAME, FAN_2_ON_MAIN_BOARD),
MAKE_FAN_LAST_PATH_ON_MAIN_BOARD(PROJECT_NAME, FAN_3_ON_MAIN_BOARD),
MAKE_FAN_LAST_PATH_ON_MAIN_BOARD(PROJECT_NAME, FAN_4_ON_MAIN_BOARD),
MAKE_FAN_LAST_PATH_ON_MAIN_BOARD(PROJECT_NAME, FAN_5_ON_MAIN_BOARD),
MAKE_FAN_LAST_PATH_ON_MAIN_BOARD(PROJECT_NAME, FAN_5_ON_MAIN_BOARD),
MAKE_FAN_LAST_PATH_ON_PSU(57-003c),
MAKE_FAN_LAST_PATH_ON_PSU(58-003f),
MAKE_FAN_LAST_PATH_ON_PSU(57-003c),
MAKE_FAN_LAST_PATH_ON_PSU(58-003f),
};
#define MAKE_FAN_INFO_NODE_ON_MAIN_BOARD(id) \
@@ -134,7 +135,7 @@ onlp_fan_info_t linfo[] = {
printf("[Debug][%s][%d][read data: %s]\n", __FUNCTION__, __LINE__, r_data); \
if (close(fd) == -1) \
return ONLP_STATUS_E_INTERNAL
/* PSU relative marco */
#define SET_PSU_TYPE_AC_F2B_FAN(info) \
@@ -144,7 +145,7 @@ onlp_fan_info_t linfo[] = {
#define SET_PSU_TYPE_AC_B2F_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_B2F); \
info->caps |= ONLP_FAN_CAPS_SET_PERCENTAGE | ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE
#define SET_PSU_TYPE_UM400D_F2B_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_F2B)
@@ -157,46 +158,46 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan/fanr fault status (turn on when any one fails)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].status);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
/* get fan/fanr direction (both : the same)
/* get fan/fanr direction (both : the same)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) == 0) /*F2B*/
info->status |= ONLP_FAN_STATUS_F2B;
else
else
info->status |= ONLP_FAN_STATUS_B2F;
/* get fan/fanr speed (take the average of two speeds)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].r_speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = (info->rpm + atoi(r_data))/2;
/* get speed percentage from rpm */
info->percentage = (info->rpm * 100)/x86_64_accton_as5812_54x_CONFIG_SYS_FAN_FRONT_RPM_MAX;
/* check present */
/* check present */
if (info->rpm > 0)
info->status |= ONLP_FAN_STATUS_PRESENT;
info->status |= ONLP_FAN_STATUS_PRESENT;
return ONLP_STATUS_OK;
}
@@ -211,7 +212,7 @@ _onlp_fani_info_get_fan_on_psu_ym2401(int pid, onlp_fan_info_t* info)
if (psu_ym2401_pmbus_info_get(pid, "psu_fan1_speed_rpm", &val) == ONLP_STATUS_OK) {
info->status |= (val > 0) ? 0 : ONLP_FAN_STATUS_FAILED;
info->rpm = val;
info->percentage = (info->rpm * 100) / 21600;
info->percentage = (info->rpm * 100) / 21600;
}
return ONLP_STATUS_OK;
@@ -223,16 +224,16 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
int psu_id;
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
psu_type_t psu_type;
/* get fan other cap status according to psu type
/* get fan other cap status according to psu type
*/
psu_id = (local_id-FAN_1_ON_PSU1) + 1;
DEBUG_PRINT("[psu_id: %d]", psu_id);
DEBUG_PRINT("[psu_id: %d]", psu_id);
psu_type = get_psu_type(psu_id, NULL, 0); /* psu_id = 1 , present PSU1. pus_id =2 , present PSU2 */
DEBUG_PRINT("[psu_type: %d]", psu_type);
DEBUG_PRINT("[psu_type: %d]", psu_type);
switch (psu_type) {
case PSU_TYPE_AC_COMPUWARE_F2B:
@@ -251,26 +252,26 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
break;
default:
if (LOCAL_DEBUG)
printf("[Debug][%s][%d][psu_type=%d]\n", __FUNCTION__, __LINE__, psu_type);
printf("[Debug][%s][%d][psu_type=%d]\n", __FUNCTION__, __LINE__, psu_type);
break;
}
if (psu_type == PSU_TYPE_AC_COMPUWARE_F2B ||
psu_type == PSU_TYPE_AC_COMPUWARE_B2F )
{
/* get fan fault status
/* get fan fault status
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].status);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
/* get fan speed
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
/* get speed percentage from rpm */
info->percentage = (info->rpm * 100)/19328;
@@ -280,7 +281,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
{
return _onlp_fani_info_get_fan_on_psu_ym2401(psu_id, info);
}
return ONLP_STATUS_OK;
}
@@ -302,26 +303,26 @@ onlp_fani_info_get(onlp_oid_t id, onlp_fan_info_t* info)
int local_id;
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
*info = linfo[local_id];
if (LOCAL_DEBUG)
printf("\n[Debug][%s][%d][local_id: %d]", __FUNCTION__, __LINE__, local_id);
switch (local_id)
{
case FAN_1_ON_PSU1:
case FAN_1_ON_PSU2:
rc = _onlp_fani_info_get_fan_on_psu(local_id, info);
rc = _onlp_fani_info_get_fan_on_psu(local_id, info);
break;
default:
rc =_onlp_fani_info_get_fan(local_id, info);
rc =_onlp_fani_info_get_fan(local_id, info);
break;
}
}
return rc;
}
@@ -350,20 +351,20 @@ onlp_fani_rpm_set(onlp_oid_t id, int rpm)
*/
int
onlp_fani_percentage_set(onlp_oid_t id, int p)
{
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char data[10] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* reject p=0 (p=0, stop fan) */
if (p == 0){
return ONLP_STATUS_E_INVALID;
}
/* get fullpath */
switch (local_id)
{
@@ -381,7 +382,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
return psu_ym2401_pmbus_info_set(psu_id, "psu_fan1_duty_cycle_percentage", p);
}
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].ctrl_speed);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, last_path[local_id].ctrl_speed);
break;
}
@@ -389,23 +390,23 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, last_path[local_id].ctrl_speed);
break;
}
sprintf(data, "%d", p);
if (LOCAL_DEBUG)
printf("[Debug][%s][%d][openfile: %s][data=%s]\n", __FUNCTION__, __LINE__, fullpath, data);
/* Create output file descriptor */
fd = open(fullpath, O_WRONLY, 0644);
if(fd == -1){
return ONLP_STATUS_E_INTERNAL;
return ONLP_STATUS_E_INTERNAL;
}
len = write (fd, data, (ssize_t) nbytes);
if(len != nbytes){
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_OK;
@@ -448,5 +449,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <onlplib/mmap.h>
@@ -50,20 +51,20 @@ enum led_light_mode { /*must be the same with the definition @ kernel driver */
LED_MODE_GREEN_BLINK,
LED_MODE_AMBER_BLINK,
LED_MODE_RED_BLINK,
LED_MODE_AUTO,
LED_MODE_AUTO,
};
int led_light_map_mode[][2] =
{
{LED_MODE_OFF, ONLP_LED_MODE_OFF},
{LED_MODE_OFF, ONLP_LED_MODE_OFF},
{LED_MODE_GREEN, ONLP_LED_MODE_GREEN},
{LED_MODE_AMBER, ONLP_LED_MODE_ORANGE},
{LED_MODE_RED, ONLP_LED_MODE_RED},
{LED_MODE_RED, ONLP_LED_MODE_RED},
{LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING},
{LED_MODE_AMBER_BLINK, ONLP_LED_MODE_ORANGE_BLINKING},
{LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING},
{LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
};
{LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
};
#define prefix_path "/sys/class/leds/accton_as5812_54x_led::"
@@ -81,7 +82,7 @@ enum onlp_led_id
LED_FAN2,
LED_FAN3,
LED_FAN4,
LED_FAN5,
LED_FAN5,
};
static char last_path[][10] = /* must map with onlp_led_id */
@@ -96,7 +97,7 @@ static char last_path[][10] = /* must map with onlp_led_id */
"fan2",
"fan3",
"fan4",
"fan5",
"fan5",
};
/*
@@ -160,7 +161,7 @@ static int conver_led_light_mode_to_onl(int led_ligth_mode)
{
if (led_ligth_mode == led_light_map_mode[i][0])
{
return led_light_map_mode[i][1];
return led_light_map_mode[i][1];
}
}
return 0;
@@ -174,7 +175,7 @@ static int conver_led_light_mode_to_driver(int led_ligth_mode)
{
if (led_ligth_mode == led_light_map_mode[i][1])
{
return led_light_map_mode[i][0];
return led_light_map_mode[i][0];
}
}
return 0;
@@ -200,40 +201,40 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
int fd, len, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
if (strchr(last_path[local_id], '/') != NULL)
{
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
}
else
{
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
}
/* Set the onlp_oid_hdr_t and capabilities */
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
/* Set current mode */
if ((fd = open(fullpath, O_RDONLY)) == -1)
{
{
return ONLP_STATUS_E_INTERNAL;
}
if ((len = read(fd, data, nbytes)) <= 0)
{
close(fd);
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
/* If the read byte count is less, the format is different and calc will be wrong*/
if (close(fd) == -1)
{
{
return ONLP_STATUS_E_INTERNAL;
}
@@ -278,37 +279,37 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int fd, len, driver_mode, nbytes=1, local_id;
char data[2] = {0};
char fullpath[50] = {0};
char data[2] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
if (strchr(last_path[local_id], '/') != NULL)
{
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
sprintf(fullpath, "%s%s", prefix_path, last_path[local_id]);
}
else
{
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
}
driver_mode = conver_led_light_mode_to_driver(mode);
sprintf(data, "%d", driver_mode);
/* Create output file descriptor */
fd = open(fullpath, O_WRONLY, 0644);
if(fd == -1){
return ONLP_STATUS_E_INTERNAL;
return ONLP_STATUS_E_INTERNAL;
}
len = write (fd, data, (ssize_t) nbytes);
if(len != nbytes){
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_E_INTERNAL;
}
close(fd);
return ONLP_STATUS_OK;
@@ -322,4 +323,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -42,20 +42,20 @@ int deviceNodeWrite(char *filename, char *buffer, int buf_size, int data_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);
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;
@@ -73,25 +73,25 @@ int deviceNodeWriteInt(char *filename, int value, int data_len)
}
int deviceNodeReadBinary(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_RDONLY)) == -1) {
return -1;
return -1;
}
if ((len = read(fd, buffer, buf_size)) < 0) {
close(fd);
close(fd);
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((len > buf_size) || (data_len != 0 && len != data_len)) {
@@ -108,7 +108,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
if (data_len >= buf_size || data_len < 0) {
return -1;
}
ret = deviceNodeReadBinary(filename, buffer, buf_size-1, data_len);
if (ret == 0) {
@@ -119,7 +119,7 @@ int deviceNodeReadString(char *filename, char *buffer, int buf_size, int data_le
buffer[buf_size-1] = '\0';
}
}
return ret;
}
@@ -137,25 +137,25 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", STRLEN("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", STRLEN("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
else if (strncmp(model_name, "CPR-6011-2M11", STRLEN("CPR-6011-2M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-6011-2M21", STRLEN("CPR-6011-2M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
@@ -163,20 +163,20 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
/* Check 3Y-Power AC model name */
memset(model_name, 0, sizeof(model_name));
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
node = (id == PSU1_ID) ? PSU1_AC_3YPOWER_EEPROM_NODE(psu_model_name) : PSU2_AC_3YPOWER_EEPROM_NODE(psu_model_name);
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "YM-2401JCR", STRLEN("YM-2401JCR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JCR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_F2B;
}
else if (strncmp(model_name, "YM-2401JDR", STRLEN("YM-2401JDR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JDR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_B2F;
}
@@ -190,14 +190,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "um400d01G", STRLEN("um400d01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01G")] = 0;
strncpy(modelname, model_name, 10);
aim_strlcpy(modelname, model_name, 10);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", STRLEN("um400d01-01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01-01G")] = 0;
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_DC_48V_F2B;
}
@@ -210,7 +210,7 @@ int psu_ym2401_pmbus_info_get(int id, char *node, int *value)
{
int ret = 0;
char path[64] = {0};
*value = 0;
if (PSU1_ID == id) {
@@ -256,14 +256,14 @@ int psu_ym2401_pmbus_info_set(int id, char *node, int value)
int psu_serial_number_get(int id, psu_type_t psu_type, char *serial, int serial_len)
{
int size = 0;
int ret = ONLP_STATUS_OK;
int ret = ONLP_STATUS_OK;
char *prefix = NULL;
char *filename = NULL;
if (serial == NULL || serial_len < PSU_SERIAL_NUMBER_LEN) {
return ONLP_STATUS_E_PARAM;
}
memset((void *)serial, 0x0, serial_len);
switch (psu_type) {
case PSU_TYPE_AC_COMPUWARE_F2B:
@@ -292,4 +292,4 @@ int psu_serial_number_get(int id, psu_type_t psu_type, char *serial, int serial_
serial[PSU_SERIAL_NUMBER_LEN] = '\0';
return ONLP_STATUS_OK;
}
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5822_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5822_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5822_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5822_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5822_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5822_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5822_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -121,7 +121,7 @@ int get_psu_serial_number(int id, char *serial, int serial_len)
{
char *node = NULL;
char sn[PSU_SERIAL_NUMBER_LEN + 1] = {0};
/* Check AC model name */
node = (id == PSU1_ID) ? PSU1_AC_HWMON_NODE(psu_serial_numer) : PSU2_AC_HWMON_NODE(psu_serial_numer);
@@ -130,7 +130,7 @@ int get_psu_serial_number(int id, char *serial, int serial_len)
}
if (serial) {
strncpy(serial, sn, sizeof(sn));
aim_strlcpy(serial, sn, sizeof(sn));
}
return ONLP_STATUS_OK;
@@ -149,7 +149,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
if (strncmp(model_name, "YM-2401JCR", 10) == 0) {
@@ -203,4 +203,4 @@ int psu_ym2401_pmbus_info_set(int id, char *node, int value)
}
return ONLP_STATUS_OK;
}
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5912_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5912_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5912_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5912_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5912_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5912_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5912_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -135,7 +135,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5912_54XK_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5912_54XK_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5912_54XK_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5912_54XK_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5912_54XK_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5912_54XK_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5912_54XK_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -57,7 +57,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model, modelname_len-1);
aim_strlcpy(modelname, model, modelname_len-1);
}
path = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_26XB_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5916_26XB_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5916_26XB_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5916_26XB_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_26XB_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_26XB_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_26XB_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -154,7 +154,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
char *string = NULL;
int len = onlp_file_read_str(&string, "%s""psu%d_model", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->model, string, len);
aim_strlcpy(info->model, string, len);
aim_free(string);
info->caps |= get_DCorAC_cap (info->model);
}
@@ -162,7 +162,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
/* Read serial */
len = onlp_file_read_str(&string, "%s""psu%d_serial", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->serial, string, len);
aim_strlcpy(info->serial, string, len);
aim_free(string);
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#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
#define X86_64_ACCTON_AS5916_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -57,7 +57,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model, modelname_len-1);
aim_strlcpy(modelname, model, modelname_len-1);
}
path = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XK_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5916_54XK_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5916_54XK_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5916_54XK_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_54XK_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XK_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_54XK_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -57,7 +57,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model, modelname_len-1);
aim_strlcpy(modelname, model, modelname_len-1);
}
path = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XKS_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5916_54XKS_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5916_54XKS_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5916_54XKS_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_54XKS_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XKS_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_54XKS_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -138,14 +138,14 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
char *string = NULL;
int len = onlp_file_read_str(&string, "%s""psu%d_model", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->model, string, len);
aim_strlcpy(info->model, string, len);
aim_free(string);
}
/* Read serial */
len = onlp_file_read_str(&string, "%s""psu%d_serial", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->serial, string, len);
aim_strlcpy(info->serial, string, len);
aim_free(string);
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XL_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5916_54XL_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5916_54XL_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5916_54XL_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_54XL_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XL_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_54XL_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -138,14 +138,14 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
char *string = NULL;
int len = onlp_file_read_str(&string, "%s""psu%d_model", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->model, string, len);
aim_strlcpy(info->model, string, len);
aim_free(string);
}
/* Read serial */
len = onlp_file_read_str(&string, "%s""psu%d_serial", PSU_SYSFS_PATH, pid);
if (string && len) {
strncpy(info->serial, string, len);
aim_strlcpy(info->serial, string, len);
aim_free(string);
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XM_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS5916_54XM_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS5916_54XM_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS5916_54XM_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS5916_54XM_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS5916_54XM_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS5916_54XM_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -83,7 +83,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -175,7 +175,7 @@ onlp_thermali_info_get(onlp_oid_t id, onlp_thermal_info_t* info)
devfile = fname;
/*Replace description*/
strncpy(tmp, *des, sizeof(tmp));
aim_strlcpy(tmp, *des, sizeof(tmp));
snprintf(*des, sizeof(*des), tmp, t1_addr);
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS6712_32X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS6712_32X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS6712_32X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS6712_32X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS6712_32X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS6712_32X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS6712_32X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -1,6 +1,6 @@
###############################################################################
#
#
#
#
###############################################################################
THIS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
@@ -8,3 +8,4 @@ x86_64_accton_as6712_32x_INCLUDES := -I $(THIS_DIR)inc
x86_64_accton_as6712_32x_INTERNAL_INCLUDES := -I $(THIS_DIR)src
x86_64_accton_as6712_32x_DEPENDMODULE_ENTRIES := init:x86_64_accton_as6712_32x ucli:x86_64_accton_as6712_32x
x86_64_accton_as6712_32x_CFLAGS := -Wno-sizeof-pointer-memaccess

View File

@@ -28,6 +28,7 @@
#include <onlplib/file.h>
#include <fcntl.h>
#include "platform_lib.h"
#include <limits.h>
#define PREFIX_PATH_ON_MAIN_BOARD "/sys/devices/platform/as6712_32x_fan/"
#define PREFIX_PATH_ON_PSU "/sys/bus/i2c/devices/"
@@ -137,7 +138,7 @@ onlp_fan_info_t linfo[] = {
#define SET_PSU_TYPE_AC_B2F_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_B2F); \
info->caps |= ONLP_FAN_CAPS_SET_PERCENTAGE | ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE
#define SET_PSU_TYPE_UM400D_F2B_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_F2B)
@@ -150,7 +151,7 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan/fanr fault status (turn on when any one fails)
*/
@@ -166,13 +167,13 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
/* get fan/fanr direction (both : the same)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) == 0) /*F2B*/
info->status |= ONLP_FAN_STATUS_F2B;
else
info->status |= ONLP_FAN_STATUS_B2F;
else
info->status |= ONLP_FAN_STATUS_B2F;
/* get fan/fanr speed (take the min from two speeds)
*/
@@ -205,7 +206,7 @@ _onlp_fani_info_get_fan_on_psu_ym2401(int pid, onlp_fan_info_t* info)
if (psu_ym2401_pmbus_info_get(pid, "psu_fan1_speed_rpm", &val) == ONLP_STATUS_OK) {
info->status |= (val > 0) ? 0 : ONLP_FAN_STATUS_FAILED;
info->rpm = val;
info->percentage = (info->rpm * 100) / 21600;
info->percentage = (info->rpm * 100) / 21600;
}
return ONLP_STATUS_OK;
@@ -217,7 +218,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
int psu_id;
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[80] = {0};
char fullpath[PATH_MAX] = {0};
psu_type_t psu_type;
/* get fan fault status
@@ -343,7 +344,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -371,7 +372,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
return psu_ym2401_pmbus_info_set(psu_id, "psu_fan1_duty_cycle_percentage", p);
}
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].ctrl_speed);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].ctrl_speed);
break;
}
case FAN_1_ON_MAIN_BOARD:
@@ -439,4 +440,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -29,7 +29,7 @@
#include <string.h>
#include <fcntl.h>
#include <onlplib/mmap.h>
#include <limits.h>
#include "platform_lib.h"
#define prefix_path "/sys/class/leds/accton_as6712_32x_led::"
@@ -58,20 +58,20 @@ enum onlp_led_id
LED_FAN4,
LED_FAN5
};
enum led_light_mode {
/* psu led mode */
LED_MODE_PSU_OFF = 0,
LED_MODE_PSU_GREEN,
LED_MODE_PSU_AMBER,
LED_MODE_PSU_AMBER,
LED_MODE_PSU_AUTO = 7,
/* diag led mode*/
LED_MODE_DIAG_OFF = 0,
LED_MODE_DIAG_GREEN,
LED_MODE_DIAG_AMBER,
LED_MODE_DIAG_AMBER,
LED_MODE_DIAG_GREEN_BLINK = 4,
/* locator led mode*/
LED_MODE_LOC_OFF = 0,
LED_MODE_LOC_AMBER = 2,
@@ -202,7 +202,7 @@ static onlp_led_info_t linfo[] =
static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driver_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for (i = 0; i < nsize; i++)
{
if (id == led_map[i].id && driver_led_mode == led_map[i].driver_led_mode)
@@ -210,14 +210,14 @@ static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driv
return led_map[i].onlp_led_mode;
}
}
return 0;
}
static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for(i = 0; i < nsize; i++)
{
if (id == led_map[i].id && onlp_led_mode == led_map[i].onlp_led_mode)
@@ -225,7 +225,7 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return led_map[i].driver_led_mode;
}
}
return 0;
}
@@ -249,15 +249,15 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
@@ -308,12 +308,12 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
if (deviceNodeWriteInt(fullpath, onlp_to_driver_led_mode(local_id, mode), 0) != 0)
{
@@ -331,4 +331,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -134,25 +134,25 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", STRLEN("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", STRLEN("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
else if (strncmp(model_name, "CPR-6011-2M11", STRLEN("CPR-6011-2M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-6011-2M21", STRLEN("CPR-6011-2M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
@@ -166,14 +166,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "YM-2401JCR", STRLEN("YM-2401JCR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JCR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_F2B;
}
else if (strncmp(model_name, "YM-2401JDR", STRLEN("YM-2401JDR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JDR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_B2F;
}
@@ -187,14 +187,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "um400d01G", STRLEN("um400d01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01G")] = 0;
strncpy(modelname, model_name, 10);
aim_strlcpy(modelname, model_name, 10);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", STRLEN("um400d01-01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01-01G")] = 0;
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_DC_48V_F2B;
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS6812_32X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS6812_32X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS6812_32X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS6812_32X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS6812_32X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS6812_32X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS6812_32X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -1,10 +1,10 @@
###############################################################################
#
#
#
#
###############################################################################
THIS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
x86_64_accton_as6812_32x_INCLUDES := -I $(THIS_DIR)inc
x86_64_accton_as6812_32x_INTERNAL_INCLUDES := -I $(THIS_DIR)src
x86_64_accton_as6812_32x_DEPENDMODULE_ENTRIES := init:x86_64_accton_as6812_32x ucli:x86_64_accton_as6812_32x
x86_64_accton_as6812_32x_CFLAGS := -Wno-sizeof-pointer-memaccess

View File

@@ -27,6 +27,7 @@
#include <unistd.h>
#include <onlplib/file.h>
#include <fcntl.h>
#include <limits.h>
#include "platform_lib.h"
#define PREFIX_PATH_ON_MAIN_BOARD "/sys/devices/platform/as6812_32x_fan/"
@@ -137,7 +138,7 @@ onlp_fan_info_t linfo[] = {
#define SET_PSU_TYPE_AC_B2F_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_B2F); \
info->caps |= ONLP_FAN_CAPS_SET_PERCENTAGE | ONLP_FAN_CAPS_GET_RPM | ONLP_FAN_CAPS_GET_PERCENTAGE
#define SET_PSU_TYPE_UM400D_F2B_FAN(info) \
info->status |= (ONLP_FAN_STATUS_PRESENT | ONLP_FAN_STATUS_F2B)
@@ -150,7 +151,7 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan/fanr fault status (turn on when any one fails)
*/
@@ -166,13 +167,13 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
/* get fan/fanr direction (both : the same)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) == 0) /*F2B*/
info->status |= ONLP_FAN_STATUS_F2B;
else
info->status |= ONLP_FAN_STATUS_B2F;
else
info->status |= ONLP_FAN_STATUS_B2F;
/* get fan/fanr speed (take the min from two speeds)
*/
@@ -205,7 +206,7 @@ _onlp_fani_info_get_fan_on_psu_ym2401(int pid, onlp_fan_info_t* info)
if (psu_ym2401_pmbus_info_get(pid, "psu_fan1_speed_rpm", &val) == ONLP_STATUS_OK) {
info->status |= (val > 0) ? 0 : ONLP_FAN_STATUS_FAILED;
info->rpm = val;
info->percentage = (info->rpm * 100) / 21600;
info->percentage = (info->rpm * 100) / 21600;
}
return ONLP_STATUS_OK;
@@ -217,7 +218,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
int psu_id;
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[80] = {0};
char fullpath[PATH_MAX] = {0};
psu_type_t psu_type;
/* get fan fault status
@@ -251,18 +252,18 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
if (psu_type == PSU_TYPE_AC_COMPUWARE_F2B ||
psu_type == PSU_TYPE_AC_COMPUWARE_B2F )
{
/* get fan fault status
/* get fan fault status
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].status);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].status);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) > 0)
info->status |= ONLP_FAN_STATUS_FAILED;
/* get fan speed
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].speed);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
info->rpm = atoi(r_data);
/* get speed percentage from rpm */
info->percentage = (info->rpm * 100)/MAX_PSU_FAN_SPEED;
@@ -343,7 +344,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -371,7 +372,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
return psu_ym2401_pmbus_info_set(psu_id, "psu_fan1_duty_cycle_percentage", p);
}
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].ctrl_speed);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_PSU, fan_path[local_id].ctrl_speed);
break;
}
case FAN_1_ON_MAIN_BOARD:
@@ -439,4 +440,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -29,7 +29,7 @@
#include <string.h>
#include <fcntl.h>
#include <onlplib/mmap.h>
#include <limits.h>
#include "platform_lib.h"
#define prefix_path "/sys/class/leds/accton_as6812_32x_led::"
@@ -58,20 +58,20 @@ enum onlp_led_id
LED_FAN4,
LED_FAN5
};
enum led_light_mode {
/* psu led mode */
LED_MODE_PSU_OFF = 0,
LED_MODE_PSU_GREEN,
LED_MODE_PSU_AMBER,
LED_MODE_PSU_AMBER,
LED_MODE_PSU_AUTO = 7,
/* diag led mode*/
LED_MODE_DIAG_OFF = 0,
LED_MODE_DIAG_GREEN,
LED_MODE_DIAG_AMBER,
LED_MODE_DIAG_AMBER,
LED_MODE_DIAG_GREEN_BLINK = 4,
/* locator led mode*/
LED_MODE_LOC_OFF = 0,
LED_MODE_LOC_AMBER = 2,
@@ -202,7 +202,7 @@ static onlp_led_info_t linfo[] =
static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driver_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for (i = 0; i < nsize; i++)
{
if (id == led_map[i].id && driver_led_mode == led_map[i].driver_led_mode)
@@ -210,14 +210,14 @@ static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driv
return led_map[i].onlp_led_mode;
}
}
return 0;
}
static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for(i = 0; i < nsize; i++)
{
if (id == led_map[i].id && onlp_led_mode == led_map[i].onlp_led_mode)
@@ -225,7 +225,7 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return led_map[i].driver_led_mode;
}
}
return 0;
}
@@ -245,15 +245,15 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
@@ -304,13 +304,13 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
if (deviceNodeWriteInt(fullpath, onlp_to_driver_led_mode(local_id, mode), 0) != 0)
{
return ONLP_STATUS_E_INTERNAL;
@@ -327,4 +327,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -136,25 +136,25 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (deviceNodeReadString(node, model_name, sizeof(model_name), 0) == 0) {
if (strncmp(model_name, "CPR-4011-4M11", STRLEN("CPR-4011-4M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-4011-4M21", STRLEN("CPR-4011-4M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
else if (strncmp(model_name, "CPR-6011-2M11", STRLEN("CPR-6011-2M11")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_F2B;
}
else if (strncmp(model_name, "CPR-6011-2M21", STRLEN("CPR-6011-2M21")) == 0) {
if (modelname) {
strncpy(modelname, model_name, sizeof(model_name));
aim_strlcpy(modelname, model_name, sizeof(model_name));
}
return PSU_TYPE_AC_COMPUWARE_B2F;
}
@@ -168,14 +168,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "YM-2401JCR", STRLEN("YM-2401JCR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JCR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_F2B;
}
else if (strncmp(model_name, "YM-2401JDR", STRLEN("YM-2401JDR")) == 0) {
if (modelname) {
model_name[STRLEN("YM-2401JDR")] = 0;
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
return PSU_TYPE_AC_3YPOWER_B2F;
}
@@ -189,14 +189,14 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "um400d01G", STRLEN("um400d01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01G")] = 0;
strncpy(modelname, model_name, 10);
aim_strlcpy(modelname, model_name, 10);
}
return PSU_TYPE_DC_48V_B2F;
}
else if (strncmp(model_name, "um400d01-01G", STRLEN("um400d01-01G")) == 0) {
if (modelname) {
model_name[STRLEN("um400d01-01G")] = 0;
strncpy(modelname, model_name, 13);
aim_strlcpy(modelname, model_name, 13);
}
return PSU_TYPE_DC_48V_F2B;
}

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS7112_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS7112_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS7112_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS7112_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS7112_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS7112_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS7112_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -26,6 +26,7 @@
#include <onlp/platformi/fani.h>
#include <onlplib/mmap.h>
#include <fcntl.h>
#include <limits.h>
#include "platform_lib.h"
#define PREFIX_PATH_ON_MAIN_BOARD "/sys/bus/i2c/devices/0-0063/"
@@ -166,7 +167,7 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[65] = {0};
char fullpath[PATH_MAX] = {0};
/* check if fan is present
*/
@@ -186,14 +187,14 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info)
return ONLP_STATUS_OK;
}
/* get fan/fanr direction (both : the same)
/* get fan/fanr direction (both : the same)
*/
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
sprintf(fullpath, "%s%s", PREFIX_PATH_ON_MAIN_BOARD, fan_path[local_id].direction);
OPEN_READ_FILE(fd,fullpath,r_data,nbytes,len);
if (atoi(r_data) == 0) /*B2F*/
info->status |= ONLP_FAN_STATUS_B2F;
else
else
info->status |= ONLP_FAN_STATUS_F2B;
/* get fan speed (take the min from two speeds)
@@ -219,7 +220,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, onlp_fan_info_t* info)
{
int fd, len, nbytes = 10;
char r_data[10] = {0};
char fullpath[80] = {0};
char fullpath[PATH_MAX] = {0};
/* get fan direction
*/
@@ -311,7 +312,7 @@ onlp_fani_percentage_set(onlp_oid_t id, int p)
{
int fd, len, nbytes=10, local_id;
char data[10] = {0};
char fullpath[70] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -394,4 +395,3 @@ onlp_fani_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <onlplib/mmap.h>
#include "platform_lib.h"
@@ -174,7 +175,7 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -233,7 +234,7 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
@@ -256,4 +257,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -153,7 +153,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
)
{
if (modelname) {
strncpy(modelname, model_name, 8);
aim_strlcpy(modelname, model_name, 8);
}
//printf("Vic Said It is AC Type %s\n",modelname);
@@ -177,7 +177,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "YM-2651V", 8) == 0) {
if (modelname) {
strncpy(modelname, model_name, 8);
aim_strlcpy(modelname, model_name, 8);
}
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);
@@ -196,7 +196,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
if (strncmp(model_name, "PSU-12V-750", 11) == 0) {
if (modelname) {
strncpy(modelname, model_name, 11);
aim_strlcpy(modelname, model_name, 11);
}
node = (id == PSU1_ID) ? PSU1_AC_HWMON_NODE(psu_fan_dir) : PSU2_AC_HWMON_NODE(psu_fan_dir);

View File

@@ -3,7 +3,7 @@
#
# Inclusive Makefile for the x86_64_accton_as7112_54x module.
#
# Autogenerated 2019-07-13 17:26:43.980186
# Autogenerated 2019-07-30 18:47:57.583722
#
###############################################################################
x86_64_accton_as7112_54x_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS7312_54X_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS7312_54X_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS7312_54X_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS7312_54X_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS7312_54X_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS7312_54X_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS7312_54X_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -29,7 +29,7 @@
#include <string.h>
#include <fcntl.h>
#include <onlplib/mmap.h>
#include <limits.h>
#include "platform_lib.h"
#define prefix_path "/sys/class/leds/accton_as7312_54x_led::"
@@ -53,7 +53,7 @@ enum onlp_led_id
LED_PSU1,
LED_PSU2
};
enum led_light_mode {
LED_MODE_OFF = 0,
LED_MODE_GREEN,
@@ -132,7 +132,7 @@ static onlp_led_info_t linfo[] =
static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driver_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for (i = 0; i < nsize; i++)
{
if (id == led_map[i].id && driver_led_mode == led_map[i].driver_led_mode)
@@ -140,14 +140,14 @@ static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driv
return led_map[i].onlp_led_mode;
}
}
return 0;
}
static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for(i = 0; i < nsize; i++)
{
if (id == led_map[i].id && onlp_led_mode == led_map[i].onlp_led_mode)
@@ -155,7 +155,7 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return led_map[i].driver_led_mode;
}
}
return 0;
}
@@ -188,15 +188,15 @@ onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
@@ -235,14 +235,14 @@ onlp_ledi_set(onlp_oid_t id, int on_or_off)
} else {
int rv;
onlp_led_mode_t mode = ONLP_LED_MODE_OFF;
onlp_led_mode_t mode = ONLP_LED_MODE_OFF;
onlp_led_info_t led_info;
rv = onlp_ledi_info_get(id, &led_info);
if (rv < 0)
return rv;
/*If multiple color is supported, take the mode at highest bit.*/
mode = _log2(led_info.caps);
mode = _log2(led_info.caps);
return onlp_ledi_mode_set(id, mode);
}
}
@@ -257,13 +257,13 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
if (onlp_file_write_integer(fullpath, onlp_to_driver_led_mode(local_id, mode)) != 0)
{
return ONLP_STATUS_E_INTERNAL;
@@ -280,4 +280,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

View File

@@ -111,7 +111,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
}
if (modelname) {
strncpy(modelname, model_name, modelname_len-1);
aim_strlcpy(modelname, model_name, modelname_len-1);
}
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

View File

@@ -44,7 +44,7 @@ definitions:
- free
- memset
- memcpy
- strncpy
- vsnprintf
- snprintf
- strlen

View File

@@ -60,16 +60,6 @@
#endif
#endif
#ifndef X86_64_ACCTON_AS7312_54XS_STRNCPY
#if defined(GLOBAL_STRNCPY)
#define X86_64_ACCTON_AS7312_54XS_STRNCPY GLOBAL_STRNCPY
#elif X86_64_ACCTON_AS7312_54XS_CONFIG_PORTING_STDLIB == 1
#define X86_64_ACCTON_AS7312_54XS_STRNCPY strncpy
#else
#error The macro X86_64_ACCTON_AS7312_54XS_STRNCPY is required but cannot be defined.
#endif
#endif
#ifndef X86_64_ACCTON_AS7312_54XS_VSNPRINTF
#if defined(GLOBAL_VSNPRINTF)
#define X86_64_ACCTON_AS7312_54XS_VSNPRINTF GLOBAL_VSNPRINTF

View File

@@ -29,7 +29,7 @@
#include <string.h>
#include <fcntl.h>
#include <onlplib/mmap.h>
#include <limits.h>
#include "platform_lib.h"
#define prefix_path "/sys/class/leds/accton_as7312_54xs_led::"
@@ -53,7 +53,7 @@ enum onlp_led_id
LED_PSU1,
LED_PSU2
};
enum led_light_mode {
LED_MODE_OFF = 0,
LED_MODE_GREEN,
@@ -132,7 +132,7 @@ static onlp_led_info_t linfo[] =
static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driver_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for (i = 0; i < nsize; i++)
{
if (id == led_map[i].id && driver_led_mode == led_map[i].driver_led_mode)
@@ -140,14 +140,14 @@ static int driver_to_onlp_led_mode(enum onlp_led_id id, enum led_light_mode driv
return led_map[i].onlp_led_mode;
}
}
return 0;
}
static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led_mode)
{
int i, nsize = sizeof(led_map)/sizeof(led_map[0]);
for(i = 0; i < nsize; i++)
{
if (id == led_map[i].id && onlp_led_mode == led_map[i].onlp_led_mode)
@@ -155,7 +155,7 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return led_map[i].driver_led_mode;
}
}
return 0;
}
@@ -175,17 +175,13 @@ int
onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info)
{
int local_id;
char data[2] = {0};
char fullpath[50] = {0};
char data[2] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
/* get fullpath */
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
/* Set the onlp_oid_hdr_t and capabilities */
/* Set the onlp_oid_hdr_t and capabilities */
*info = linfo[ONLP_OID_ID_GET(id)];
/* Set LED mode */
@@ -235,13 +231,13 @@ int
onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode)
{
int local_id;
char fullpath[50] = {0};
char fullpath[PATH_MAX] = {0};
VALIDATE(id);
local_id = ONLP_OID_ID_GET(id);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
sprintf(fullpath, "%s%s/%s", prefix_path, last_path[local_id], filename);
if (onlp_file_write_integer(fullpath, onlp_to_driver_led_mode(local_id, mode)) != 0)
{
return ONLP_STATUS_E_INTERNAL;
@@ -258,4 +254,3 @@ onlp_ledi_ioctl(onlp_oid_t id, va_list vargs)
{
return ONLP_STATUS_E_UNSUPPORTED;
}

Some files were not shown because too many files have changed in this diff Show More