Completed python XML map for TypeMap 0x06

David Sommerseth · David Sommerseth · commit fd0d07610740 · 2009-07-02T17:47:48.000+02:00
diff --git a/src/dmidecode.c b/src/dmidecode.c
@@ -1464,10 +1464,10 @@ void dmi_memory_module_connections(xmlNode *node, u8 code)
 
         if(code != 0xFF) {
                 if((code & 0xF0) != 0xF0) {
-                        dmixml_AddTextContent(data_n, "%ld", (code >> 4));
+                        dmixml_AddTextChild(data_n, "Connection", "%ld", (code >> 4));
                 }
                 if((code & 0x0F) != 0x0F) {
-                        dmixml_AddTextContent(data_n, "%ld", (code & 0x0F));
+                        dmixml_AddTextChild(data_n, "Connection", "%ld", (code & 0x0F));
                 }
         }
 }
diff --git a/src/pymap.xml b/src/pymap.xml
@@ -208,8 +208,33 @@
       </Map>
     </TypeMap>
 
-    <!-- FIXME : Type 06 : Memory Module -->
+    <!-- Type 06 : Memory Module -->
     <TypeMap id="0x06">
+      <Map rootpath="/dmidecode/MemoryModuleInfo" 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="Bank Connections"
+               valuetype="list:integer" value="BankConnections/Connection"/>
+          <Map keytype="constant" key="Current Speed"
+               valuetype="string" value="concat(ModuleSpeed,' ',ModuleSpeed/@unit)" emptyValue="Unknown"/>
+          <Map keytype="constant" key="Enabled Size" valuetype="dict">
+            <Map keytype="constant" key="Connection" valuetype="string" value="EnabledSize/@Connection"/>
+            <Map keytype="constant" key="Size"
+                 valuetype="string" value="concat(EnabledSize,' ',EnabledSize/@unit)"/>
+          </Map>
+          <Map keytype="constant" key="Error Status" valuetype="boolean" value="ModuleErrorStatus/@Error"/>
+          <Map keytype="constant" key="Installed Size" valuetype="dict">
+            <Map keytype="constant" key="Connection" valuetype="string" value="InstalledSize/@Connection"/>
+            <Map keytype="constant" key="Size"
+                 valuetype="string" value="concat(InstalledSize,' ',InstalledSize/@unit)"/>
+          </Map>
+          <Map keytype="constant" key="Socket Designation" valuetype="string" value="SocketDesignation"/>
+          <Map keytype="constant" key="Type"
+               valuetype="list:string" value="Type/ModuleType" fixedsize="11" index_attr="index"/>
+        </Map>
+      </Map>
     </TypeMap>
 
     <!-- Type 07 : Cache -->

Original file line number	Diff line number	Diff line change
`@@ -1464,10 +1464,10 @@ void dmi_memory_module_connections(xmlNode *node, u8 code)`
`1464`	`1464`
`1465`	`1465`	`if(code != 0xFF) {`
`1466`	`1466`	`if((code & 0xF0) != 0xF0) {`
`1467`		`- dmixml_AddTextContent(data_n, "%ld", (code >> 4));`
	`1467`	`+ dmixml_AddTextChild(data_n, "Connection", "%ld", (code >> 4));`
`1468`	`1468`	`}`
`1469`	`1469`	`if((code & 0x0F) != 0x0F) {`
`1470`		`- dmixml_AddTextContent(data_n, "%ld", (code & 0x0F));`
	`1470`	`+ dmixml_AddTextChild(data_n, "Connection", "%ld", (code & 0x0F));`
`1471`	`1471`	`}`
`1472`	`1472`	`}`
`1473`	`1473`	`}`