summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali>2013-04-24 18:11:56 +0000
committerkhali <khali>2013-04-24 18:11:56 +0000
commit2c57c5fbc308559cb74f84ffb186a7ddd14a7f3a (patch)
tree987749094e01e38a98c9ccf0b99366eb2c80f995
parent6638fdc2b3c501bf47d83e8d44e7fc18ae46a267 (diff)
downloaddmidecode-2c57c5fbc308559cb74f84ffb186a7ddd14a7f3a.tar.gz
Fix support for new processor upgrade types (DMI type 4) and new memory
device type (DMI type 17.)
-rw-r--r--CHANGELOG2
-rw-r--r--dmidecode.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2ea8de3..40220d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
* dmidecode.c: Strip trailig zeroes from memory voltage values
(DMI type 17).
+ * dmidecode.c: Fix support for new processor upgrade types (DMI
+ type 4) and new memory device type (DMI type 17.)
2013-04-17 Anton Arapov <anton@redhat.com>
diff --git a/dmidecode.c b/dmidecode.c
index 7c36acb..4649c88 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -712,7 +712,6 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver)
{ 0x3D, "Opteron 6200" },
{ 0x3E, "Opteron 4200" },
{ 0x3F, "FX" },
-
{ 0x40, "MIPS" },
{ 0x41, "MIPS R4000" },
{ 0x42, "MIPS R4200" },
@@ -729,7 +728,6 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver)
{ 0x4D, "Opteron 6300" },
{ 0x4E, "Opteron 3300" },
{ 0x4F, "FirePro" },
-
{ 0x50, "SPARC" },
{ 0x51, "SuperSPARC" },
{ 0x52, "MicroSPARC II" },
@@ -1176,7 +1174,7 @@ static const char *dmi_processor_upgrade(u8 code)
"Socket LGA1356-3" /* 0x2C */
};
- if (code >= 0x01 && code <= 0x2A)
+ if (code >= 0x01 && code <= 0x2C)
return upgrade[code - 0x01];
return out_of_spec;
}
@@ -2338,7 +2336,7 @@ static void dmi_memory_device_type_detail(u16 code)
{
int i;
- for (i = 1; i <= 14; i++)
+ for (i = 1; i <= 15; i++)
if (code & (1 << i))
printf(" %s", detail[i - 1]);
}