diff --git a/ipmitool/include/ipmitool/ipmi_sel.h b/ipmitool/include/ipmitool/ipmi_sel.h index 67c7826..3351f49 100644 --- a/ipmitool/include/ipmitool/ipmi_sel.h +++ b/ipmitool/include/ipmitool/ipmi_sel.h @@ -469,11 +469,11 @@ static struct ipmi_event_sensor_types sensor_specific_types[] __attribute__((unu /* These values are IANA numbers */ typedef enum IPMI_OEM { IPMI_OEM_UNKNOWN = 0, + IPMI_OEM_INTEL = 343, IPMI_OEM_NEWISYS = 9237, - IPMI_OEM_INTEL, + IPMI_OEM_KONTRON = 15000 } IPMI_OEM; - int ipmi_sel_main(struct ipmi_intf *, int, char **); void ipmi_sel_print_std_entry(struct ipmi_intf * intf, struct sel_event_record * evt); void ipmi_sel_print_std_entry_verbose(struct ipmi_intf * intf, struct sel_event_record * evt); diff --git a/ipmitool/include/ipmitool/ipmi_strings.h b/ipmitool/include/ipmitool/ipmi_strings.h index c1bee9d..d81b4ae 100644 --- a/ipmitool/include/ipmitool/ipmi_strings.h +++ b/ipmitool/include/ipmitool/ipmi_strings.h @@ -55,6 +55,7 @@ extern const struct valstr ipmi_chassis_power_control_vals[]; extern const struct valstr ipmi_auth_algorithms[]; extern const struct valstr ipmi_integrity_algorithms[]; extern const struct valstr ipmi_encryption_algorithms[]; +extern const struct valstr ipmi_oem_info[]; #endif /*IPMI_STRINGS_H*/ diff --git a/ipmitool/lib/ipmi_mc.c b/ipmitool/lib/ipmi_mc.c index 266b13f..470009b 100644 --- a/ipmitool/lib/ipmi_mc.c +++ b/ipmitool/lib/ipmi_mc.c @@ -347,7 +347,11 @@ ipmi_mc_get_deviceid(struct ipmi_intf * intf) IPM_DEV_IPMI_VERSION_MAJOR(devid->ipmi_version), IPM_DEV_IPMI_VERSION_MINOR(devid->ipmi_version)); printf("Manufacturer ID : %lu\n", - (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id)); + (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id)); + printf("Manufacturer Name : %s\n", + val2str( (long)IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id), + ipmi_oem_info) ); + printf("Product ID : %u (0x%02x%02x)\n", buf2short((uint8_t *)(devid->product_id)), devid->product_id[1], devid->product_id[0]); diff --git a/ipmitool/lib/ipmi_strings.c b/ipmitool/lib/ipmi_strings.c index 640ab67..663275f 100644 --- a/ipmitool/lib/ipmi_strings.c +++ b/ipmitool/lib/ipmi_strings.c @@ -38,6 +38,16 @@ #include #include #include +#include /* for IPMI_OEM */ + +const struct valstr ipmi_oem_info[] = { + + { IPMI_OEM_UNKNOWN , "Unknown/Unspecifier OEM" }, + { IPMI_OEM_INTEL , "Intel Corporation" }, + { IPMI_OEM_NEWISYS, "Newisys" }, + { IPMI_OEM_KONTRON, "Kontron" }, + { 0xffff , NULL }, +}; const struct valstr ipmi_netfn_vals[] = { { IPMI_NETFN_CHASSIS, "Chassis" },