hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Mar 3 04:56:06 PST 2008
doc/spec/hal-spec-properties.xml | 66 ------------------------------------
hald/freebsd/hf-computer.c | 2 -
hald/freebsd/probing/probe-smbios.c | 12 ------
hald/linux/osspec.c | 17 ---------
hald/linux/probing/probe-smbios.c | 30 ----------------
5 files changed, 1 insertion(+), 126 deletions(-)
New commits:
commit a91b0de1fa7546d28247f8609ea8df14e8f9c53a
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 3 13:55:54 2008 +0100
removed deprecated and outdated smbios.* keys
Removed deprecated smbios.* properties from hal. The key reached end of
lifetime with 2008-02-28 and was replaced by some other:
smbios.system.manufacturer --> system.hardware.vendor
smbios.system.product --> system.hardware.product
smbios.system.version --> system.hardware.version
smbios.system.serial --> system.hardware.serial
smbios.system.uuid --> system.hardware.uuid
smbios.bios.vendor --> system.firmware.vendor
smbios.bios.version --> system.firmware.version
smbios.bios.release_date --> system.firmware.release_date
smbios.chassis.manufacturer --> system.chassis.manufacturer
smbios.chassis.type --> system.chassis.type
system.vendor --> system.hardware.vendor
diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 19f4277..3539f41 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -7129,72 +7129,6 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
<entry></entry>
</row>
<row>
- <entry><literal>smbios.system.manufacturer</literal> (string)</entry>
- <entry><literal>system.hardware.vendor</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.system.product</literal> (string)</entry>
- <entry><literal>system.hardware.product</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.system.version</literal> (string)</entry>
- <entry><literal>system.hardware.version</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.system.serial</literal> (string)</entry>
- <entry><literal>system.hardware.serial</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.system.uuid</literal> (string)</entry>
- <entry><literal>system.hardware.uuid</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.bios.vendor</literal> (string)</entry>
- <entry><literal>system.firmware.vendor</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.bios.version</literal> (string)</entry>
- <entry><literal>system.firmware.version</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.bios.release_date</literal> (string)</entry>
- <entry><literal>system.firmware.release_date</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.chassis.manufacturer</literal> (string)</entry>
- <entry><literal>system.chassis.manufacturer</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>smbios.chassis.type</literal> (string)</entry>
- <entry><literal>system.chassis.type</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Renamed to something more abstract.</entry>
- </row>
- <row>
- <entry><literal>system.vendor</literal> (string)</entry>
- <entry><literal>system.hardware.vendor</literal></entry>
- <entry>2008-02-28</entry>
- <entry>Duplicate of system.hardware.vendor.</entry>
- </row>
- <row>
<entry><literal>usb_device.speed_bcd</literal> (int)</entry>
<entry><literal>usb_device.speed</literal> (double)</entry>
<entry>2008-03-21</entry>
diff --git a/hald/freebsd/hf-computer.c b/hald/freebsd/hf-computer.c
index a73dda2..3f3205f 100644
--- a/hald/freebsd/hf-computer.c
+++ b/hald/freebsd/hf-computer.c
@@ -51,8 +51,6 @@ hf_computer_device_probe (HalDevice *device)
if (sys_manufacturer && sys_product && sys_version)
{
- hal_device_property_set_string(device, "system.vendor", sys_manufacturer);
-
if (strcmp(sys_version, "Not Specified"))
hf_device_property_set_string_printf(device, "system.product", "%s %s", sys_product, sys_version);
else
diff --git a/hald/freebsd/probing/probe-smbios.c b/hald/freebsd/probing/probe-smbios.c
index 42cbb26..1c479b7 100644
--- a/hald/freebsd/probing/probe-smbios.c
+++ b/hald/freebsd/probing/probe-smbios.c
@@ -237,18 +237,6 @@ main (int argc, char *argv[])
/* as read to EOF, close */
fclose (f);
- /* compatibility keys, remove 28 Feb 2008 */
- copykeyval ("system.hardware.vendor", "smbios.system.manufacturer");
- copykeyval ("system.hardware.product", "smbios.system.product");
- copykeyval ("system.hardware.version", "smbios.system.version");
- copykeyval ("system.hardware.serial", "smbios.system.serial");
- copykeyval ("system.hardware.uuid", "smbios.system.uuid");
- copykeyval ("system.firmware.vendor", "smbios.bios.vendor");
- copykeyval ("system.firmware.version", "smbios.bios.version");
- copykeyval ("system.firmware.release_date", "smbios.bios.release_date");
- copykeyval ("system.chassis.manufacturer", "smbios.chassis.manufacturer");
- copykeyval ("system.chassis.type", "smbios.chassis.type");
-
/* return success */
ret = 0;
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 0dcf618..d28792e 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -539,7 +539,7 @@ computer_dmi_map (HalDevice *d, gboolean dmidecode)
const char *chassis_type;
/* now map the smbios.* properties to our generic system.formfactor property */
- if ((chassis_type = hal_device_property_get_string (d, "smbios.chassis.type")) != NULL) {
+ if ((chassis_type = hal_device_property_get_string (d, "system.chassis.type")) != NULL) {
for (i = 0; chassis_map[i] != NULL; i += 2) {
if (strcmp (chassis_map[i], chassis_type) == 0) {
@@ -586,9 +586,6 @@ computer_probing_pcbios_helper_done (HalDevice *d, guint32 exit_type,
(system_version = hal_device_property_get_string (d, "system.hardware.version")) != NULL) {
char buf[128];
- /* depricated 2008-02-28 */
- hal_device_property_set_string (d, "system.vendor", system_manufacturer);
-
if (strcmp(system_version, "Not Specified" ) != 0 ) {
g_snprintf (buf, sizeof (buf), "%s %s", system_product, system_version);
hal_device_property_set_string (d, "system.product", buf);
@@ -738,18 +735,6 @@ decode_dmi_from_sysfs (HalDevice *d)
hal_util_set_string_from_file(d, "system.chassis.manufacturer", DMI_SYSFS_PATH, "chassis_vendor");
computer_dmi_map (d, FALSE);
- /* compatibility keys, remove 28 Feb 2008 */
- hal_device_copy_property (d, "system.hardware.vendor", d , "smbios.system.manufacturer");
- hal_device_copy_property (d, "system.hardware.product", d , "smbios.system.product");
- hal_device_copy_property (d, "system.hardware.version", d , "smbios.system.version");
- hal_device_copy_property (d, "system.hardware.serial", d , "smbios.system.serial");
- hal_device_copy_property (d, "system.hardware.uuid", d , "smbios.system.uuid");
- hal_device_copy_property (d, "system.firmware.vendor", d , "smbios.bios.vendor");
- hal_device_copy_property (d, "system.firmware.version", d , "smbios.bios.version");
- hal_device_copy_property (d, "system.firmware.release_date", d , "smbios.bios.release_date");
- hal_device_copy_property (d, "system.chassis.manufacturer", d , "smbios.chassis.manufacturer");
- hal_device_copy_property (d, "system.chassis.type", d , "smbios.chassis.type");
-
computer_probing_helper_done (d);
return TRUE;
diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
index addbde6..4d5551c 100644
--- a/hald/linux/probing/probe-smbios.c
+++ b/hald/linux/probing/probe-smbios.c
@@ -82,24 +82,6 @@ out:
return FALSE;
}
-/**
- * copykeyval:
- * @key: The new HAL key
- * @compat_key: The compatibility key, to be copied if key exists
- *
- * Copies a key value into the compatibility value, if it exists.
- */
-static void
-copykeyval (char *key, char *compat_key)
-{
- char *value;
-
- value = libhal_device_get_property_string (ctx, udi, key, NULL);
- if (value != NULL) {
- HAL_DEBUG (("Copying %s -> %s", key, compat_key));
- libhal_device_set_property_string (ctx, udi, compat_key, value, NULL);
- }
-}
/**
* main:
@@ -286,18 +268,6 @@ main (int argc, char *argv[])
/* as read to EOF, close */
fclose (f);
- /* compatibility keys, remove 28 Feb 2008 */
- copykeyval ("system.hardware.vendor", "smbios.system.manufacturer");
- copykeyval ("system.hardware.product", "smbios.system.product");
- copykeyval ("system.hardware.version", "smbios.system.version");
- copykeyval ("system.hardware.serial", "smbios.system.serial");
- copykeyval ("system.hardware.uuid", "smbios.system.uuid");
- copykeyval ("system.firmware.vendor", "smbios.bios.vendor");
- copykeyval ("system.firmware.version", "smbios.bios.version");
- copykeyval ("system.firmware.release_date", "smbios.bios.release_date");
- copykeyval ("system.chassis.manufacturer", "smbios.chassis.manufacturer");
- copykeyval ("system.chassis.type", "smbios.chassis.type");
-
out:
/* free ctx */
if (ctx != NULL) {
More information about the hal-commit
mailing list