- all "Acer Aspire" are not laptops (#38875)

- detect "ACER TravelMate" as laptops

4 files changed, 630 insertions, 3 deletions

diff --git a/test/dmidecode.Desktop.Acer-Aspire-T180 b/test/dmidecode.Desktop.Acer-Aspire-T180
new file mode 100644
index 00000000..f3fa8565
--- /dev/null
+++ b/test/dmidecode.Desktop.Acer-Aspire-T180
@@ -0,0 +1,627 @@
+
+[root@spring-RC1 rc1]# dmidecode
+# dmidecode 2.9
+SMBIOS 2.3 present.
+46 structures occupying 2008 bytes.
+Table at 0x000F0000.
+
+Handle 0x0000, DMI type 0, 20 bytes
+BIOS Information
+        Vendor: Phoenix Technologies, LTD
+        Version: R01-A2
+        Release Date: 12/29/2006
+        Address: 0xE0000
+        Runtime Size: 128 kB
+        ROM Size: 512 kB
+        Characteristics:
+                ISA is supported
+                PCI is supported
+                PNP is supported
+                APM is supported
+                BIOS is upgradeable
+                BIOS shadowing is allowed
+                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
+                LS-120 boot is supported
+                ATAPI Zip drive boot is supported
+                BIOS boot specification is supported
+
+Handle 0x0001, DMI type 1, 25 bytes
+System Information
+        Manufacturer: Acer
+        Product Name: Aspire T180
+        Version: R01-A2
+        Serial Number: 92D2B7ZCHM63913CFC2701
+        UUID: 0019214B-3F6E-2006-0928-235744000000
+        Wake-up Type: Power Switch
+
+Handle 0x0002, DMI type 188, 255 bytes
+OEM-specific Type
+        Header and Data:
+                BC FF 02 00 4B 38 4E 50 54 44 52 41 4D 30 03 00
+                00 00 00 00 7F 00 00 00 00 00 01 00 00 00 00 00
+                00 00 02 00 00 00 00 00 00 00 03 00 00 00 00 00
+                00 00 04 00 00 00 00 00 00 00 05 00 00 00 00 00
+                00 00 06 00 00 00 00 00 00 00 07 00 00 00 00 00
+                00 00 40 00 10 0A 00 00 00 00 00 00 04 00 FF 02
+                00 5D 01 00 00 00 81 00 00 00 01 01 00 00 00 00
+                00 00 81 01 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 60 3E 78 00 60 3E 78 00 60 3E 78 00 00 00
+                00 00 46 00 00 00 00 00 00 00 22 02 00 00 00 00
+                00 00 13 91 16 0C 20 12 92 04 10 04 01 00 59 00
+                10 37 88 88 FF FE 16 16 18 18 17 18 16 17 16 00
+                00 00 18 16 17 17 18 15 18 18 18 00 00 00 35 3C
+                35 3C 16 17 17 17 17 17 16 16 16 15 18 18 15 14
+                17 18 19 15 3A 00 3A 00 22 13 11 10 00 2F 37 00
+                22 12 11 20 00 2F 2F 00 00 00 00 00 00 00 00
+        Strings:
+
+
+Handle 0x0003, DMI type 190, 255 bytes
+OEM-specific Type
+        Header and Data:
+                BE FF 03 00 00 00 00 80 00 00 00 00 00 00 00 00
+                00 00 00 00 01 06 16 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+                00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+        Strings:
+
+
+Handle 0x0004, DMI type 2, 8 bytes
+Base Board Information
+        Manufacturer: Acer
+        Product Name: EM61SM/EM61PM
+        Version:
+        Serial Number:
+
+Handle 0x0005, DMI type 3, 17 bytes
+Chassis Information
+        Manufacturer:
+        Type: Desktop
+        Lock: Not Present
+        Version:
+        Serial Number:
+        Asset Tag: Asset tag number: at least 22 digits
+        Boot-up State: Unknown
+        Power Supply State: Unknown
+        Thermal State: Unknown
+        Security Status: Unknown
+        OEM Information: 0x00000000
+
+Handle 0x0006, DMI type 4, 35 bytes
+Processor Information
+        Socket Designation: Socket M2
+        Type: Central Processor
+        Family: Sempron
+        Manufacturer: AMD
+        ID: B2 0F 04 00 FF FB 8B 17
+        Signature: Family 15, Model 75, Stepping 2
+        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)
+                PSE-36 (36-bit page size extension)
+                CLFSH (CLFLUSH instruction supported)
+                MMX (MMX technology supported)
+                FXSR (Fast floating-point save and restore)
+                SSE (Streaming SIMD extensions)
+                SSE2 (Streaming SIMD extensions 2)
+                HTT (Hyper-threading technology)
+        Version: AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
+        Voltage: 1.2 V
+        External Clock: 201 MHz
+        Max Speed: 3000 MHz
+        Current Speed: 2211 MHz
+        Status: Populated, Enabled
+        Upgrade: Socket 940
+        L1 Cache Handle: 0x000D
+        L2 Cache Handle: 0x000F
+        L3 Cache Handle: Not Provided
+        Serial Number:
+        Asset Tag:
+        Part Number:
+
+Handle 0x0007, DMI type 4, 35 bytes
+Processor Information
+        Socket Designation: Socket M2
+        Type: Central Processor
+        Family: Sempron
+        Manufacturer: AMD
+        ID: B2 0F 04 00 FF FB 8B 17
+        Signature: Family 15, Model 75, Stepping 2
+        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)
+                PSE-36 (36-bit page size extension)
+                CLFSH (CLFLUSH instruction supported)
+                MMX (MMX technology supported)
+                FXSR (Fast floating-point save and restore)
+                SSE (Streaming SIMD extensions)
+                SSE2 (Streaming SIMD extensions 2)
+                HTT (Hyper-threading technology)
+        Version: AMD Athlon(tm) 64 X2 Dual Core Processor 4200+
+        Voltage: 1.2 V
+        External Clock: 201 MHz
+        Max Speed: 3000 MHz
+        Current Speed: 2211 MHz
+        Status: Populated, Enabled
+        Upgrade: Socket 940
+        L1 Cache Handle: 0x000E
+        L2 Cache Handle: 0x0010
+        L3 Cache Handle: Not Provided
+        Serial Number:
+        Asset Tag:
+        Part Number:
+
+Handle 0x0008, DMI type 5, 24 bytes
+Memory Controller Information
+        Error Detecting Method: 64-bit ECC
+        Error Correcting Capabilities:
+                None
+        Supported Interleave: One-way Interleave
+        Current Interleave: One-way Interleave
+        Maximum Memory Module Size: 4096 MB
+        Maximum Total Memory Size: 16384 MB
+        Supported Speeds:
+                70 ns
+                60 ns
+                50 ns
+        Supported Memory Types:
+                Standard
+                DIMM
+        Memory Module Voltage: 2.9 V
+        Associated Memory Slots: 4
+                0x0009
+                0x000A
+                0x000B
+                0x000C
+        Enabled Error Correcting Capabilities: None
+
+Handle 0x0009, DMI type 6, 12 bytes
+Memory Module Information
+        Socket Designation: A0
+        Bank Connections: 0 1
+        Current Speed: 7 ns
+        Type: Other Unknown EDO
+        Installed Size: 1024 MB (Double-bank Connection)
+        Enabled Size: 1024 MB (Double-bank Connection)
+        Error Status: OK
+
+Handle 0x000A, DMI type 6, 12 bytes
+Memory Module Information
+        Socket Designation: A1
+        Bank Connections: 2
+        Current Speed: 7 ns
+        Type: Other Unknown EDO
+        Installed Size: 512 MB (Single-bank Connection)
+        Enabled Size: 512 MB (Single-bank Connection)
+        Error Status: OK
+
+Handle 0x000B, DMI type 6, 12 bytes
+Memory Module Information
+        Socket Designation: A2
+        Bank Connections: 4
+        Current Speed: 7 ns
+        Type: Other Unknown EDO
+        Installed Size: 512 MB (Single-bank Connection)
+        Enabled Size: 512 MB (Single-bank Connection)
+        Error Status: OK
+
+Handle 0x000C, DMI type 6, 12 bytes
+Memory Module Information
+        Socket Designation: A3
+        Bank Connections: None
+        Current Speed: 7 ns
+        Type: Other Unknown EDO
+        Installed Size: Not Installed
+        Enabled Size: Not Installed
+        Error Status: OK
+
+Handle 0x000D, DMI type 7, 19 bytes
+Cache Information
+        Socket Designation: Internal Cache
+        Configuration: Enabled, Not Socketed, Level 1
+        Operational Mode: Write Back
+        Location: Internal
+        Installed Size: 128 KB
+        Maximum Size: 128 KB
+        Supported SRAM Types:
+                Synchronous
+        Installed SRAM Type: Synchronous
+        Speed: Unknown
+        Error Correction Type: Unknown
+        System Type: Unknown
+        Associativity: Unknown
+
+Handle 0x000E, DMI type 7, 19 bytes
+Cache Information
+        Socket Designation: Internal Cache
+        Configuration: Enabled, Not Socketed, Level 1
+        Operational Mode: Write Back
+        Location: Internal
+        Installed Size: 128 KB
+        Maximum Size: 128 KB
+        Supported SRAM Types:
+                Synchronous
+        Installed SRAM Type: Synchronous
+        Speed: Unknown
+        Error Correction Type: Unknown
+        System Type: Unknown
+        Associativity: Unknown
+
+Handle 0x000F, DMI type 7, 19 bytes
+Cache Information
+        Socket Designation: External Cache
+        Configuration: Enabled, Not Socketed, Level 2
+        Operational Mode: Write Back
+        Location: Internal
+        Installed Size: 512 KB
+        Maximum Size: 512 KB
+        Supported SRAM Types:
+                Synchronous
+        Installed SRAM Type: Synchronous
+        Speed: Unknown
+        Error Correction Type: Unknown
+        System Type: Unknown
+        Associativity: Unknown
+
+Handle 0x0010, DMI type 7, 19 bytes
+Cache Information
+        Socket Designation: External Cache
+        Configuration: Enabled, Not Socketed, Level 2
+        Operational Mode: Write Back
+        Location: Internal
+        Installed Size: 512 KB
+        Maximum Size: 512 KB
+        Supported SRAM Types:
+                Synchronous
+        Installed SRAM Type: Synchronous
+        Speed: Unknown
+        Error Correction Type: Unknown
+        System Type: Unknown
+        Associativity: Unknown
+
+Handle 0x0011, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: PRIMARY IDE
+        Internal Connector Type: On Board IDE
+        External Reference Designator: Not Specified
+        External Connector Type: None
+        Port Type: Other
+
+Handle 0x0012, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: SECONDARY IDE
+        Internal Connector Type: On Board IDE
+        External Reference Designator: Not Specified
+        External Connector Type: None
+        Port Type: Other
+
+Handle 0x0013, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: FDD
+        Internal Connector Type: On Board Floppy
+        External Reference Designator: Not Specified
+        External Connector Type: None
+        Port Type: 8251 FIFO Compatible
+
+Handle 0x0014, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: COM1
+        Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
+        External Reference Designator:
+        External Connector Type: DB-9 male
+        Port Type: Serial Port 16450 Compatible
+
+Handle 0x0015, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: COM2
+        Internal Connector Type: 9 Pin Dual Inline (pin 10 cut)
+        External Reference Designator:
+        External Connector Type: DB-9 male
+        Port Type: Serial Port 16450 Compatible
+
+Handle 0x0016, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: LPT1
+        Internal Connector Type: DB-25 female
+        External Reference Designator:
+        External Connector Type: DB-25 female
+        Port Type: Parallel Port ECP/EPP
+
+Handle 0x0017, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: Keyboard
+        Internal Connector Type: PS/2
+        External Reference Designator:
+        External Connector Type: PS/2
+        Port Type: Keyboard Port
+
+Handle 0x0018, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: PS/2 Mouse
+        Internal Connector Type: PS/2
+        External Reference Designator:
+        External Connector Type: PS/2
+        Port Type: Mouse Port
+
+Handle 0x0019, DMI type 8, 9 bytes
+Port Connector Information
+        Internal Reference Designator: Not Specified
+        Internal Connector Type: None
+        External Reference Designator: USB0
+        External Connector Type: Other
+        Port Type: USB
+
+Handle 0x001A, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI0
+        Type: 32-bit PCI
+        Current Usage: Available
+        Length: Long
+        ID: 1
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x001B, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI1
+        Type: 32-bit PCI
+        Current Usage: In Use
+        Length: Long
+        ID: 2
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x001C, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI2
+        Type: 32-bit PCI
+        Current Usage: In Use
+        Length: Long
+        ID: 3
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x001D, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI3
+        Type: 32-bit PCI Express
+        Current Usage: In Use
+        Length: Long
+        ID: 4
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x001E, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI4
+        Type: 32-bit PCI Express
+        Current Usage: In Use
+        Length: Long
+        ID: 5
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x001F, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI5
+        Type: 32-bit PCI Express
+        Current Usage: In Use
+        Length: Long
+        ID: 6
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x0020, DMI type 9, 13 bytes
+System Slot Information
+        Designation: PCI6
+        Type: 32-bit PCI
+        Current Usage: In Use
+        Length: Long
+        ID: 0
+        Characteristics:
+                5.0 V is provided
+                PME signal is supported
+
+Handle 0x0021, DMI type 13, 22 bytes
+BIOS Language Information
+        Installable Languages: 3
+                n|US|iso8859-1
+                n|US|iso8859-1
+                r|CA|iso8859-1
+        Currently Installed Language: n|US|iso8859-1
+
+Handle 0x0022, DMI type 16, 15 bytes
+Physical Memory Array
+        Location: System Board Or Motherboard
+        Use: System Memory
+        Error Correction Type: None
+        Maximum Capacity: 16 GB
+        Error Information Handle: Not Provided
+        Number Of Devices: 4
+
+Handle 0x0023, DMI type 17, 27 bytes
+Memory Device
+        Array Handle: 0x0022
+        Error Information Handle: Not Provided
+        Total Width: 64 bits
+        Data Width: 64 bits
+        Size: 1024 MB
+        Form Factor: DIMM
+        Set: None
+        Locator: A0
+        Bank Locator: Bank0/1
+        Type: Unknown
+        Type Detail: None
+        Speed: Unknown
+        Manufacturer: None
+        Serial Number: None
+        Asset Tag: None
+        Part Number: None
+
+Handle 0x0024, DMI type 17, 27 bytes
+Memory Device
+        Array Handle: 0x0022
+        Error Information Handle: Not Provided
+        Total Width: 64 bits
+        Data Width: 64 bits
+        Size: 512 MB
+        Form Factor: DIMM
+        Set: None
+        Locator: A1
+        Bank Locator: Bank2/3
+        Type: Unknown
+        Type Detail: None
+        Speed: Unknown
+        Manufacturer: None
+        Serial Number: None
+        Asset Tag: None
+        Part Number: None
+
+Handle 0x0025, DMI type 17, 27 bytes
+Memory Device
+        Array Handle: 0x0022
+        Error Information Handle: Not Provided
+        Total Width: 64 bits
+        Data Width: 64 bits
+        Size: 512 MB
+        Form Factor: DIMM
+        Set: None
+        Locator: A2
+        Bank Locator: Bank4/5
+        Type: Unknown
+        Type Detail: None
+        Speed: Unknown
+        Manufacturer: None
+        Serial Number: None
+        Asset Tag: None
+        Part Number: None
+
+Handle 0x0026, DMI type 17, 27 bytes
+Memory Device
+        Array Handle: 0x0022
+        Error Information Handle: Not Provided
+        Total Width: 64 bits
+        Data Width: 64 bits
+        Size: No Module Installed
+        Form Factor: DIMM
+        Set: None
+        Locator: A3
+        Bank Locator: Bank6/7
+        Type: Unknown
+        Type Detail: None
+        Speed: Unknown
+        Manufacturer: None
+        Serial Number: None
+        Asset Tag: None
+        Part Number: None
+
+Handle 0x0027, DMI type 19, 15 bytes
+Memory Array Mapped Address
+        Starting Address: 0x00000000000
+        Ending Address: 0x0007FFFFFFF
+        Range Size: 2 GB
+        Physical Array Handle: 0x0022
+        Partition Width: 0
+
+Handle 0x0028, DMI type 20, 19 bytes
+Memory Device Mapped Address
+        Starting Address: 0x00000000000
+        Ending Address: 0x0003FFFFFFF
+        Range Size: 1 GB
+        Physical Device Handle: 0x0023
+        Memory Array Mapped Address Handle: 0x0027
+        Partition Row Position: 1
+
+Handle 0x0029, DMI type 20, 19 bytes
+Memory Device Mapped Address
+        Starting Address: 0x00040000000
+        Ending Address: 0x0005FFFFFFF
+        Range Size: 512 MB
+        Physical Device Handle: 0x0024
+        Memory Array Mapped Address Handle: 0x0027
+        Partition Row Position: 1
+
+Handle 0x002A, DMI type 20, 19 bytes
+Memory Device Mapped Address
+        Starting Address: 0x00060000000
+        Ending Address: 0x0007FFFFFFF
+        Range Size: 512 MB
+        Physical Device Handle: 0x0025
+        Memory Array Mapped Address Handle: 0x0027
+        Partition Row Position: 1
+
+Handle 0x002B, DMI type 20, 19 bytes
+Memory Device Mapped Address
+        Starting Address: 0x00000000000
+        Ending Address: 0x000000003FF
+        Range Size: 1 kB
+        Physical Device Handle: 0x0026
+        Memory Array Mapped Address Handle: 0x0027
+        Partition Row Position: 1
+
+Handle 0x002C, DMI type 32, 11 bytes
+System Boot Information
+        Status: No errors detected
+
+Handle 0x002D, DMI type 127, 4 bytes
+End Of Table
diff --git a/test/dmidecode.Laptop.Acer-TravelMate-244LC b/test/dmidecode.Laptop.Acer-TravelMate-244LC
index 0270870c..fa430865 100644
--- a/test/dmidecode.Laptop.Acer-TravelMate-244LC
+++ b/test/dmidecode.Laptop.Acer-TravelMate-244LC
@@ -1,4 +1,4 @@
-# dmidecode 2.4
+# dmidecode 2.4 (=> Type: laptop)
 SMBIOS 2.31 present.
 40 structures occupying 1249 bytes.
 Table at 0x000D8010.
