Added placeholder for most `type's

In doing so, found and fixed a few mistakes in my previous commit.

1 files changed, 258 insertions, 147 deletions

diff --git a/src/py-typemap.xml b/src/py-typemap.xml
index 20866da..0e08ee3 100644
--- a/src/py-typemap.xml
+++ b/src/py-typemap.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dmidecode_typemap version="1">
 
-  <!-- TypeMap00 -->
+<!--
+  TODO: To discuss the following with David
+  TODO: 1. Merge the parent `Map' container with `TypeMap', i.e.
+  TODO:    <TypeMap id="0x00" rootpath="/dmidecode/BIOSinfo" keytype="string" key="@handle" valuetype="dict">
+  TODO: 2. Naming convention - sit on this or can we do better?
+-->
+
+  <!-- Type 00 : BIOS -->
   <TypeMap id="0x00">
     <Map rootpath="/dmidecode/BIOSinfo" keytype="string" key="@handle" valuetype="dict">
       <Map keytype="constant" key="data" valuetype="dict">
@@ -34,22 +41,62 @@
     </Map>
   </TypeMap>
 
-  <!-- TypeMap13 -->
-  <TypeMap id="0x0D">
-    <Map rootpath="/dmidecode/BIOSlanguage" keytype="string" key="@handle" valuetype="dict">
+  <!-- Type 01 : System -->
+  <TypeMap id="0x01">
+    <Map rootpath="/dmidecode/SystemInfo" 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="Currently Installed Language"
-             valuetype="list:string" value="Installed/Language"/>
-        <Map keytype="constant" key="Installed Languages"
-             valuetype="integer" value="@installable_languages"/>
+        <Map keytype="constant" key="SKU Number" valuetype="string" value="SKUnumber"/>
+        <Map keytype="constant" key="UUID" valuetype="string" value="SystemUUID"/>
+        <Map keytype="constant" key="Family" valuetype="string" value="Family"/>
+        <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
+        <Map keytype="constant" key="Version" valuetype="string" value="Version"/>
+        <Map keytype="constant" key="Product Name" valuetype="string" value="ProductName"/>
+        <Map keytype="constant" key="Wake-Up Type" valuetype="string" value="SystemWakeUpType"/>
+        <Map keytype="constant" key="Manufacturer" valuetype="string" value="Manufacturer"/>
       </Map>
+    </Map>
+  </TypeMap>
+
+  <!-- Type 02 : Base Board -->
+  <TypeMap id="0x02">
+    <Map rootpath="/dmidecode/BaseBoardInfo" 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_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="Serial Number" valuetype="string" value="SerialNumber"/>
+        <Map keytype="constant" key="Version"       valuetype="string" value="Version"/>
+        <Map keytype="constant" key="Product Name"  valuetype="string" value="ProductName"/>
+        <Map keytype="constant" key="Manufacturer"  valuetype="string" value="Manufacturer"/>
+      </Map>
+    </Map>
+  </TypeMap>
+
+  <!-- Type 03 : Chassis -->
+  <TypeMap id="0x03">
+    <Map rootpath="/dmidecode/ChassisInfo" 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="Boot-Up State" valuetype="string" value="ChassisStates/BootUp"/>
+        <Map keytype="constant" key="Power Supply State" valuetype="string" value="ChassisStates/PowerSupply"/>
+        <Map keytype="constant" key="Thermal State" valuetype="string" value="ChassisStates/Thermal"/>
+        <Map keytype="constant" key="Lock" valuetype="string" value="ChassisLock"/>
+        <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
+        <Map keytype="constant" key="Version" valuetype="string" value="Version"/>
+        <Map keytype="constant" key="Asset Tag" valuetype="string" value="AssetTag"/>
+        <Map keytype="constant" key="Security Status" valuetype="string" value="SecurityStatus"/>
+        <Map keytype="constant" key="Type" valuetype="string" value="ChassisType"/>
+        <Map keytype="constant" key="Manufacturer" valuetype="string" value="Manufacturer"/>
+      </Map>
     </Map>
   </TypeMap>
 
-  <!-- TypeMap04 -->
+  <!-- Type 04 : Processor -->
   <TypeMap id="0x04">
     <Map rootpath="/dmidecode/ProcessorInfo" keytype="string" key="@handle" valuetype="dict">
       <Map keytype="constant" key="dmi_type"   valuetype="integer" value="@type"/>
@@ -92,80 +139,15 @@
     </Map>
   </TypeMap>
 
