Unify both lists of processor families.

1 files changed, 129 insertions, 265 deletions

diff --git a/dmidecode.c b/dmidecode.c
index 9afeead..8c276cf 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -575,267 +575,138 @@ const char *dmi_processor_family(u16 code)
 	unsigned int i;
 
 	/* 3.3.5.2 */
-	static const char *family[254] = {
-		NULL, /* 0x00 */
-		"Other",
-		"Unknown",
-		"8086",
-		"80286",
-		"80386",
-		"80486",
-		"8087",
-		"80287",
-		"80387",
-		"80487",
-		"Pentium",
-		"Pentium Pro",
-		"Pentium II",
-		"Pentium MMX",
-		"Celeron",
-		"Pentium II Xeon",
-		"Pentium III",
-		"M1",
-		"M2",
-		NULL, /* 0x14 */
-		NULL,
-		NULL,
-		NULL, /* 0x17 */
-		"Duron",
-		"K5",
-		"K6",
-		"K6-2",
-		"K6-3",
-		"Athlon",
-		"AMD29000",
-		"K6-2+",
-		"Power PC",
-		"Power PC 601",
-		"Power PC 603",
-		"Power PC 603+",
-		"Power PC 604",
-		"Power PC 620",
-		"Power PC x704",
-		"Power PC 750",
-		NULL, /* 0x28 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,/* 0x2F */
-		"Alpha",
-		"Alpha 21064",
-		"Alpha 21066",
-		"Alpha 21164",
-		"Alpha 21164PC",
-		"Alpha 21164a",
-		"Alpha 21264",
-		"Alpha 21364",
-		NULL, /* 0x38 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x3F */
-		"MIPS",
-		"MIPS R4000",
-		"MIPS R4200",
-		"MIPS R4400",
-		"MIPS R4600",
-		"MIPS R10000",
-		NULL, /* 0x46 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x4F */
-		"SPARC",
-		"SuperSPARC",
-		"MicroSPARC II",
-		"MicroSPARC IIep",
-		"UltraSPARC",
-		"UltraSPARC II",
-		"UltraSPARC IIi",
-		"UltraSPARC III",
-		"UltraSPARC IIIi",
-		NULL, /* 0x59 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x5F */
-		"68040",
-		"68xxx",
-		"68000",
-		"68010",
-		"68020",
-		"68030",
-		NULL, /* 0x66 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x6F */
-		"Hobbit",
-		NULL, /* 0x71 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x77 */
-		"Crusoe TM5000",
-		"Crusoe TM3000",
-		"Efficeon TM8000",
-		NULL, /* 0x7B */
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x7F */
-		"Weitek",
-		NULL, /* 0x81 */
-		"Itanium",
-		"Athlon 64",
-		"Opteron",
-		"Sempron",
-		"Turion 64",
-		"Dual-Core Opteron",
-		"Athlon 64 X2",
-		"Turion 64 X2",
-		NULL, /* 0x8A */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x8F */
-		"PA-RISC",
-		"PA-RISC 8500",
-		"PA-RISC 8000",
-		"PA-RISC 7300LC",
-		"PA-RISC 7200",
-		"PA-RISC 7100LC",
-		"PA-RISC 7100",
-		NULL, /* 0x97 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0x9F */
-		"V30",
-		NULL, /* 0xA1 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0xAF */
-		"Pentium III Xeon",
-		"Pentium III Speedstep",
-		"Pentium 4",
-		"Xeon",
-		"AS400",
-		"Xeon MP",
-		"Athlon XP",
-		"Athlon MP",
-		"Itanium 2",
-		"Pentium M",
-		"Celeron D",
-		"Pentium D",
-		"Pentium EE",
-		"Core Solo",
-		NULL, /* 0xBE */
-		"Core 2 Duo",
-		NULL, /* 0xC0 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0xC7 */
-		"IBM390",
-		"G4",
-		"G5",
-		"ESA/390 G6",
-		"z/Architectur",
-		NULL, /* 0xCD */
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0xD1 */
-		"C7-M",
-		"C7-D",
-		"C7",
-		"Eden",
-		NULL, /* 0xD6 */
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL, /* 0xF9 */
-		"i860",
-		"i960",
-		NULL, /* 0xFC */
-		NULL  /* 0xFD */
-	};
-
-	static const struct {
+	static struct {
 		int value;
 		const char *name;
 	} family2[] = {
+		{ 0x01, "Other" },
+		{ 0x02, "Unknown" },
+		{ 0x03, "8086" },
+		{ 0x04, "80286" },
+		{ 0x05, "80386" },
+		{ 0x06, "80486" },
+		{ 0x07, "8087" },
+		{ 0x08, "80287" },
+		{ 0x09, "80387" },
+		{ 0x0A, "80487" },
+		{ 0x0B, "Pentium" },
+		{ 0x0C, "Pentium Pro" },
+		{ 0x0D, "Pentium II" },
+		{ 0x0E, "Pentium MMX" },
+		{ 0x0F, "Celeron" },
+		{ 0x10, "Pentium II Xeon" },
+		{ 0x11, "Pentium III" },
+		{ 0x12, "M1" },
+		{ 0x13, "M2" },
+
+		{ 0x18, "Duron" },
+		{ 0x19, "K5" },
+		{ 0x1A, "K6" },
+		{ 0x1B, "K6-2" },
+		{ 0x1C, "K6-3" },
+		{ 0x1D, "Athlon" },
+		{ 0x1E, "AMD29000" },
+		{ 0x1F, "K6-2+" },
+		{ 0x20, "Power PC" },
+		{ 0x21, "Power PC 601" },
+		{ 0x22, "Power PC 603" },
+		{ 0x23, "Power PC 603+" },
+		{ 0x24, "Power PC 604" },
+		{ 0x25, "Power PC 620" },
+		{ 0x26, "Power PC x704" },
+		{ 0x27, "Power PC 750" },
+
+		{ 0x30, "Alpha" },
+		{ 0x31, "Alpha 21064" },
+		{ 0x32, "Alpha 21066" },
+		{ 0x33, "Alpha 21164" },
+		{ 0x34, "Alpha 21164PC" },
+		{ 0x35, "Alpha 21164a" },
+		{ 0x36, "Alpha 21264" },
+		{ 0x37, "Alpha 21364" },
+
+		{ 0x40, "MIPS" },
+		{ 0x41, "MIPS R4000" },
+		{ 0x42, "MIPS R4200" },
+		{ 0x43, "MIPS R4400" },
+		{ 0x44, "MIPS R4600" },
+		{ 0x45, "MIPS R10000" },
+
+		{ 0x50, "SPARC" },
+		{ 0x51, "SuperSPARC" },
+		{ 0x52, "MicroSPARC II" },
+		{ 0x53, "MicroSPARC IIep" },
+		{ 0x54, "UltraSPARC" },
+		{ 0x55, "UltraSPARC II" },
+		{ 0x56, "UltraSPARC IIi" },
+		{ 0x57, "UltraSPARC III" },
+		{ 0x58, "UltraSPARC IIIi" },
+
+		{ 0x60, "68040" },
+		{ 0x61, "68xxx" },
+		{ 0x62, "68000" },
+		{ 0x63, "68010" },
+		{ 0x64, "68020" },
+		{ 0x65, "68030" },
+
+		{ 0x70, "Hobbit" },
+
+		{ 0x78, "Crusoe TM5000" },
+		{ 0x79, "Crusoe TM3000" },
+		{ 0x7A, "Efficeon TM8000" },
+
+		{ 0x80, "Weitek" },
+
+		{ 0x82, "Itanium" },
+		{ 0x83, "Athlon 64" },
+		{ 0x84, "Opteron" },
+		{ 0x85, "Sempron" },
+		{ 0x86, "Turion 64" },
+		{ 0x87, "Dual-Core Opteron" },
+		{ 0x88, "Athlon 64 X2" },
+		{ 0x89, "Turion 64 X2" },
+
+		{ 0x90, "PA-RISC" },
+		{ 0x91, "PA-RISC 8500" },
+		{ 0x92, "PA-RISC 8000" },
+		{ 0x93, "PA-RISC 7300LC" },
+		{ 0x94, "PA-RISC 7200" },
+		{ 0x95, "PA-RISC 7100LC" },
+		{ 0x96, "PA-RISC 7100" },
+
+		{ 0xA0, "V30" },
+
+		{ 0xB0, "Pentium III Xeon" },
+		{ 0xB1, "Pentium III Speedstep" },
+		{ 0xB2, "Pentium 4" },
+		{ 0xB3, "Xeon" },
+		{ 0xB4, "AS400" },
+		{ 0xB5, "Xeon MP" },
+		{ 0xB6, "Athlon XP" },
+		{ 0xB7, "Athlon MP" },
+		{ 0xB8, "Itanium 2" },
+		{ 0xB9, "Pentium M" },
+		{ 0xBA, "Celeron D" },
+		{ 0xBB, "Pentium D" },
+		{ 0xBC, "Pentium EE" },
+		{ 0xBD, "Core Solo" },
+
+		{ 0xBF, "Core 2 Duo" },
+
+		{ 0xC8, "IBM390" },
+		{ 0xC9, "G4" },
+		{ 0xCA, "G5" },
+		{ 0xCB, "ESA/390 G6" },
+		{ 0xCC, "z/Architectur" },
+
+		{ 0xD2, "C7-M" },
+		{ 0xD3, "C7-D" },
+		{ 0xD4, "C7" },
+		{ 0xD5, "Eden" },
+
+		{ 0xFA, "i860" },
+		{ 0xFB, "i960" },
+
 		{ 0x104, "SH-3" },
 		{ 0x105, "SH-4" },
 		{ 0x118, "ARM" },
@@ -848,13 +719,6 @@ const char *dmi_processor_family(u16 code)
 		{ 0x1F4, "Video Processor" },
 	};
 
-	if (code <= 0xFD)
-	{
-		if (family[code] == NULL)
-			return out_of_spec;
-		return family[code];
-	}
-
 	for (i = 0; i < ARRAY_SIZE(family2); i++)
 		if (family2[i].value == code)
 			return family2[i].name;