diff --git a/test/dmidecode.Laptop.Acer-TravelMate-610 b/test/dmidecode.Laptop.Acer-TravelMate-610
index 8efebf01..ee2335a9 100644
--- a/test/dmidecode.Laptop.Acer-TravelMate-610
+++ b/test/dmidecode.Laptop.Acer-TravelMate-610
@@ -1,4 +1,4 @@
-# dmidecode 2.5 (=> Resolution: 1024x768) (=> Diagonal_size: 14.1)
+# dmidecode 2.5 (=> Resolution: 1024x768) (=> Diagonal_size: 14.1) (=> Type: laptop)
 SMBIOS 2.31 present.
 28 structures occupying 971 bytes.
 Table at 0x000E0010.
diff --git a/test/dmidecode.Laptop.Acer-Travelmate-6003LCi b/test/dmidecode.Laptop.Acer-Travelmate-6003LCi
index 8c66dc4b..70c944aa 100644
--- a/test/dmidecode.Laptop.Acer-Travelmate-6003LCi
+++ b/test/dmidecode.Laptop.Acer-Travelmate-6003LCi
@@ -1,4 +1,4 @@
-# dmidecode 2.4
+# dmidecode 2.4 (=> Type: laptop)
 SMBIOS 2.31 present.
 27 structures occupying 1211 bytes.
 Table at 0x000DF810.