-  <!-- TypeMap03 -->
-  <TypeMap id="0x03">
-    <Map rootpath="/dmidecode/ChassisInfo" 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="Boot-Up State" valuetype="string" value="ChassisStates/BootUp"/>
-        <Map keytype="constant" key="Power Supply State" valuetype="string" value="ChassisStates/PowerSupply"/>
-        <Map keytype="constant" key="Thermal State" valuetype="string" value="ChassisStates/Thermal"/>
-        <Map keytype="constant" key="Lock" valuetype="string" value="ChassisLock"/>
-        <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
-        <Map keytype="constant" key="Version" valuetype="string" value="Version"/>
-        <Map keytype="constant" key="Asset Tag" valuetype="string" value="AssetTag"/>
-        <Map keytype="constant" key="Security Status" valuetype="string" value="SecurityStatus"/>
-        <Map keytype="constant" key="Type" valuetype="string" value="ChassisType"/>
-        <Map keytype="constant" key="Manufacturer" valuetype="string" value="Manufacturer"/>
-      </Map>
-    </Map>
-  </TypeMap>
-
-  <!-- TypeMap16 -->
-  <TypeMap id="0x10">
-    <Map rootpath="/dmidecode/PhysicalMemoryArray" 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="Maximum Capacity"
-             valuetype="string" value="concat(MaxCapacity, ' ', MaxCapacity/@unit)"/>
-        <Map keytype="constant" key="Number Of Devices" valuetype="integer" value="@NumDevices"/>
-        <Map keytype="constant" key="Use" valuetype="string" value="Use"/>
-        <Map keytype="constant" key="Error Information Handle"
-             valuetype="string" value="ErrorInfoHandle" emptyValue="Not Provided"/>
-        <Map keytype="constant" key="Error Correction Type" valuetype="string" value="ErrorCorrectionType"/>
-        <Map keytype="constant" key="Location" valuetype="string" value="Location"/>
-      </Map>
-    </Map>
+  <!-- Type 05 : Memory Controller -->
+  <TypeMap id="0x05">
   </TypeMap>
 
-  <!-- TypeMap17 -->
-  <TypeMap id="0x11">
-    <Map rootpath="/dmidecode/MemoryDevice" 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="Manufacturer" valuetype="string" value="Manufacturer"/>
-        <Map keytype="constant" key="Set" valuetype="integer" value="Set" emptyIsNone="1"/>
-        <Map keytype="constant" key="Data Width"
-             valuetype="string" value="concat(DataWidth, ' ', DataWidth/@unit)"/>
-        <Map keytype="constant" key="Part Number" valuetype="string" value="PartNumber"/>
-        <Map keytype="constant" key="Type" valuetype="string" value="Type"/>
-        <Map keytype="constant" key="Bank Locator" valuetype="string" value="BankLocator"/>
-        <Map keytype="constant" key="Speed"
-             valuetype="string" value="concat(Speed, ' ', Speed/@unit, ' (',Speed/@speed_ns,'ns)')"/>
-        <Map keytype="constant" key="Error Information Handle"
-             valuetype="string" value="ErrorInfoHandle" emptyValue="No Error"/>
-        <Map keytype="constant" key="Locator" valuetype="string" value="Locator"/>
-        <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
-        <Map keytype="constant" key="Total Width"
-             valuetype="string" value="concat(TotalWidth, ' ', TotalWidth/@unit)"/>
-        <Map keytype="constant" key="AssetTag" valuetype="string" value="AssetTag"/>
-        <Map keytype="constant" key="Type Detail" valuetype="list:string" value="TypeDetails/flag"
-             fixedsize="12" index_attr="index"/>
-        <Map keytype="constant" key="Array Handle" valuetype="string" value="@ArrayHandle"/>
-        <Map keytype="constant" key="Form Factor" valuetype="string" value="FormFactor"/>
-        <Map keytype="constant" key="Size"
-             valuetype="string" value="concat(Size, ' ', Size/@unit)" emptyIsNone="1"/>
-      </Map>
-    </Map>
+  <!-- Type 06 : Memory Module -->
+  <TypeMap id="0x06">
   </TypeMap>
 
-  <!-- TypeMap07 -->
+  <!-- Type 07 : Cache -->
   <TypeMap id="0x07">
     <Map rootpath="/dmidecode/CacheInfo" keytype="string" key="@handle" valuetype="dict">
       <Map keytype="constant" key="dmi_type"   valuetype="integer" value="@type"/>
@@ -196,27 +178,91 @@
     </Map>
   </TypeMap>
 
