[commit] r912 - trunk

[repository service]

Author: mkarcher
Date: Wed Feb 24 23:43:44 2010
New Revision: 912
URL: http://flashrom.org/trac/coreboot/changeset/912

Log:
Remove unused short IDs

This also replaces the meaningless numbers in the DMI debug printout
with the parameter names.

Signed-off-by: Michael Karcher 
Acked-by: Carl-Daniel Hailfinger

Modified:
   trunk/dmi.c

Modified: trunk/dmi.c
==============================================================================
--- trunk/dmi.c	Wed Feb 24 01:04:40 2010	(r911)
+++ trunk/dmi.c	Wed Feb 24 23:43:44 2010	(r912)
@@ -36,16 +36,13 @@

/* The short_id for baseboard starts with "m" as in mainboard to leave
    "b" available for BIOS */
-struct {
-	const char *dmidecode_name;
-	char short_id[3];
-} dmi_properties[DMI_ID_INVALID] = {
-	{"system-manufacturer", "sm"},
-	{"system-product-name", "sp"},
-	{"system-version", "sv"},
-	{"baseboard-manufacturer", "mm"},
-	{"baseboard-product-name", "mp"},
-	{"baseboard-version", "mv"}
+const char *dmidecode_names[DMI_ID_INVALID] = {
+	"system-manufacturer",
+	"system-product-name",
+	"system-version",
+	"baseboard-manufacturer",
+	"baseboard-product-name",
+	"baseboard-version"
 };

#define DMI_COMMAND_LEN_MAX 260
@@ -71,8 +68,7 @@
    {
    	char commandline[DMI_COMMAND_LEN_MAX+40];
    	snprintf(commandline, sizeof(commandline),
-		         "%s -s %s", dmidecode_command,
-		         dmi_properties[i].dmidecode_name);
+		         "%s -s %s", dmidecode_command, dmidecode_names[i]);
    	dmidecode_pipe = popen(commandline, "r");
    	if (!dmidecode_pipe)
    	{
@@ -100,7 +96,8 @@
    	if (answerbuf[0] != 0 &&
    	    answerbuf[strlen(answerbuf) - 1] == '\n')
    		answerbuf[strlen(answerbuf) - 1] = 0;
-		printf_debug("DMI string %d: "%s"\n", i, answerbuf);
+		printf_debug("DMI string %s: "%s"\n", dmidecode_names[i],
+		             answerbuf);
    	dmistrings[i] = strdup(answerbuf);
    }
    has_dmi_support = 1;