From 431421c6ffcd44034ddf475da5af26b6a8744dd4 Mon Sep 17 00:00:00 2001 From: Francois Isabelle Date: Mon, 10 Dec 2007 21:15:08 +0000 Subject: [PATCH] Merged Tim Bell's patch for IANA numbers to vendor name conversion --- ipmitool/include/ipmitool/ipmi.h | 38 +++++++++++++++++++++++--------- ipmitool/lib/ipmi_strings.c | 38 +++++++++++++++++++++++--------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/ipmitool/include/ipmitool/ipmi.h b/ipmitool/include/ipmitool/ipmi.h index 0aec66f..9f734e4 100644 --- a/ipmitool/include/ipmitool/ipmi.h +++ b/ipmitool/include/ipmitool/ipmi.h @@ -239,17 +239,33 @@ struct ipmi_rs { /* These values are IANA numbers */ typedef enum IPMI_OEM { - IPMI_OEM_UNKNOWN = 0, - IPMI_OEM_SUN = 42, - IPMI_OEM_NOKIA = 94, - IPMI_OEM_INTEL = 343, - IPMI_OEM_RADISYS = 4337, - IPMI_OEM_TYAN = 6653, - IPMI_OEM_NEWISYS = 9237, - IPMI_OEM_SUPERMICRO = 10876, - IPMI_OEM_GOOGLE = 11129, - IPMI_OEM_PICMG = 12634, - IPMI_OEM_KONTRON = 15000, + IPMI_OEM_UNKNOWN = 0, + IPMI_OEM_HP = 11, + IPMI_OEM_SUN = 42, + IPMI_OEM_NOKIA = 94, + IPMI_OEM_HITACHI_116 = 116, + IPMI_OEM_NEC = 119, + IPMI_OEM_TOSHIBA = 186, + IPMI_OEM_INTEL = 343, + IPMI_OEM_TATUNG = 373, + IPMI_OEM_HITACHI_399 = 399, + IPMI_OEM_DELL = 674, + IPMI_OEM_LMC = 2168, + IPMI_OEM_RADISYS = 4337, + IPMI_OEM_MAGNUM = 5593, + IPMI_OEM_TYAN = 6653, + IPMI_OEM_NEWISYS = 9237, + IPMI_OEM_FUJITSU_SEIMENS = 10368, + IPMI_OEM_AVOCENT = 10418, + IPMI_OEM_PEPPERCON = 10437, + IPMI_OEM_SUPERMICRO = 10876, + IPMI_OEM_OSA = 11102, + IPMI_OEM_GOOGLE = 11129, + IPMI_OEM_PICMG = 12634, + IPMI_OEM_RARITAN = 13742, + IPMI_OEM_KONTRON = 15000, + IPMI_OEM_AMI = 20974, + IPMI_OEM_NOKIA_SIEMENS_NETWORKS = 28458 } IPMI_OEM; extern const struct valstr completion_code_vals[]; diff --git a/ipmitool/lib/ipmi_strings.c b/ipmitool/lib/ipmi_strings.c index 2bf1882..efd6408 100644 --- a/ipmitool/lib/ipmi_strings.c +++ b/ipmitool/lib/ipmi_strings.c @@ -38,17 +38,33 @@ const struct valstr ipmi_oem_info[] = { - { IPMI_OEM_UNKNOWN, "Unknown" }, - { IPMI_OEM_SUN, "Sun Microsystems" }, - { IPMI_OEM_INTEL, "Intel Corporation" }, - { IPMI_OEM_RADISYS, "RadiSys Corporation" }, - { IPMI_OEM_TYAN, "Tyan Computer Corporation" }, - { IPMI_OEM_NEWISYS, "Newisys" }, - { IPMI_OEM_SUPERMICRO, "Supermicro" }, - { IPMI_OEM_GOOGLE, "Google" }, - { IPMI_OEM_KONTRON, "Kontron" }, - { IPMI_OEM_NOKIA, "Nokia" }, - { IPMI_OEM_PICMG, "PICMG" }, + { IPMI_OEM_UNKNOWN, "Unknown" }, + { IPMI_OEM_HP, "Hewlett-Packard" }, + { IPMI_OEM_SUN, "Sun Microsystems" }, + { IPMI_OEM_INTEL, "Intel Corporation" }, + { IPMI_OEM_LMC, "LMC" }, + { IPMI_OEM_RADISYS, "RadiSys Corporation" }, + { IPMI_OEM_TYAN, "Tyan Computer Corporation" }, + { IPMI_OEM_NEWISYS, "Newisys" }, + { IPMI_OEM_SUPERMICRO, "Supermicro" }, + { IPMI_OEM_GOOGLE, "Google" }, + { IPMI_OEM_KONTRON, "Kontron" }, + { IPMI_OEM_NOKIA, "Nokia" }, + { IPMI_OEM_PICMG, "PICMG" }, + { IPMI_OEM_PEPPERCON, "Peppercon AG" }, + { IPMI_OEM_DELL, "DELL Inc" }, + { IPMI_OEM_NEC, "NEC" }, + { IPMI_OEM_MAGNUM, "Magnum Technologies" }, + { IPMI_OEM_FUJITSU_SEIMENS, "Fujitsu Siemens" }, + { IPMI_OEM_TATUNG, "Tatung" }, + { IPMI_OEM_AMI, "AMI" }, + { IPMI_OEM_RARITAN, "Raritan" }, + { IPMI_OEM_AVOCENT, "Avocent" }, + { IPMI_OEM_OSA, "OSA" }, + { IPMI_OEM_TOSHIBA, "Toshiba" }, + { IPMI_OEM_HITACHI_116, "Hitachi" }, + { IPMI_OEM_HITACHI_399, "Hitachi" }, + { IPMI_OEM_NOKIA_SIEMENS_NETWORKS, "Nokia Siemens Networks" }, { 0xffff , NULL }, };