-  <!-- TypeMap01 -->
-  <TypeMap id="0x01">
-    <Map rootpath="/dmidecode/SystemInfo" keytype="string" key="@handle" valuetype="dict">
+  <!-- Type 08 : Port Connector -->
+  <TypeMap id="0x08">
+    <Map rootpath="/dmidecode/PortConnectorInfo" 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="SKU Number" valuetype="string" value="SKUnumber"/>
-        <Map keytype="constant" key="UUID" valuetype="string" value="SystemUUID"/>
-        <Map keytype="constant" key="Family" valuetype="string" value="Family"/>
-        <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
-        <Map keytype="constant" key="Version" valuetype="string" value="Version"/>
-        <Map keytype="constant" key="Product Name" valuetype="string" value="ProductName"/>
-        <Map keytype="constant" key="Wake-Up Type" valuetype="string" value="SystemWakeUpType"/>
-        <Map keytype="constant" key="Manufacturer" valuetype="string" value="Manufacturer"/>
+        <Map keytype="constant" key="External Reference Designator"
+             valuetype="string" value="DesignatorRef[@type='external']"/>
+        <Map keytype="constant" key="Port Type" valuetype="string" value="PortType"/>
+        <Map keytype="constant" key="External Connector Type"
+             valuetype="string" value="Connector[@type='external']"/>
+        <Map keytype="constant" key="Internal Reference Designator"
+             valuetype="string" value="DesignatorRef[@type='internal']"/>
+        <Map keytype="constant" key="Internal Connector Type"
+             valuetype="string" value="Connector[@type='internal']"/>
       </Map>
     </Map>
   </TypeMap>
 
-  <!-- TypeMap12 -->
+  <!-- Type 09 : System Slots -->
+  <TypeMap id="0x09">
+    <Map rootpath="/dmidecode/SystemSlots" 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="Designation"       valuetype="string" value="Designation"/>
+        <Map keytype="constant" key="Current Usage"     valuetype="string" value="CurrentUsage"/>
+        <Map keytype="constant" key="Characteristics"
+             valuetype="list:string" value="SlotCharacteristics/Characteristic"
+             fixedsize="10" index_attr="index"/>
+        <Map keytype="constant" key="SlotLength"        valuetype="string" value="SlotLength"/>
+        <Map keytype="constant" key="SlotId"            valuetype="string" value="SlotID/@id"/>
+        <Map keytype="constant" key="Type:SlotBusWidth" valuetype="string" value="SlotWidth"/>
+        <Map keytype="constant" key="Type:SlotType"     valuetype="string" value="SlotType"/>
+      </Map>
+    </Map>
+  </TypeMap>
+
+  <!-- Type 10 : On-Board Devices -->
+  <TypeMap id="0x0A">
+    <Map rootpath="/dmidecode/OnBoardDevicesInfo" 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="dmi_on_board_devices" valuetype="list:dict" value="dmi_on_board_devices">
+          <Map keytype="constant" key="Enabled"     valuetype="boolean" value="Device/@Enabled"/>
+          <Map keytype="constant" key="Type"        valuetype="string"  value="Device/Type"/>
+          <Map keytype="constant" key="Description" valuetype="string"  value="Device/Description"/>
+        </Map>
+      </Map>
+    </Map>
+  </TypeMap>
+
+  <!-- Type 11 : OEM Strings -->
+  <TypeMap id="0x0B">
+  </TypeMap>
+
+  <!-- Type 12 : System Configuration Options -->
   <TypeMap id="0x0C">
+  </TypeMap>
+
+  <!-- Type 13 : BIOS Language -->
+  <TypeMap id="0x0D">
+    <Map rootpath="/dmidecode/BIOSlanguage" keytype="string" key="@handle" valuetype="dict">
+      <Map keytype="constant" key="data" valuetype="dict">
+        <Map keytype="constant" key="Currently Installed Language"
+             valuetype="list:string" value="Installed/Language"/>
+        <Map keytype="constant" key="Installed Languages"
+             valuetype="integer" value="@installable_languages"/>
+      </Map>
+      <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>
+  </TypeMap>
+
+  <!-- Type 14 : Group Associations -->
+  <TypeMap id="0x0E">
+  </TypeMap>
+
+  <!-- Type 15 : System Event Log -->
+  <TypeMap id="0x0F">
     <Map rootpath="/dmidecode/SysEventLog" 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"/>
@@ -241,87 +287,152 @@
     </Map>
   </TypeMap>
 
