From 8aad659697407dcb408f2390bb143b0d3660a716 Mon Sep 17 00:00:00 2001
From: Francois Isabelle <isabellf@users.sourceforge.net>
Date: Fri, 14 Dec 2007 20:34:56 +0000
Subject: [PATCH] added product name resolution in 'mc info'

---
 ipmitool/include/ipmitool/ipmi_strings.h |  3 ++
 ipmitool/lib/helper.c                    |  4 +--
 ipmitool/lib/ipmi_mc.c                   | 10 ++++++
 ipmitool/lib/ipmi_strings.c              | 43 ++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/ipmitool/include/ipmitool/ipmi_strings.h b/ipmitool/include/ipmitool/ipmi_strings.h
index 144451b..818a8bb 100644
--- a/ipmitool/include/ipmitool/ipmi_strings.h
+++ b/ipmitool/include/ipmitool/ipmi_strings.h
@@ -53,6 +53,9 @@ extern const struct valstr ipmi_integrity_algorithms[];
 extern const struct valstr ipmi_encryption_algorithms[];
 extern const struct valstr ipmi_oem_info[];
 
+/* these are similar, expect that the lookup takes the IANA number
+   as first parameter */
+extern const struct oemvalstr ipmi_oem_product_info[];
 extern const struct oemvalstr ipmi_oem_sdr_type_vals[];
 
 
diff --git a/ipmitool/lib/helper.c b/ipmitool/lib/helper.c
index bde52b3..86823df 100644
--- a/ipmitool/lib/helper.c
+++ b/ipmitool/lib/helper.c
@@ -119,7 +119,7 @@ const char * val2str(uint16_t val, const struct valstr *vs)
 	}
 
 	memset(un_str, 0, 32);
-	snprintf(un_str, 32, "Unknown (0x%x)", val);
+	snprintf(un_str, 32, "Unknown (0x%02X)", val);
 
 	return un_str;
 }
@@ -148,7 +148,7 @@ const char * oemval2str(uint16_t oem, uint16_t val,
 	}
 
 	memset(un_str, 0, 32);
-	snprintf(un_str, 32, "OEM reserved #%02x", val);
+	snprintf(un_str, 32, "Unknown (0x%X)", val);
 
 	return un_str;
 }
diff --git a/ipmitool/lib/ipmi_mc.c b/ipmitool/lib/ipmi_mc.c
index 85ffa83..2bfe9c5 100644
--- a/ipmitool/lib/ipmi_mc.c
+++ b/ipmitool/lib/ipmi_mc.c
@@ -315,6 +315,7 @@ ipmi_mc_get_deviceid(struct ipmi_intf * intf)
 	struct ipmi_rq req;
 	struct ipm_devid_rsp *devid;
 	int i;
+	char *product=NULL;
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_APP;
@@ -352,6 +353,15 @@ ipmi_mc_get_deviceid(struct ipmi_intf * intf)
 	printf("Product ID                : %u (0x%02x%02x)\n",
 		buf2short((uint8_t *)(devid->product_id)),
 		devid->product_id[1], devid->product_id[0]);
+
+	product=oemval2str(IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id),
+							 (devid->product_id[1]<<8)+devid->product_id[0],
+							 ipmi_oem_product_info);
+
+	if (product!=NULL) {
+		printf("Product Name              : %s\n", product);
+	}
+
 	printf("Device Available          : %s\n",
 		(devid->fw_rev1 & IPM_DEV_FWREV1_AVAIL_MASK) ?
 		"no" : "yes");
diff --git a/ipmitool/lib/ipmi_strings.c b/ipmitool/lib/ipmi_strings.c
index efd6408..8b3d940 100644
--- a/ipmitool/lib/ipmi_strings.c
+++ b/ipmitool/lib/ipmi_strings.c
@@ -68,6 +68,49 @@ const struct valstr ipmi_oem_info[] = {
    { 0xffff , NULL },
 };
 
+const struct oemvalstr ipmi_oem_product_info[] = {
+   /* Keep OEM grouped together */
+   /* Intel stuff, thanks to Tim Bell */
+   { IPMI_OEM_INTEL, 0x000C, "TSRLT2" },
+   { IPMI_OEM_INTEL, 0x001B, "TIGPR2U" },
+   { IPMI_OEM_INTEL, 0x0022, "TIGI2U" },
+   { IPMI_OEM_INTEL, 0x0026, "Bridgeport" },
+   { IPMI_OEM_INTEL, 0x0028, "S5000PAL" },
+   { IPMI_OEM_INTEL, 0x0029, "S5000PSL" },
+   { IPMI_OEM_INTEL, 0x0100, "Tiger4" },
+   { IPMI_OEM_INTEL, 0x0103, "McCarran" },
+   { IPMI_OEM_INTEL, 0x0800, "ZT5504" },
+   { IPMI_OEM_INTEL, 0x0808, "MPCBL0001" },
+   { IPMI_OEM_INTEL, 0x0811, "TIGW1U" },
+   { IPMI_OEM_INTEL, 0x4311, "NSI2U" },
+   /* Kontron */
+   { IPMI_OEM_KONTRON,4000, "AM4000 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4001, "AM4001 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4002, "AM4002 AdvancedMC" },
+   { IPMI_OEM_KONTRON,4010, "AM4010 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5503, "AM4500/4520 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5504, "AM4300 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5507, "AM4301 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5508, "AM4330 AdvancedMC" },
+   { IPMI_OEM_KONTRON,5703, "RTM8020" },
+   { IPMI_OEM_KONTRON,5704, "RTM8030" },
+   { IPMI_OEM_KONTRON,6000, "CP6000" },
+   { IPMI_OEM_KONTRON,6006, "DT-64" },
+   { IPMI_OEM_KONTRON,6010, "CP6010" },
+   { IPMI_OEM_KONTRON,6011, "CP6011" },
+   { IPMI_OEM_KONTRON,6012, "CP6012" },
+   { IPMI_OEM_KONTRON,6014, "CP6014" },
+   { IPMI_OEM_KONTRON,5002, "AT8001" },
+   { IPMI_OEM_KONTRON,5003, "AT8010" },
+   { IPMI_OEM_KONTRON,5004, "AT8020" },
+   { IPMI_OEM_KONTRON,5006, "AT8030 IPMC" },
+   { IPMI_OEM_KONTRON,2025, "AT8030 MMC" },
+   { IPMI_OEM_KONTRON,5301, "AT8400" },
+   { IPMI_OEM_KONTRON,5303, "AT8901" },
+
+   { 0xffff        , 0xffff , NULL },
+ };
+
 const struct oemvalstr ipmi_oem_sdr_type_vals[] = {
    /* Keep OEM grouped together */
    { IPMI_OEM_KONTRON , 0xC0 , "OEM Firmware Info" },