summaryrefslogtreecommitdiffstats
path: root/src/dmidecode.c
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2009-07-02 17:10:30 +0200
committerDavid Sommerseth <davids@redhat.com>2009-07-02 17:10:30 +0200
commit6bd9742784fb487463449e41330cdd102e0a5df1 (patch)
tree8c5ff2803233e9275c2d0910d83e560c9a70d4f6 /src/dmidecode.c
parentebb06f31e490f181b2e2267b0268421fda9b5d95 (diff)
downloadpython-dmidecode-6bd9742784fb487463449e41330cdd102e0a5df1.tar.gz
python-dmidecode-6bd9742784fb487463449e41330cdd102e0a5df1.tar.xz
python-dmidecode-6bd9742784fb487463449e41330cdd102e0a5df1.zip
Completed python XML map for TypeMap 0x05
Diffstat (limited to 'src/dmidecode.c')
-rw-r--r--src/dmidecode.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/dmidecode.c b/src/dmidecode.c
index 9a35ecb..41f882c 100644
--- a/src/dmidecode.c
+++ b/src/dmidecode.c
@@ -1160,10 +1160,11 @@ void dmi_processor_voltage(xmlNode *node, u8 code)
dmixml_AddAttribute(vltg_n, "unknown_value", "1");
} else {
for(i = 0; i <= 2; i++) {
- if( code & (1 << i) ) {
- xmlNode *v_n = dmixml_AddTextChild(vltg_n, "Voltage", "%s", voltage[i]);
- dmixml_AddAttribute(v_n, "unit", "V");
- }
+ xmlNode *v_n = dmixml_AddTextChild(vltg_n, "Voltage", "%s", voltage[i]);
+ dmixml_AddAttribute(v_n, "key_compound", "%s V", voltage[i]);
+ dmixml_AddAttribute(v_n, "available", "%i", (code & (1 << i) ? 1 : 0));
+ dmixml_AddAttribute(v_n, "unit", "V");
+ v_n = NULL;
}
}
}
@@ -1340,7 +1341,7 @@ void dmi_memory_controller_ec_capabilities(xmlNode *node, const char *tagname, u
if(code & (1 << i)) {
xmlNode *c_n = dmixml_AddTextChild(cap_n, "Capability", "%s", capabilities[i]);
assert( c_n != NULL );
- dmixml_AddAttribute(c_n, "index", "%i", i);
+ dmixml_AddAttribute(c_n, "index", "%i", i+1);
}
}
}
@@ -1411,7 +1412,7 @@ void dmi_memory_controller_slots(xmlNode *node, u8 count, const u8 * p)
assert( mslts_n != NULL );
for(i = 0; i < count; i++) {
- xmlNode *sl_n = dmixml_AddTextChild(mslts_n, "Slot", "0x%04x:", WORD(p + sizeof(u16) * i));
+ xmlNode *sl_n = dmixml_AddTextChild(mslts_n, "Slot", "0x%x:", WORD(p + sizeof(u16) * i));
dmixml_AddAttribute(sl_n, "index", "%i", i);
}
}
@@ -1448,7 +1449,7 @@ void dmi_memory_module_types(xmlNode *node, const char *tagname, u16 code)
if(code & (1 << i)) {
xmlNode *mt_n = dmixml_AddTextChild(mmt_n, "ModuleType", types[i]);
assert( mt_n != NULL );
- dmixml_AddAttribute(mt_n, "index", "%i", i);
+ dmixml_AddAttribute(mt_n, "index", "%i", i+1);
}
}
}