-  <!-- TypeMap30 -->
-  <TypeMap id="0x20">
-    <Map rootpath="/dmidecode/SystemBootInfo" keytype="string" key="@handle" valuetype="dict">
+  <!-- Type 16 : Physical Memory Array -->
+  <TypeMap id="0x10">
+    <Map rootpath="/dmidecode/PhysicalMemoryArray" 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="Status" valuetype="string" value="Status"/>
+        <Map keytype="constant" key="Maximum Capacity"
+             valuetype="string" value="concat(MaxCapacity, ' ', MaxCapacity/@unit)"/>
+        <Map keytype="constant" key="Number Of Devices" valuetype="integer" value="@NumDevices"/>
+        <Map keytype="constant" key="Use" valuetype="string" value="Use"/>
+        <Map keytype="constant" key="Error Information Handle"
+             valuetype="string" value="ErrorInfoHandle" emptyValue="Not Provided"/>
+        <Map keytype="constant" key="Error Correction Type" valuetype="string" value="ErrorCorrectionType"/>
+        <Map keytype="constant" key="Location" valuetype="string" value="Location"/>
       </Map>
     </Map>
   </TypeMap>
 
-  <!-- TypeMap02 -->
-  <TypeMap id="0x02">
-    <Map rootpath="/dmidecode/BaseBoardInfo" keytype="string" key="@handle" valuetype="dict">
+  <!-- Type 17 : Memory Device -->
+  <TypeMap id="0x11">
+    <Map rootpath="/dmidecode/MemoryDevice" 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="Manufacturer" valuetype="string" value="Manufacturer"/>
+        <Map keytype="constant" key="Set" valuetype="integer" value="Set" emptyIsNone="1"/>
+        <Map keytype="constant" key="Data Width"
+             valuetype="string" value="concat(DataWidth, ' ', DataWidth/@unit)"/>
+        <Map keytype="constant" key="Part Number" valuetype="string" value="PartNumber"/>
+        <Map keytype="constant" key="Type" valuetype="string" value="Type"/>
+        <Map keytype="constant" key="Bank Locator" valuetype="string" value="BankLocator"/>
+        <Map keytype="constant" key="Speed"
+             valuetype="string" value="concat(Speed, ' ', Speed/@unit, ' (',Speed/@speed_ns,'ns)')"/>
+        <Map keytype="constant" key="Error Information Handle"
+             valuetype="string" value="ErrorInfoHandle" emptyValue="No Error"/>
+        <Map keytype="constant" key="Locator" valuetype="string" value="Locator"/>
         <Map keytype="constant" key="Serial Number" valuetype="string" value="SerialNumber"/>
-        <Map keytype="constant" key="Version"       valuetype="string" value="Version"/>
-        <Map keytype="constant" key="Product Name"  valuetype="string" value="ProductName"/>
-        <Map keytype="constant" key="Manufacturer"  valuetype="string" value="Manufacturer"/>
+        <Map keytype="constant" key="Total Width"
+             valuetype="string" value="concat(TotalWidth, ' ', TotalWidth/@unit)"/>
+        <Map keytype="constant" key="AssetTag" valuetype="string" value="AssetTag"/>
+        <Map keytype="constant" key="Type Detail" valuetype="list:string" value="TypeDetails/flag"
+             fixedsize="12" index_attr="index"/>
+        <Map keytype="constant" key="Array Handle" valuetype="string" value="@ArrayHandle"/>
+        <Map keytype="constant" key="Form Factor" valuetype="string" value="FormFactor"/>
+        <Map keytype="constant" key="Size"
+             valuetype="string" value="concat(Size, ' ', Size/@unit)" emptyIsNone="1"/>
       </Map>
     </Map>
   </TypeMap>
 
-  <!-- TypeMap10 -->
-  <TypeMap id="0x0A">
-    <Map rootpath="/dmidecode/OnBoardDevicesInfo" 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="dmi_on_board_devices" valuetype="list:dict" value="dmi_on_board_devices">
-          <Map keytype="constant" key="Enabled"     valuetype="boolean" value="Device/@Enabled"/>
-          <Map keytype="constant" key="Type"        valuetype="string"  value="Device/Type"/>
-          <Map keytype="constant" key="Description" valuetype="string"  value="Device/Description"/>
-        </Map>
-      </Map>
-    </Map>
+  <!-- Type 18 : 32-bit Memory Error -->
+  <TypeMap id="0x12">
   </TypeMap>
 
