Imported Upstream version 1.8.16upstream/1.8.16

1 files changed, 26 insertions, 24 deletions

diff --git a/lib/ipmi_mc.c b/lib/ipmi_mc.c
index 2890c90..a93134e 100644
--- a/lib/ipmi_mc.c
+++ b/lib/ipmi_mc.c
@@ -130,43 +130,41 @@ struct bitfield_data {
 	const char * name;
 	const char * desc;
 	uint32_t mask;
-};
-
-struct bitfield_data mc_enables_bf[] = {
+} mc_enables_bf[] = {
 	{
-		name:	"recv_msg_intr",
-		desc:	"Receive Message Queue Interrupt",
-		mask:	1<<0,
+		.name = "recv_msg_intr",
+		.desc = "Receive Message Queue Interrupt",
+		.mask = 1<<0,
 	},
 	{
-		name:	"event_msg_intr",
-		desc:	"Event Message Buffer Full Interrupt",
-		mask:	1<<1,
+		.name = "event_msg_intr",
+		.desc = "Event Message Buffer Full Interrupt",
+		.mask = 1<<1,
 	},
 	{
-		name:	"event_msg",
-		desc:	"Event Message Buffer",
-		mask:	1<<2,
+		.name = "event_msg",
+		.desc = "Event Message Buffer",
+		.mask = 1<<2,
 	},
 	{
-		name:	"system_event_log",
-		desc:	"System Event Logging",
-		mask:	1<<3,
+		.name = "system_event_log",
+		.desc = "System Event Logging",
+		.mask = 1<<3,
 	},
 	{
-		name:	"oem0",
-		desc:	"OEM 0",
-		mask:	1<<5,
+		.name = "oem0",
+		.desc = "OEM 0",
+		.mask = 1<<5,
 	},
 	{
-		name:	"oem1",
-		desc:	"OEM 1",
-		mask:	1<<6,
+		.name = "oem1",
+		.desc = "OEM 1",
+		.mask = 1<<6,
 	},
 	{
-		name:	"oem2",
-		desc:	"OEM 2",
-		mask:	1<<7,
+		.name = "oem2",
+		.desc = "OEM 2",
+		.mask = 1<<7,
 	},
 	{ NULL },
 };
@@ -217,6 +215,8 @@ printf_sysinfo_usage(int full_help)
 		lprintf(LOG_NOTICE, "  Valid arguments are:");
 	}
 	lprintf(LOG_NOTICE,
+			"    system_fw_version   System firmware (e.g. BIOS) version");
+	lprintf(LOG_NOTICE,
 			"    primary_os_name     Primary operating system name");
 	lprintf(LOG_NOTICE, "    os_name             Operating system name");
 	lprintf(LOG_NOTICE,
@@ -914,6 +914,8 @@ sysinfo_param(const char *str, int *maxset)
 	else if (!strcmp(str, "delloem_url")) {
 		*maxset = 2;
 		return IPMI_SYSINFO_DELL_URL;
+	} else if (!strcmp(str, "system_fw_version")) {
+		return IPMI_SYSINFO_SYSTEM_FW_VERSION;
 	}
 
 	return (-1);