From a022f97157cc25403e497b8987eb4ee757afab82 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 5 Jan 2016 18:45:03 +0000 Subject: [PATCH] Import latest from quanta. --- .../src/quanta_sys_eeprom/Makefile | 0 .../src/quanta_sys_eeprom/README | 0 .../src/quanta_sys_eeprom/module/auto/make.mk | 0 .../module/auto/quanta_sys_eeprom.yml | 0 .../module/inc/quanta_sys_eeprom/eeprom.h | 7 ++++++ .../inc/quanta_sys_eeprom/quanta_sys_eeprom.x | 0 .../quanta_sys_eeprom_config.h | 0 .../quanta_sys_eeprom/quanta_sys_eeprom_dox.h | 0 .../quanta_sys_eeprom_porting.h | 0 .../src/quanta_sys_eeprom/module/make.mk | 0 .../src/quanta_sys_eeprom/module/src/Makefile | 0 .../src/quanta_sys_eeprom/module/src/eeprom.c | 23 +++++++++++++++++++ .../src/quanta_sys_eeprom/module/src/make.mk | 0 .../module/src/quanta_sys_eeprom_config.c | 0 .../module/src/quanta_sys_eeprom_enums.c | 0 .../module/src/quanta_sys_eeprom_int.h | 0 .../module/src/quanta_sys_eeprom_log.c | 0 .../module/src/quanta_sys_eeprom_log.h | 0 .../module/src/quanta_sys_eeprom_module.c | 0 .../module/src/quanta_sys_eeprom_ucli.c | 0 .../quanta_sys_eeprom/quanta_sys_eeprom.doxy | 0 .../quanta_sys_eeprom/quanta_sys_eeprom.mk | 0 .../src/quanta_sys_eeprom/utest/_make.mk | 0 .../src/quanta_sys_eeprom/utest/main.c | 0 24 files changed, 30 insertions(+) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/Makefile (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/README (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/auto/make.mk (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/auto/quanta_sys_eeprom.yml (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h (91%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom.x (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_config.h (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_dox.h (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_porting.h (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/make.mk (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/Makefile (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/eeprom.c (88%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/make.mk (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_config.c (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_enums.c (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_int.h (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.c (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.h (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_module.c (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_ucli.c (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/quanta_sys_eeprom.doxy (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/quanta_sys_eeprom.mk (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/utest/_make.mk (100%) rename packages/platforms/quanta/{powerpc => any}/src/quanta_sys_eeprom/utest/main.c (100%) diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/Makefile b/packages/platforms/quanta/any/src/quanta_sys_eeprom/Makefile similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/Makefile rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/Makefile diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/README b/packages/platforms/quanta/any/src/quanta_sys_eeprom/README similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/README rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/README diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/auto/make.mk b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/auto/make.mk similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/auto/make.mk rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/auto/make.mk diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/auto/quanta_sys_eeprom.yml b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/auto/quanta_sys_eeprom.yml similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/auto/quanta_sys_eeprom.yml rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/auto/quanta_sys_eeprom.yml diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h similarity index 91% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h index 48742dfb..1ced2dea 100644 --- a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h +++ b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/eeprom.h @@ -64,4 +64,11 @@ int quanta_sys_eeprom_to_onie(const quanta_sys_eeprom_t* src, int quanta_sys_eeprom_show(aim_pvs_t* pvs, quanta_sys_eeprom_t* e); +/** + * @brief Convert Quanta ONIE sys-eeprom with specified format + * @param onie The onie eeprom structure. + */ + +int quanta_onie_sys_eeprom_custom_format(onlp_onie_info_t* onie); + #endif /* __QUANTA_SYS_EEPROM_EEPROM_H__ */ diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom.x b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom.x similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom.x rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom.x diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_config.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_config.h similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_config.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_config.h diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_dox.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_dox.h similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_dox.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_dox.h diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_porting.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_porting.h similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_porting.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/inc/quanta_sys_eeprom/quanta_sys_eeprom_porting.h diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/make.mk b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/make.mk similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/make.mk rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/make.mk diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/Makefile b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/Makefile similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/Makefile rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/Makefile diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/eeprom.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/eeprom.c similarity index 88% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/eeprom.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/eeprom.c index d24f01dc..41039687 100644 --- a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/eeprom.c +++ b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/eeprom.c @@ -158,3 +158,26 @@ quanta_sys_eeprom_show(aim_pvs_t* pvs, quanta_sys_eeprom_t* e) return 0; } +int +quanta_onie_sys_eeprom_custom_format(onlp_onie_info_t* onie) +{ + char buf[512]; + + if(onie == NULL) { + return -1; + } + + memset(buf, 0, sizeof(buf)); + sprintf(buf, "%d.%d.%d.%d (0x%02x%02x)", + ((onie->diag_version[0] & 0xf0) >> 4), + (onie->diag_version[0] & 0x0f), + ((onie->diag_version[1] & 0xf0) >> 4), + (onie->diag_version[1] & 0x0f), + (onie->diag_version[2] & 0xff), + (onie->diag_version[3] & 0xff)); + aim_free((void*) onie->diag_version); + onie->diag_version = aim_zmalloc(strlen(buf) + 1); + memcpy((void*) onie->diag_version, buf, strlen(buf)); + + return 0; +} diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/make.mk b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/make.mk similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/make.mk rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/make.mk diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_config.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_config.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_config.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_config.c diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_enums.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_enums.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_enums.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_enums.c diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_int.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_int.h similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_int.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_int.h diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.c diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.h b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.h similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.h rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_log.h diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_module.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_module.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_module.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_module.c diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_ucli.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_ucli.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_ucli.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/module/src/quanta_sys_eeprom_ucli.c diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/quanta_sys_eeprom.doxy b/packages/platforms/quanta/any/src/quanta_sys_eeprom/quanta_sys_eeprom.doxy similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/quanta_sys_eeprom.doxy rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/quanta_sys_eeprom.doxy diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/quanta_sys_eeprom.mk b/packages/platforms/quanta/any/src/quanta_sys_eeprom/quanta_sys_eeprom.mk similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/quanta_sys_eeprom.mk rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/quanta_sys_eeprom.mk diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/utest/_make.mk b/packages/platforms/quanta/any/src/quanta_sys_eeprom/utest/_make.mk similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/utest/_make.mk rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/utest/_make.mk diff --git a/packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/utest/main.c b/packages/platforms/quanta/any/src/quanta_sys_eeprom/utest/main.c similarity index 100% rename from packages/platforms/quanta/powerpc/src/quanta_sys_eeprom/utest/main.c rename to packages/platforms/quanta/any/src/quanta_sys_eeprom/utest/main.c