hal: Branch 'master'

[Danny Kukawka]

 hald/freebsd/hf-computer.c |    9 ++++++---
 hald/linux/osspec.c        |    9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 947df17b48147b9447b22d9bc67ca232ca2d8ac6
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 25 15:16:25 2008 +0100

    updated chassis types
    
    Updated chassis types to Version 2.6.1 of the "System Management BIOS
    Reference Specification" document.
    
    Changed Space-saving from unknown to desktop as pointed out by
    Bastien Nocera <hadess at hadess.net> for some Dell machines (Dell
    Optiplex).

diff --git a/hald/freebsd/hf-computer.c b/hald/freebsd/hf-computer.c
index 350cdd5..3369d08 100644
--- a/hald/freebsd/hf-computer.c
+++ b/hald/freebsd/hf-computer.c
@@ -68,7 +68,8 @@ hf_computer_device_probe (HalDevice *device)
       /* Map the chassis type from dmidecode.c to a sensible type used in hal
        *
        * See also 3.3.4.1 of the "System Management BIOS Reference Specification,
-       * Version 2.3.4" document, available from http://www.dmtf.org/standards/smbios.
+       * Version 2.6.1" (Preliminary Standard) document, available from
+       * http://www.dmtf.org/standards/smbios.
        *
        * TODO: figure out WTF the mapping should be; "Lunch Box"? Give me a break :-)
        */
@@ -87,7 +88,7 @@ hf_computer_device_probe (HalDevice *device)
 	"Docking Station",		"laptop",
 	"All In One",			"unknown",
 	"Sub Notebook",			"laptop",
-	"Space-saving",			"unknown",
+	"Space-saving",			"desktop",
 	"Lunch Box",			"unknown",
 	"Main Server Chassis",		"server",
 	"Expansion Chassis",		"unknown",
@@ -99,7 +100,9 @@ hf_computer_device_probe (HalDevice *device)
 	"Sealed-case PC",		"unknown",
 	"Multi-system",			"unknown",
 	"CompactPCI",			"unknown",
-	"AdvancedTCA",			"unknown" /* 0x1B */
+	"AdvancedTCA",			"unknown",
+	"Blade",                 	"server",
+	"Blade Enclosure"        	"unknown" /* 0x1D */
       };
 
       for (i = 0; i < (int) G_N_ELEMENTS(chassis_map); i += 2)
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index d7a8672..e8bfa7b 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -494,7 +494,8 @@ computer_dmi_map (HalDevice *d, gboolean dmidecode)
 	/* Map the chassis type from dmidecode.c to a sensible type used in hal 
 	 *
 	 * See also 3.3.4.1 of the "System Management BIOS Reference Specification, 
-	 * Version 2.3.4" document, available from http://www.dmtf.org/standards/smbios.
+	 * Version 2.6.1" (Preliminary Standard) document, available from 
+	 * http://www.dmtf.org/standards/smbios.
 	 *
 	 * TODO: figure out WTF the mapping should be; "Lunch Box"? Give me a break :-)
 	 */
@@ -513,7 +514,7 @@ computer_dmi_map (HalDevice *d, gboolean dmidecode)
 		"Docking Station",       "laptop",
 		"All In One",            "unknown",
 		"Sub Notebook",          "laptop",
-		"Space-saving",          "unknown",
+		"Space-saving",          "desktop",
 		"Lunch Box",             "unknown",
 		"Main Server Chassis",   "server",
 		"Expansion Chassis",     "unknown",
@@ -525,7 +526,9 @@ computer_dmi_map (HalDevice *d, gboolean dmidecode)
 		"Sealed-case PC",        "unknown",
 		"Multi-system",          "unknown",
 		"CompactPCI",		 "unknonw",
-		"AdvancedTCA",		 "unknown", /* 0x1B */
+		"AdvancedTCA",		 "unknown", 
+		"Blade",		 "server",
+		"Blade Enclosure"	 "unknown", /* 0x1D */
 		NULL
 	};