scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set platform_name to correct value.

Browse Source
This commit is contained in:
Jeffrey Townsend
2016-12-19 15:59:57 +00:00
parent 05f85f7b6d
commit 2449ac19c5
3 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/sysi.c
View File

@@ -36,7 +36,8 @@
#include "x86_64_mlnx_msn2100_int.h"
#include "x86_64_mlnx_msn2100_log.h"
#define ONL_PLATFORM_NAME "x86-64-mlnx-msn2100-r0"
#define ONIE_PLATFORM_NAME "x86_64-mlnx_msn2100-r0"
#define COMMAND_OUTPUT_BUFFER 256
@@ -51,7 +52,7 @@ static char arr_cplddev_name[NUM_OF_CPLD][30] =
const char*
onlp_sysi_platform_get(void)
{
return "x86-64-mlnx-msn2100-r0";
return ONL_PLATFORM_NAME;
}
int
@@ -109,9 +110,18 @@ onlp_sysi_oids_get(onlp_oid_t* table, int max)
#include <onlplib/onie.h>
int
onlp_sysi_onie_info_get(onlp_onie_info_t* onie)
{
return onlp_onie_read_json(onie,
"/lib/platform-config/current/onl/etc/onie/eeprom.json");
int rv = onlp_onie_read_json(onie,
"/lib/platform-config/current/onl/etc/onie/eeprom.json");
if(rv >= 0) {
if(onie->platform_name) {
aim_free(onie->platform_name);
}
onie->platform_name = aim_strdup(ONIE_PLATFORM_NAME);
}
return rv;
}

17
packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/sysi.c
View File

@@ -36,6 +36,9 @@
#include "x86_64_mlnx_msn2410_int.h"
#include "x86_64_mlnx_msn2410_log.h"
#define ONL_PLATFORM_NAME "x86-64-mlnx-msn2410-r0"
#define ONIE_PLATFORM_NAME "x86-64-mlnx_msn2410-r0"
#define NUM_OF_THERMAL_ON_MAIN_BROAD CHASSIS_THERMAL_COUNT
#define NUM_OF_FAN_ON_MAIN_BROAD CHASSIS_FAN_COUNT
#define NUM_OF_PSU_ON_MAIN_BROAD 2
@@ -55,7 +58,7 @@ static char arr_cplddev_name[NUM_OF_CPLD][30] =
const char*
onlp_sysi_platform_get(void)
{
return "x86-64-mlnx-msn2410-r0";
return ONL_PLATFORM_NAME;
}
int
@@ -118,6 +121,14 @@ onlp_sysi_oids_get(onlp_oid_t* table, int max)
int
onlp_sysi_onie_info_get(onlp_onie_info_t* onie)
{
return onlp_onie_read_json(onie,
"/lib/platform-config/current/onl/etc/onie/eeprom.json");
int rv = onlp_onie_read_json(onie,
"/lib/platform-config/current/onl/etc/onie/eeprom.json");
if(rv >= 0) {
if(onie->platform_name) {
aim_free(onie->platform_name);
}
onie->platform_name = aim_strdup(ONIE_PLATFORM_NAME);
}
return rv;
}

27
packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/sysi.c
View File

@@ -36,15 +36,19 @@
#include "x86_64_mlnx_msn2700_int.h"
#include "x86_64_mlnx_msn2700_log.h"
#define ONL_PLATFORM_NAME "x86-64-mlnx-msn2700-r0"
#define ONIE_PLATFORM_NAME "x86_64-mlnx_msn2700-r0"
#define NUM_OF_THERMAL_ON_MAIN_BROAD CHASSIS_THERMAL_COUNT
#define NUM_OF_FAN_ON_MAIN_BROAD CHASSIS_FAN_COUNT
#define NUM_OF_PSU_ON_MAIN_BROAD 2
#define NUM_OF_LED_ON_MAIN_BROAD 6
#define COMMAND_OUTPUT_BUFFER 256
#define COMMAND_OUTPUT_BUFFER 256
#define PREFIX_PATH_ON_CPLD_DEV "/bsp/cpld"
#define NUM_OF_CPLD 3
#define PREFIX_PATH_ON_CPLD_DEV "/bsp/cpld"
#define NUM_OF_CPLD 3
static char arr_cplddev_name[NUM_OF_CPLD][30] =
{
"cpld_brd_version",
@@ -55,7 +59,7 @@ static char arr_cplddev_name[NUM_OF_CPLD][30] =
const char*
onlp_sysi_platform_get(void)
{
return "x86-64-mlnx-msn2700-r0";
return ONL_PLATFORM_NAME;
}
int
@@ -114,3 +118,18 @@ onlp_sysi_oids_get(onlp_oid_t* table, int max)
return 0;
}
int
onlp_sysi_onie_info_get(onlp_onie_info_t* onie)
{
int rv = onlp_onie_read_json(onie,
"/lib/platform-config/current/onl/etc/onie/eeprom.json");
if(rv >= 0) {
if(onie->platform_name) {
aim_free(onie->platform_name);
}
onie->platform_name = aim_strdup(ONIE_PLATFORM_NAME);
}
return rv;
}