summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2009-07-02 19:38:26 +0200
committerDavid Sommerseth <davids@redhat.com>2009-07-02 19:38:26 +0200
commit4331297215914119a225a8501300c200d700cd3f (patch)
tree084a8b80b978086e1620ae3f28054b466a954b0b
parent886fecb84f270a78a92e051bad42407c28780e98 (diff)
downloadpython-dmidecode-4331297215914119a225a8501300c200d700cd3f.tar.gz
python-dmidecode-4331297215914119a225a8501300c200d700cd3f.tar.xz
python-dmidecode-4331297215914119a225a8501300c200d700cd3f.zip
Completed python XML map for TypeMap 0x1C
-rw-r--r--src/dmidecode.c2
-rw-r--r--src/pymap.xml25
2 files changed, 25 insertions, 2 deletions
diff --git a/src/dmidecode.c b/src/dmidecode.c
index d4d8e9a..aa2332d 100644
--- a/src/dmidecode.c
+++ b/src/dmidecode.c
@@ -3294,7 +3294,7 @@ void dmi_temperature_probe_resolution(xmlNode *node, u16 code)
dmixml_AddAttribute(data_n, "unknown", "1");
} else {
dmixml_AddAttribute(data_n, "unit", "C");
- dmixml_AddTextContent(data_n, "%.3f deg C", (float)code / 1000);
+ dmixml_AddTextContent(data_n, "%.3f", (float)code / 1000);
}
}
diff --git a/src/pymap.xml b/src/pymap.xml
index 5ddb0d8..74cab5d 100644
--- a/src/pymap.xml
+++ b/src/pymap.xml
@@ -639,8 +639,31 @@
</Map>
</TypeMap>
- <!-- FIXME : Type 28 : Temperature Probe -->
+ <!-- Type 28 : Temperature Probe -->
<TypeMap id="0x1C">
+ <Map rootpath="/dmidecode/Probe[@probetype='Temperature']" 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="Accuracy"
+ valuetype="string" value="concat(Accuracy,' ',Accuracy/@unit)" emptyValue="Unknown"/>
+ <Map keytype="constant" key="Description"
+ valuetype="string" value="Description"/>
+ <Map keytype="constant" key="Location"
+ valuetype="string" value="Location"/>
+ <Map keytype="constant" key="Maximum Value"
+ valuetype="string" value="concat(MaxValue,' deg ',MaxValue/@unit)"/>
+ <Map keytype="constant" key="Minimum Value"
+ valuetype="string" value="concat(MinValue,' deg ',MinValue/@unit)"/>
+ <Map keytype="constant" key="OEM-specific Information"
+ valuetype="string" value="OEMinformation"/>
+ <Map keytype="constant" key="Resolution"
+ valuetype="string" value="concat(Resolution,' deg ',Resolution/@unit)"/>
+ <Map keytype="constant" key="Status" valuetype="string" value="Status"/>
+ <Map keytype="constant" key="Tolerance" valuetype="string" value="Tolerance" emptyValue="Unknown"/>
+ </Map>
+ </Map>
</TypeMap>
<!-- FIXME : Type 29 : Electrical Current Probe -->