hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Mar 3 04:50:39 PST 2008
doc/spec/hal-spec-properties.xml | 6 ------
hald/freebsd/hf-ata.c | 1 -
hald/freebsd/hf-net.c | 1 -
hald/freebsd/hf-scsi.c | 4 +---
hald/freebsd/hf-serial.c | 1 -
hald/freebsd/hf-sound.c | 1 -
hald/freebsd/hf-storage.c | 1 -
hald/linux/blockdev.c | 2 --
hald/linux/device.c | 9 ---------
hald/solaris/devinfo_storage.c | 1 -
10 files changed, 1 insertion(+), 26 deletions(-)
New commits:
commit 28638f075ff07677a9ee9c76c33d316c55124885
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Mar 3 13:50:22 2008 +0100
removed deprecated and outdated *.physical_device
Removed deprecated *.physical_device property from hal. The key reached
end of lifetime with 2008-03-01 and was replaced by *.originating_device.
diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 8269c1d..19f4277 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -7105,12 +7105,6 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
</thead>
<tbody>
<row>
- <entry><literal>*.physical_device</literal> (string)</entry>
- <entry><literal>*.originating_device</literal></entry>
- <entry>2008-03-01</entry>
- <entry>Renamed to something more abstract, available until removed.</entry>
- </row>
- <row>
<entry><literal>portable_audio_player.access_method</literal> (string)</entry>
<entry><literal>portable_audio_player.access_method.[drivers, protocols]</literal> (strlist)</entry>
<entry>2008-05-03</entry>
diff --git a/hald/freebsd/hf-ata.c b/hald/freebsd/hf-ata.c
index 34992a3..e803853 100644
--- a/hald/freebsd/hf-ata.c
+++ b/hald/freebsd/hf-ata.c
@@ -149,7 +149,6 @@ hf_ata_block_device_new (HalDevice *parent,
hal_device_property_set_bool(device, "storage.removable", TRUE);
hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "storage.physical_device", hal_device_get_udi(parent));
hal_device_property_set_string(device, "storage.model", params->model);
hal_device_property_set_string(device, "storage.vendor", vendor);
if (*params->serial)
diff --git a/hald/freebsd/hf-net.c b/hald/freebsd/hf-net.c
index 8648e6f..ec0f328 100644
--- a/hald/freebsd/hf-net.c
+++ b/hald/freebsd/hf-net.c
@@ -161,7 +161,6 @@ hf_net_device_new (const char *interface, HalDevice *parent, GError **err)
hal_device_property_set_string(device, "net.address", mac ? mac : "00:00:00:00:00:00");
hal_device_property_set_string(device, "net.interface", interface);
hal_device_property_set_string(device, "net.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "net.physical_device", hal_device_get_udi(parent));
hal_device_property_set_string(device, "net.media", media);
if (hf_devtree_is_driver(interface, "fwe"))
hal_device_property_set_int(device, "net.arp_proto_hw_id", ARPHRD_IEEE1394);
diff --git a/hald/freebsd/hf-scsi.c b/hald/freebsd/hf-scsi.c
index e5cd46a..8c865c9 100644
--- a/hald/freebsd/hf-scsi.c
+++ b/hald/freebsd/hf-scsi.c
@@ -220,7 +220,6 @@ hf_scsi_block_device_new (HalDevice *parent,
{
hal_device_property_set_string(device, "storage.bus", "scsi");
hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "storage.physical_device", hal_device_get_udi(parent));
hal_device_copy_property(parent, "scsi.lun", device, "storage.lun");
/* do not stop here, in case it's an umass device */
}
@@ -228,7 +227,6 @@ hf_scsi_block_device_new (HalDevice *parent,
{
hal_device_property_set_string(device, "storage.bus", "usb");
hal_device_property_set_string(device, "storage.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "storage.physical_device", hal_device_get_udi(parent));
hal_device_property_set_bool(device, "storage.hotpluggable", TRUE);
break; /* done */
}
@@ -306,7 +304,7 @@ hf_scsi_get_atapi_device (HalDevice *ata_channel, int target_id)
if (! driver || (strcmp(driver, "acd") && strcmp(driver, "ast") && strcmp(driver, "afd")))
continue;
- phys_device = hal_device_property_get_string(child, "storage.physical_device");
+ phys_device = hal_device_property_get_string(child, "storage.originating_device");
if (! phys_device)
continue;
diff --git a/hald/freebsd/hf-serial.c b/hald/freebsd/hf-serial.c
index 08c855a..1986c0b 100644
--- a/hald/freebsd/hf-serial.c
+++ b/hald/freebsd/hf-serial.c
@@ -47,7 +47,6 @@ hf_serial_device_new (HalDevice *parent)
hal_device_add_capability(device, "serial");
hal_device_property_set_string(device, "serial.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "serial.physical_device", hal_device_get_udi(parent));
/* callin devices: /dev/ttyd[0-9a-v] -- see sio(4) */
unit = hal_device_property_get_int(parent, "freebsd.unit");
diff --git a/hald/freebsd/hf-sound.c b/hald/freebsd/hf-sound.c
index a896a6c..1b70d0d 100644
--- a/hald/freebsd/hf-sound.c
+++ b/hald/freebsd/hf-sound.c
@@ -73,7 +73,6 @@ hf_sound_oss_device_new (HalDevice *parent,
device = hf_device_new(parent);
hal_device_property_set_string(device, "oss.originating_device", hal_device_get_udi(parent));
- hal_device_property_set_string(device, "oss.physical_device", hal_device_get_udi(parent));
pproduct = hal_device_property_get_string(parent, "info.product");
diff --git a/hald/freebsd/hf-storage.c b/hald/freebsd/hf-storage.c
index f4c4e71..93239e5 100644
--- a/hald/freebsd/hf-storage.c
+++ b/hald/freebsd/hf-storage.c
@@ -658,7 +658,6 @@ hf_storage_device_enable (HalDevice *device)
hal_device_property_set_bool(device, "storage.removable.support_async_notification", FALSE);
hal_device_property_set_string(device, "storage.originating_device", NULL);
- hal_device_property_set_string(device, "storage.physical_device", NULL);
hal_device_property_set_string(device, "storage.model", NULL);
hal_device_property_set_string(device, "storage.vendor", NULL);
diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 46b5b58..725ed1a 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -995,7 +995,6 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
hal_device_property_set_string (d, "info.product", "PC Floppy Drive");
hal_device_property_set_string (d, "storage.drive_type", "floppy");
hal_device_property_set_string (d, "storage.originating_device", hal_device_get_udi (parent));
- hal_device_property_set_string (d, "storage.physical_device", hal_device_get_udi (parent));
hal_device_property_set_bool (d, "storage.removable", TRUE);
hal_device_property_set_bool (d, "storage.removable.media_available", FALSE);
hal_device_property_set_bool (d, "storage.hotpluggable", FALSE);
@@ -1187,7 +1186,6 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
}
hal_device_property_set_string (d, "storage.originating_device", physdev_udi);
- hal_device_property_set_string (d, "storage.physical_device", physdev_udi);
if (!hal_util_get_int_from_file (sysfs_path_real, "removable", (gint *) &is_removable, 10)) {
HAL_WARNING (("Cannot get 'removable' file"));
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 168c89a..14e9af4 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -337,7 +337,6 @@ input_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
if (parent_dev != NULL) {
hal_device_property_set_string (d, "input.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "input.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
} else {
hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
@@ -512,7 +511,6 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
hal_device_add_capability (d, "net");
hal_device_property_set_string (d, "net.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "net.physical_device", hal_device_get_udi (parent_dev));
ifname = hal_util_get_last_element (sysfs_path);
hal_device_property_set_string (d, "net.interface", ifname);
@@ -856,7 +854,6 @@ usbclass_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *pare
hal_device_property_set_string (d, "printer.device", device_file);
hal_device_property_set_string (d, "printer.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "printer.physical_device", hal_device_get_udi (parent_dev));
}
out:
@@ -1061,7 +1058,6 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "info.category", "sound");
hal_device_add_capability (d, "sound");
hal_device_property_set_string (d, "sound.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "sound.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
if (sscanf (device, "card%d", &cardnum) == 1) {
@@ -1108,7 +1104,6 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "alsa.device_file", device_file);
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "alsa.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "alsa.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_int (d, "alsa.card", cardnum);
hal_device_property_set_string (d, "alsa.type", "control");
@@ -1125,7 +1120,6 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "alsa.device_file", device_file);
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "alsa.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "alsa.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_int (d, "alsa.card", cardnum);
hal_device_property_set_int (d, "alsa.device", devicenum);
@@ -1171,7 +1165,6 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "alsa.device_file", device_file);
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "alsa.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "alsa.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_int (d, "alsa.card", cardnum);
hal_device_property_set_int (d, "alsa.device", devicenum);
@@ -1221,7 +1214,6 @@ sound_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_
hal_device_property_set_string (d, "oss.device_file", device_file);
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "oss.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "oss.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_int (d, "oss.card", cardnum);
asound_card_id_set (cardnum, d, "oss.card_id");
@@ -1363,7 +1355,6 @@ serial_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
hal_device_property_set_string (d, "info.category", "serial");
hal_device_add_capability (d, "serial");
hal_device_property_set_string (d, "serial.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "serial.physical_device", hal_device_get_udi (parent_dev));
hal_device_property_set_string (d, "serial.device", device_file);
last_elem = hal_util_get_last_element(sysfs_path);
diff --git a/hald/solaris/devinfo_storage.c b/hald/solaris/devinfo_storage.c
index 497b8ce..4e1e9b1 100644
--- a/hald/solaris/devinfo_storage.c
+++ b/hald/solaris/devinfo_storage.c
@@ -1134,7 +1134,6 @@ devinfo_storage_hotplug_begin_add (HalDevice *d, HalDevice *parent, DevinfoDevHa
goto error;
}
hal_device_property_set_string (d, "storage.originating_device", hal_device_get_udi (phys_d));
- hal_device_property_set_string (d, "storage.physical_device", hal_device_get_udi (phys_d));
hal_device_property_set_string (d, "storage.bus", phys_bus);
skip_bus:
More information about the hal-commit
mailing list