add and cleanup

4 files changed, 474 insertions, 3 deletions

diff --git a/test/check_dmidecode.pl b/test/check_dmidecode.pl
index 53adb90d..d81cfbc9 100755
--- a/test/check_dmidecode.pl
+++ b/test/check_dmidecode.pl
@@ -17,7 +17,7 @@ foreach my $file (glob("dmidecode.*")) {
 
     my @surprise = difference2([ keys %got ], [ keys %wanted ]);
     if (@surprise) {
-	warn "for $file, surprise: ", join(' ', map { "$_ => $got{$_}" } @surprise), "\n";
+	warn "for $file, surprise: ", join(' ', map { "(=> $_: $got{$_})" } @surprise), "\n";
     }
 
     my @bad = grep { $wanted{$_} ne $got{$_} } intersection([ keys %wanted ], [ keys %got ]);
diff --git a/test/dmidecode.Laptop.ASUS-W5G00 b/test/dmidecode.Laptop.ASUS-W5G00
new file mode 100644
index 00000000..413ec6c0
--- /dev/null
+++ b/test/dmidecode.Laptop.ASUS-W5G00
@@ -0,0 +1,471 @@
+# dmidecode 2.6 (=> Resolution: 1280x768)
+SMBIOS 2.3 present.
+42 structures occupying 1523 bytes.
+Table at 0x000F8E50.
+Handle 0x0000
+	DMI type 0, 20 bytes.
+	BIOS Information
+		Vendor: American Megatrends Inc.
+		Version: 0204                               
+		Release Date: 03/28/2005
+		Address: 0xF0000
+		Runtime Size: 64 kB
+		ROM Size: 512 kB
+		Characteristics:
+			ISA is supported
+			PCI is supported
+			PC Card (PCMCIA) is supported
+			PNP is supported
+			BIOS is upgradeable
+			BIOS shadowing is allowed
+			ESCD support is available
+			Boot from CD is supported
+			Selectable boot is supported
+			BIOS ROM is socketed
+			EDD is supported
+			5.25"/360 KB floppy services are supported (int 13h)
+			5.25"/1.2 MB floppy services are supported (int 13h)
+			3.5"/720 KB floppy services are supported (int 13h)
+			3.5"/2.88 MB floppy services are supported (int 13h)
+			Print screen service is supported (int 5h)
+			8042 keyboard services are supported (int 9h)
+			Serial services are supported (int 14h)
+			Printer services are supported (int 17h)
+			CGA/mono video services are supported (int 10h)
+			ACPI is supported
+			USB legacy is supported
+			AGP is supported
+			LS-120 boot is supported
+			ATAPI Zip drive boot is supported
+			BIOS boot specification is supported
+			Function key-initiated network boot is supported
+Handle 0x0001
+	DMI type 1, 25 bytes.
+	System Information
+		Manufacturer: ASUSTeK Computer Inc.        
+		Product Name: W5A       
+		Version: 1.0       
+		Serial Number: SSN12345678901234567
+		UUID: 28CE5D8A-0000-0080-385D-0011D8D272B9
+		Wake-up Type: Power Switch
+Handle 0x0002
+	DMI type 2, 8 bytes.
+	Base Board Information
+		Manufacturer: ASUSTeK Computer Inc.        
+		Product Name: W5A       
+		Version: 1.0       
+		Serial Number: BSN12345678901234567
+Handle 0x0003
+	DMI type 3, 17 bytes.
+	Chassis Information
+		Manufacturer: ASUSTeK Computer Inc.        
+		Type: Notebook
+		Lock: Not Present
+		Version: 1.0       
+		Serial Number: CSN12345678901234567
+		Asset Tag: ATN12345678901234567
+		Boot-up State: Safe
+		Power Supply State: Safe
+		Thermal State: Other
+		Security Status: Other
+		OEM Information: 0x00000000
+Handle 0x0004
+	DMI type 4, 35 bytes.
+	Processor Information
+		Socket Designation: Socket 478
+		Type: Central Processor
+		Family: Pentium M
+		Manufacturer: Intel            
+		ID: D8 06 00 00 FF FB E9 AF
+		Signature: Type 0, Family 6, Model 13, Stepping 8
+		Flags:
+			FPU (Floating-point unit on-chip)
+			VME (Virtual mode extension)
+			DE (Debugging extension)
+			PSE (Page size extension)
+			TSC (Time stamp counter)
+			MSR (Model specific registers)
+			PAE (Physical address extension)
+			MCE (Machine check exception)
+			CX8 (CMPXCHG8 instruction supported)
+			APIC (On-chip APIC hardware supported)
+			SEP (Fast system call)
+			MTRR (Memory type range registers)
+			PGE (Page global enable)
+			MCA (Machine check architecture)
+			CMOV (Conditional move instruction supported)
+			PAT (Page attribute table)
+			CLFSH (CLFLUSH instruction supported)
+			DS (Debug store)
+			ACPI (ACPI supported)
+			MMX (MMX technology supported)
+			FXSR (Fast floating-point save and restore)
+			SSE (Streaming SIMD extensions)
+			SSE2 (Streaming SIMD extensions 2)
+			SS (Self-snoop)
+			TM (Thermal monitor supported)
+			PBE (Pending break enabled)
+		Version: Intel(R) Pentium(R) M processor 1.60GHz             
+		Voltage: 1.5 V
+		External Clock: 133 MHz
+		Max Speed: 1600 MHz
+		Current Speed: 1600 MHz
+		Status: Populated, Enabled
+		Upgrade: Socket 478
+		L1 Cache Handle: 0x0005
+		L2 Cache Handle: 0x0006
+		L3 Cache Handle: Not Provided
+		Serial Number: PSN12345678901234567
+		Asset Tag: PATN1234567890123456
+		Part Number: PPN12345678901234567
+Handle 0x0005
+	DMI type 7, 19 bytes.
+	Cache Information
+		Socket Designation: L1-Cache
+		Configuration: Enabled, Not Socketed, Level 1
+		Operational Mode: Varies With Memory Address
+		Location: Internal
+		Installed Size: 32 KB
+		Maximum Size: 32 KB
+		Supported SRAM Types:
+			Pipeline Burst
+		Installed SRAM Type: Pipeline Burst
+		Speed: Unknown
+		Error Correction Type: Single-bit ECC
+		System Type: Data
+		Associativity: 4-way Set-associative
+Handle 0x0006
+	DMI type 7, 19 bytes.
+	Cache Information
+		Socket Designation: L2-cache
+		Configuration: Enabled, Not Socketed, Level 2
+		Operational Mode: Varies With Memory Address
+		Location: Internal
+		Installed Size: 2048 KB
+		Maximum Size: 2048 KB
+		Supported SRAM Types:
+			Pipeline Burst
+		Installed SRAM Type: Pipeline Burst
+		Speed: Unknown
+		Error Correction Type: Single-bit ECC
+		System Type: Unified
+		Associativity: 4-way Set-associative
+Handle 0x0007
+	DMI type 5, 20 bytes.
+	Memory Controller Information
+		Error Detecting Method: None
+		Error Correcting Capabilities:
+			None
+		Supported Interleave: One-way Interleave
+		Current Interleave: One-way Interleave
+		Maximum Memory Module Size: 1024 MB
+		Maximum Total Memory Size: 2048 MB
+		Supported Speeds:
+			Other
+			70 ns
+			60 ns
+			50 ns
+		Supported Memory Types:
+			Standard
+			DIMM
+			SDRAM
+		Memory Module Voltage: 3.3 V
+		Associated Memory Slots: 2
+			0x0008
+			0x0009
+		Enabled Error Correcting Capabilities:
+			None
+Handle 0x0008
+	DMI type 6, 12 bytes.
+	Memory Module Information
+		Socket Designation: DIMM1
+		Bank Connections: 0 1
+		Current Speed: 10 ns
+		Type: Standard DIMM SDRAM
+		Installed Size: 256 MB (Single-bank Connection)
+		Enabled Size: 256 MB (Single-bank Connection)
+		Error Status: OK
+Handle 0x0009
+	DMI type 6, 12 bytes.
+	Memory Module Information
+		Socket Designation: DIMM2
+		Bank Connections: 2 3
+		Current Speed: 10 ns
+		Type: Standard DIMM SDRAM
+		Installed Size: 256 MB (Single-bank Connection)
+		Enabled Size: 256 MB (Single-bank Connection)
+		Error Status: OK
+Handle 0x000A
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN25
+		Internal Connector Type: None
+		External Reference Designator: USB1
+		External Connector Type: Access Bus (USB)
+		Port Type: USB
+Handle 0x000B
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN20
+		Internal Connector Type: None
+		External Reference Designator: USB2
+		External Connector Type: Access Bus (USB)
+		Port Type: USB
+Handle 0x000C
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN24
+		Internal Connector Type: None
+		External Reference Designator: 1394
+		External Connector Type: IEEE 1394
+		Port Type: Firewire (IEEE P1394)
+Handle 0x000D
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN21
+		Internal Connector Type: None
+		External Reference Designator: MODEM
+		External Connector Type: RJ-11
+		Port Type: Modem Port
+Handle 0x000E
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN21
+		Internal Connector Type: None
+		External Reference Designator: LAN
+		External Connector Type: RJ-45
+		Port Type: Network Port
+Handle 0x000F
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN13
+		Internal Connector Type: None
+		External Reference Designator: Audio Mic
+		External Connector Type: Mini Jack (headphones)
+		Port Type: Audio Port
+Handle 0x0010
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN09
+		Internal Connector Type: None
+		External Reference Designator: SD/MS/XD
+		External Connector Type: Other
+		Port Type: Other
+Handle 0x0011
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN13
+		Internal Connector Type: None
+		External Reference Designator: Audio Line Out
+		External Connector Type: Mini Jack (headphones)
+		Port Type: Audio Port
+Handle 0x0012
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN02
+		Internal Connector Type: None
+		External Reference Designator: Video
+		External Connector Type: DB-15 female
+		Port Type: Video Port
+Handle 0x0013
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN15
+		Internal Connector Type: None
+		External Reference Designator: CARD BUS
+		External Connector Type: 68 Pin Dual Inline
+		Port Type: Cardbus
+Handle 0x0014
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN28
+		Internal Connector Type: None
+		External Reference Designator: USB3
+		External Connector Type: Access Bus (USB)
+		Port Type: USB
+Handle 0x0015
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN30 - HDD IDE
+		Internal Connector Type: On Board IDE
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: Other
+Handle 0x0016
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN27 - CDROM IDE
+		Internal Connector Type: On Board IDE
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: Other
+Handle 0x0017
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN08 - Keyboard
+		Internal Connector Type: PS/2
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: Keyboard Port
+Handle 0x0018
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN14 - TOUCH PAD
+		Internal Connector Type: Other
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: Mouse Port
+Handle 0x0019
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN10 - RFMOUSE
+		Internal Connector Type: Access Bus (USB)
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: USB
+Handle 0x001A
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN12 - BLUETOOTH
+		Internal Connector Type: Access Bus (USB)
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: USB
+Handle 0x001B
+	DMI type 8, 9 bytes.
+	Port Connector Information
+		Internal Reference Designator: CN06 - CMOS
+		Internal Connector Type: Access Bus (USB)
+		External Reference Designator: Not Specified
+		External Connector Type: None
+		Port Type: USB
+Handle 0x001C
+	DMI type 9, 13 bytes.
+	System Slot Information
+		Designation: MiniPCI
+		Type: 32-bit PCI
+		Current Usage: Available
+		Length: Long
+		ID: 1
+		Characteristics:
+			3.3 V is provided
+			Opening is shared
+			PME signal is supported
+Handle 0x001D
+	DMI type 10, 6 bytes.
+	On Board Device Information
+		Type: Video
+		Status: Enabled
+		Description: AGP VGA controller
+Handle 0x001E
+	DMI type 10, 6 bytes.
+	On Board Device Information
+		Type: Ethernet
+		Status: Enabled
+		Description: Ethernet controller
+Handle 0x001F
+	DMI type 10, 6 bytes.
+	On Board Device Information
+		Type: Sound
+		Status: Enabled
+		Description: Audio controller
+Handle 0x0020
+	DMI type 10, 6 bytes.
+	On Board Device Information
+		Type: Other
+		Status: Enabled
+		Description: Modem controller
+Handle 0x0021
+	DMI type 13, 22 bytes.
+	BIOS Language Information
+		Installable Languages: 1
+			enUS
+		Currently Installed Language: enUS
+Handle 0x0022
+	DMI type 18, 23 bytes.
+	32-bit Memory Error Information
+		Type: Bad Read
+		Granularity: Device Level
+		Operation: Read
+		Vendor Syndrome: Unknown
+		Memory Array Address: Unknown
+		Device Address: Unknown
+		Resolution: Unknown
+Handle 0x0023
+	DMI type 16, 15 bytes.
+	Physical Memory Array
+		Location: System Board Or Motherboard
+		Use: System Memory
+		Error Correction Type: None
+		Maximum Capacity: 4 GB
+		Error Information Handle: 0x0022
+		Number Of Devices: 2
+Handle 0x0024
+	DMI type 19, 15 bytes.
+	Memory Array Mapped Address
+		Starting Address: 0x00000000000
+		Ending Address: 0x000200003FF
+		Range Size: 524289 kB
+		Physical Array Handle: 0x0023
+		Partition Width: 0
+Handle 0x0025
+	DMI type 17, 27 bytes.
+	Memory Device
+		Array Handle: 0x0023
+		Error Information Handle: 0x0022
+		Total Width: 64 bits
+		Data Width: 64 bits
+		Size: 256 MB
+		Form Factor: DIMM
+		Set: None
+		Locator: DIMM1
+		Bank Locator: BANK0
+		Type: SDRAM
+		Type Detail: Synchronous
+		Speed: Unknown
+		Manufacturer: Manufacturer1
+		Serial Number: SerNum1
+		Asset Tag: AssetTagNum1
+		Part Number: PartNum1
+Handle 0x0026
+	DMI type 20, 19 bytes.
+	Memory Device Mapped Address
+		Starting Address: 0x00000000000
+		Ending Address: 0x0000FFFFFFF
+		Range Size: 256 MB
+		Physical Device Handle: 0x0025
+		Memory Array Mapped Address Handle: 0x0024
+		Partition Row Position: 1
+		Interleaved Data Depth: 1
+Handle 0x0027
+	DMI type 17, 27 bytes.
+	Memory Device
+		Array Handle: 0x0023
+		Error Information Handle: 0x0022
+		Total Width: 64 bits
+		Data Width: 64 bits
+		Size: 256 MB
+		Form Factor: DIMM
+		Set: None
+		Locator: DIMM2
+		Bank Locator: BANK1
+		Type: SDRAM
+		Type Detail: Synchronous
+		Speed: Unknown
+		Manufacturer: Manufacturer2
+		Serial Number: SerNum2
+		Asset Tag: AssetTagNum2
+		Part Number: PartNum2
+Handle 0x0028
+	DMI type 20, 19 bytes.
+	Memory Device Mapped Address
+		Starting Address: 0x00010000000
+		Ending Address: 0x0001FFFFFFF
+		Range Size: 256 MB
+		Physical Device Handle: 0x0027
+		Memory Array Mapped Address Handle: 0x0024
+		Partition Row Position: 1
+		Interleaved Data Depth: 1
+Handle 0x0029
+	DMI type 127, 4 bytes.
+	End Of Table
diff --git a/test/dmidecode.Laptop.HP-nx9030 b/test/dmidecode.Laptop.HP-nx9030
index 46149a28..ac09acd7 100644
--- a/test/dmidecode.Laptop.HP-nx9030
+++ b/test/dmidecode.Laptop.HP-nx9030
@@ -1,4 +1,4 @@
-# dmidecode 2.6
+# dmidecode 2.6 (=> XkbModel: hp5185)
 SMBIOS 2.31 present.
 28 structures occupying 825 bytes.
 Table at 0x000DF010.
diff --git a/test/dmidecode.Laptop.Toshiba-Satellite-2805 b/test/dmidecode.Laptop.Toshiba-Satellite-2805
index 9e35a953..bd5ee861 100644
--- a/test/dmidecode.Laptop.Toshiba-Satellite-2805
+++ b/test/dmidecode.Laptop.Toshiba-Satellite-2805
@@ -1,4 +1,4 @@
-# dmidecode 2.5
+# dmidecode 2.5 (=> Module: toshiba) (=> Pkg: toshutils)
 SMBIOS 2.3 present.
 43 structures occupying 1374 bytes.
 Table at 0x000EC000.