diff options
| author | David Sommerseth <davids@redhat.com> | 2009-07-02 19:06:35 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2009-07-02 19:06:35 +0200 |
| commit | 7663721800f7428aafad5ee6072763f05c7c0fde (patch) | |
| tree | bcef73a20bce8a20854f8b070ab4b870ba0dd3ac /src | |
| parent | 7081e1a71c3b420cb75a8bcb4a805cffd2dd804f (diff) | |
| download | python-dmidecode-7663721800f7428aafad5ee6072763f05c7c0fde.tar.gz python-dmidecode-7663721800f7428aafad5ee6072763f05c7c0fde.tar.xz python-dmidecode-7663721800f7428aafad5ee6072763f05c7c0fde.zip | |
Completed python XML map for TypeMap 0x16
Diffstat (limited to 'src')
| -rw-r--r-- | src/dmidecode.c | 2 | ||||
| -rw-r--r-- | src/pymap.xml | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/dmidecode.c b/src/dmidecode.c index 33730c3..d4d8e9a 100644 --- a/src/dmidecode.c +++ b/src/dmidecode.c @@ -4383,7 +4383,7 @@ xmlNode *dmi_decode(xmlNode *prnt_n, dmi_codes_major *dmiMajor, struct dmi_heade dmixml_AddTextChild(sect_n, "SBDSchemistry", "%s", dmi_string(h, data[0x14])); } - dmixml_AddTextChild(sect_n, "OEMinformation", "%s", "0x%08x", DWORD(data + 0x16)); + dmixml_AddTextChild(sect_n, "OEMinformation", "0x%08x", DWORD(data + 0x16)); break; case 23: /* 3.3.24 System Reset */ diff --git a/src/pymap.xml b/src/pymap.xml index 6b3c7ab..9323b59 100644 --- a/src/pymap.xml +++ b/src/pymap.xml @@ -522,8 +522,29 @@ </Map> </TypeMap> - <!-- FIXME : Type 22 : Portable Battery --> + <!-- Type 22 : Portable Battery --> <TypeMap id="0x16"> + <Map rootpath="/dmidecode/PortableBattery" keytype="string" key="@handle" valuetype="dict"> + <Map keytype="constant" key="dmi_type" valuetype="integer" value="@type"/> + <Map keytype="constant" key="dmi_handle" valuetype="string" value="@handle"/> + <Map keytype="constant" key="dmi_size" valuetype="integer" value="@size"/> + <Map keytype="constant" key="data" valuetype="dict"> + <Map keytype="constant" key="Design Capacity" + valuetype="string" value="concat(DesignCapacity,' ',DesignCapacity/@unit)"/> + <Map keytype="constant" key="Design Voltage" + valuetype="string" value="concat(DesignVoltage,' ',DesignVoltage/@unit)"/> + <Map keytype="constant" key="Location" valuetype="string" value="Location"/> + <Map keytype="constant" key="Manufacturer" valuetype="string" value="Manufacturer"/> + <Map keytype="constant" key="Maximum Error" + valuetype="string" value="MaximumError" emptyValue="Unknown"/> + <Map keytype="constant" key="Name" valuetype="string" value="Name"/> + <Map keytype="constant" key="OEM-specific Information" valuetype="string" value="OEMinformation"/> + <Map keytype="constant" key="SBDS Chemistry" valuetype="string" value="SBDSchemistry"/> + <Map keytype="constant" key="SBDS Manufacture Date" valuetype="string" value="SBDSmanufactureDate"/> + <Map keytype="constant" key="SBDS Serial Number" valuetype="string" value="SBDSserialNumber"/> + <Map keytype="constant" key="SBDS Version" valuetype="string" value="SBDSversion"/> + </Map> + </Map> </TypeMap> <!-- FIXME : Type 23 : System Reset --> |