-  <!-- TypeMap09 -->
-  <TypeMap id="0x09">
-    <Map rootpath="/dmidecode/SystemSlots" 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="Designation"       valuetype="string" value="Designation"/>
-        <Map keytype="constant" key="Current Usage"     valuetype="string" value="CurrentUsage"/>
-        <Map keytype="constant" key="Characteristics"
-             valuetype="list:string" value="SlotCharacteristics/Characteristic"
-             fixedsize="10" index_attr="index"/>
-        <Map keytype="constant" key="SlotLength"        valuetype="string" value="SlotLength"/>
-        <Map keytype="constant" key="SlotId"            valuetype="string" value="SlotID/@id"/>
-        <Map keytype="constant" key="Type:SlotBusWidth" valuetype="string" value="SlotWidth"/>
-        <Map keytype="constant" key="Type:SlotType"     valuetype="string" value="SlotType"/>
-      </Map>
-    </Map>
+  <!-- Type 19 : Memory Array Mapped Address -->
+  <TypeMap id="0x13">
   </TypeMap>
 
-  <!-- TypeMap08 -->
-  <TypeMap id="0x08">
-    <Map rootpath="/dmidecode/PortConnectorInfo" keytype="string" key="@handle" valuetype="dict">
+  <!-- Type 20 : Memory Device Mapped Address -->
+  <TypeMap id="0x14">
+  </TypeMap>
+
+  <!-- Type 21 : Built-in Pointing Device -->
+  <TypeMap id="0x15">
+  </TypeMap>
+
+  <!-- Type 22 : Portable Battery -->
+  <TypeMap id="0x16">
+  </TypeMap>
+
+  <!-- Type 23 : System Reset -->
+  <TypeMap id="0x17">
+  </TypeMap>
+
+  <!-- Type 24 : Hardware Security -->
+  <TypeMap id="0x18">
+  </TypeMap>
+
+  <!-- Type 25 : System Power Controls -->
+  <TypeMap id="0x19">
+  </TypeMap>
+
+  <!-- Type 26 : Voltage Probe -->
+  <TypeMap id="0x1A">
+  </TypeMap>
+
+  <!-- Type 27 : Cooling Device -->
+  <TypeMap id="0x1B">
+  </TypeMap>
+
+  <!-- Type 28 : Temperature Probe -->
+  <TypeMap id="0x1C">
+  </TypeMap>
+
+  <!-- Type 29 : Electrical Current Probe -->
+  <TypeMap id="0x1D">
+  </TypeMap>
+
+  <!-- Type 30 : Out-of-band Remote Access -->
+  <TypeMap id="0x1E">
+  </TypeMap>
+
+  <!-- Type 31 : Boot Integrity Services -->
+  <TypeMap id="0x1F">
+  </TypeMap>
+
+  <!-- Type 32 : System Boot -->
+  <TypeMap id="0x20">
+    <Map rootpath="/dmidecode/SystemBootInfo" 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="External Reference Designator"
-             valuetype="string" value="DesignatorRef[@type='external']"/>
-        <Map keytype="constant" key="Port Type" valuetype="string" value="PortType"/>
-        <Map keytype="constant" key="External Connector Type"
-             valuetype="string" value="Connector[@type='external']"/>
-        <Map keytype="constant" key="Internal Reference Designator"
-             valuetype="string" value="DesignatorRef[@type='internal']"/>
-        <Map keytype="constant" key="Internal Connector Type"
-             valuetype="string" value="Connector[@type='internal']"/>
+      <Map keytype="constant" key="data"       valuetype="dict">
+        <Map keytype="constant" key="Status" valuetype="string" value="Status"/>
       </Map>
     </Map>
   </TypeMap>
 
+  <!-- Type 33 : 64-bit Memory Error -->
+  <TypeMap id="0x21">
+  </TypeMap>
+
+  <!-- Type 34 : Management Device -->
+  <TypeMap id="0x22">
+  </TypeMap>
+
+  <!-- Type 35 : Management Device Component -->
+  <TypeMap id="0x23">
+  </TypeMap>
+
+  <!-- Type 36 : Management Device Threshold Data -->
+  <TypeMap id="0x24">
+  </TypeMap>
+
+  <!-- Type 37 : Memory Channel -->
+  <TypeMap id="0x25">
+  </TypeMap>
+
+  <!-- Type 38 : IPMI Device -->
+  <TypeMap id="0x26">
+  </TypeMap>
+
+  <!-- Type 39 : Power Supply -->
+  <TypeMap id="0x27">
+  </TypeMap>
+
 </dmidecode_typemap>