hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Thu Mar 13 06:36:10 PDT 2008
hald/device.c | 1 +
hald/device_info.c | 1 -
hald/dummy/osspec.c | 1 -
hald/freebsd/hf-util.c | 1 -
hald/hald_dbus.c | 2 --
hald/hald_test.c | 1 -
hald/linux/acpi.c | 1 -
hald/linux/apm.c | 1 -
hald/linux/blockdev.c | 1 -
hald/linux/device.c | 38 --------------------------------------
hald/linux/osspec.c | 1 -
hald/linux/pmu.c | 3 ---
hald/solaris/devinfo.c | 1 -
hald/solaris/devinfo_misc.c | 2 --
hald/solaris/devinfo_storage.c | 5 -----
hald/solaris/devinfo_usb.c | 2 --
16 files changed, 1 insertion(+), 61 deletions(-)
New commits:
commit e869e1bbd06c00abd09f9414868e97577b626159
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Mar 13 14:35:57 2008 +0100
cleanup code, removed separate calls to set info.udi
Cleaned up the code. Removed all separate calls of
hal_device_property_set_string (device, "info.udi", udi) so set the
info.udi property of a device. moved the call to hal_device_set_udi(),
this is now more consistent.
diff --git a/hald/device.c b/hald/device.c
index 170d06f..1b26113 100644
--- a/hald/device.c
+++ b/hald/device.c
@@ -796,6 +796,7 @@ hal_device_set_udi (HalDevice *device, const char *udi)
if (device->private->udi != NULL)
g_free (device->private->udi);
device->private->udi = g_strdup (udi);
+ hal_device_property_set_string (device, "info.udi", udi);
}
void
diff --git a/hald/device_info.c b/hald/device_info.c
index 9b14f5d..22f1836 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -1021,7 +1021,6 @@ handle_merge (struct rule *rule, HalDevice *d)
key, hal_device_get_udi (d)));
spawned = hal_device_new ();
hal_device_property_set_string (spawned, "info.subsystem", "unknown");
- hal_device_property_set_string (spawned, "info.udi", key);
hal_device_property_set_string (spawned, "info.parent", hal_device_get_udi (d));
hal_device_set_udi (spawned, key);
diff --git a/hald/dummy/osspec.c b/hald/dummy/osspec.c
index 18312ac..d71c51b 100644
--- a/hald/dummy/osspec.c
+++ b/hald/dummy/osspec.c
@@ -83,7 +83,6 @@ osspec_probe (void)
root = hal_device_new ();
hal_device_property_set_string (root, "info.subsystem", "unknown");
hal_device_property_set_string (root, "info.product", "Computer");
- hal_device_property_set_string (root, "info.udi", "/org/freedesktop/Hal/devices/computer");
hal_device_set_udi (root, "/org/freedesktop/Hal/devices/computer");
hal_device_store_add (hald_get_tdl (), root);
diff --git a/hald/freebsd/hf-util.c b/hald/freebsd/hf-util.c
index fe9c9ee..486ee09 100644
--- a/hald/freebsd/hf-util.c
+++ b/hald/freebsd/hf-util.c
@@ -298,7 +298,6 @@ hf_device_set_full_udi (HalDevice *device, const char *format, ...)
g_free(requested_udi);
hal_device_set_udi(device, actual_udi);
- hal_device_property_set_string(device, "info.udi", actual_udi);
}
void
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 28195e1..b324804 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3682,7 +3682,6 @@ manager_new_device (DBusConnection * connection, DBusMessage * message, dbus_boo
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
hal_device_store_add (hald_get_tdl (), d);
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &udi);
g_free (udi);
@@ -3867,7 +3866,6 @@ manager_commit_to_gdl (DBusConnection * connection, DBusMessage * message, dbus_
/* set new udi */
hal_device_property_remove (d, "info.udi");
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
/* FIXME:
* 'RequireEnable' property?
diff --git a/hald/hald_test.c b/hald/hald_test.c
index d3a3774..21c8313 100644
--- a/hald/hald_test.c
+++ b/hald/hald_test.c
@@ -376,7 +376,6 @@ check_properties (void)
printf ("PASSED\n");
hal_device_set_udi (d, "/org/freedesktop/Hal/devices/testobj1");
- hal_device_property_set_string (d, "info.udi", "/org/freedesktop/Hal/devices/testobj1");
/* add this to the global device store */
hal_device_store_add (hald_get_gdl (), d);
diff --git a/hald/linux/acpi.c b/hald/linux/acpi.c
index 1c8a3e7..a7892ea 100644
--- a/hald/linux/acpi.c
+++ b/hald/linux/acpi.c
@@ -1010,7 +1010,6 @@ acpi_generic_compute_udi (HalDevice *d, ACPIDevHandler *handler)
"/org/freedesktop/Hal/devices/acpi_%s",
hal_util_get_last_element (hal_device_property_get_string (d, "linux.acpi_path")));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
diff --git a/hald/linux/apm.c b/hald/linux/apm.c
index 06efe46..f36cecb 100644
--- a/hald/linux/apm.c
+++ b/hald/linux/apm.c
@@ -361,7 +361,6 @@ apm_generic_compute_udi (HalDevice *d, APMDevHandler *handler)
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index ffdda66..ceba51f 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -128,7 +128,6 @@ blockdev_compute_udi (HalDevice *d)
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
diff --git a/hald/linux/device.c b/hald/linux/device.c
index dde7c43..a5b8bed 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -394,7 +394,6 @@ input_compute_udi (HalDevice *d)
"%s_logicaldev_input",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -484,7 +483,6 @@ bluetooth_compute_udi (HalDevice *d)
hal_device_property_get_uint64 (d, "bluetooth_hci.address"));
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -654,7 +652,6 @@ net_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/net_%s",
id);
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -691,7 +688,6 @@ scsi_generic_compute_udi (HalDevice *d)
"%s_scsi_generic",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -815,7 +811,6 @@ scsi_host_compute_udi (HalDevice *d)
"%s_scsi_host",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -887,7 +882,6 @@ usbclass_compute_udi (HalDevice *d)
"%s_hiddev",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
} else if (hal_device_has_capability (d, "printer")) {
const char *serial;
@@ -897,7 +891,6 @@ usbclass_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
serial != NULL ? serial : "noserial");
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
}
return TRUE;
@@ -935,7 +928,6 @@ usbraw_compute_udi (HalDevice *d)
hald_compute_udi (udi, sizeof (udi), "%s_usbraw",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -986,7 +978,6 @@ video4linux_compute_udi (HalDevice *d)
hald_compute_udi (udi, sizeof (udi), "%s_video4linux",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1024,7 +1015,6 @@ dvb_compute_udi (HalDevice *d)
hald_compute_udi (udi, sizeof (udi), "%s_dvb",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1348,7 +1338,6 @@ sound_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"));
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1443,7 +1432,6 @@ serial_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "serial.type"),
hal_device_property_get_int (d, "serial.port"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1493,7 +1481,6 @@ tape_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/tape_%s",
sysfs_name);
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1540,7 +1527,6 @@ mmc_host_compute_udi (HalDevice *d)
"%s_mmc_host",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1632,7 +1618,6 @@ pci_compute_udi (HalDevice *d)
hal_device_property_get_int (d, "pci.vendor_id"),
hal_device_property_get_int (d, "pci.product_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -1843,7 +1828,6 @@ usb_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
hal_device_property_get_int (d, "usb.interface.number"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
} else {
hald_compute_udi (udi, sizeof (udi),
"/org/freedesktop/Hal/devices/usb_device_%x_%x_%s",
@@ -1853,7 +1837,6 @@ usb_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "usb_device.serial") :
"noserial");
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
}
return TRUE;
@@ -1905,7 +1888,6 @@ ide_compute_udi (HalDevice *d)
hal_device_property_get_int (d, "ide.host"),
hal_device_property_get_int (d, "ide.channel"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
@@ -1997,7 +1979,6 @@ pnp_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/pnp_%s",
hal_device_property_get_string (d, "pnp.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
@@ -2049,7 +2030,6 @@ platform_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/platform_%s",
hal_device_property_get_string (d, "platform.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2110,7 +2090,6 @@ serio_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
hal_device_property_get_string (d, "serio.description"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2188,7 +2167,6 @@ pcmcia_compute_udi (HalDevice *d)
hal_device_property_get_int (d, "pcmcia.manfid1"),
hal_device_property_get_int (d, "pcmcia.manfid2"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2280,7 +2258,6 @@ scsi_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
hal_device_property_get_int (d, "scsi.lun"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2374,7 +2351,6 @@ mmc_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
hal_device_property_get_int (d, "mmc.rca"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2431,7 +2407,6 @@ sdio_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.parent"),
hal_device_property_get_int (d, "sdio.card_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2492,7 +2467,6 @@ xen_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/xen_%s",
hal_device_property_get_string (d, "xen.bus_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2573,7 +2547,6 @@ ieee1394_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/ieee1394_guid_%0llx",
hal_device_property_get_uint64 (d, "ieee1394.guid"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2720,7 +2693,6 @@ firewire_compute_udi (HalDevice *d)
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -2875,7 +2847,6 @@ ccw_compute_udi (HalDevice *d)
hal_device_property_get_string
(d, "ccw.bus_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3017,7 +2988,6 @@ ccwgroup_compute_udi (HalDevice *d)
hal_device_property_get_string
(d, "ccwgroup.bus_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3073,7 +3043,6 @@ iucv_compute_udi (HalDevice *d)
hal_device_property_get_string
(d, "iucv.bus_id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3114,7 +3083,6 @@ backlight_compute_udi (HalDevice *d)
"%s_backlight",
hal_device_property_get_string (d, "info.parent"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3506,7 +3474,6 @@ power_supply_compute_udi (HalDevice *d)
hal_device_property_get_string (d, "info.category"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3560,7 +3527,6 @@ drm_compute_udi (HalDevice *d)
name);
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3605,7 +3571,6 @@ ps3_system_bus_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/ps3_system_bus_%s",
hal_device_property_get_string (d, "ps3_system_bus.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3650,7 +3615,6 @@ virtio_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/virtio_%s",
hal_device_property_get_string (d, "virtio.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3713,7 +3677,6 @@ vio_compute_udi (HalDevice *d)
}
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -3756,7 +3719,6 @@ pseudo_compute_udi (HalDevice *d)
"/org/freedesktop/Hal/devices/pseudo",
hal_device_property_get_string (d, "platform.id"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 2a1726e..c753735 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -821,7 +821,6 @@ osspec_probe (void)
root = hal_device_new ();
hal_device_property_set_string (root, "info.subsystem", "unknown");
hal_device_property_set_string (root, "info.product", "Computer");
- hal_device_property_set_string (root, "info.udi", "/org/freedesktop/Hal/devices/computer");
hal_device_set_udi (root, "/org/freedesktop/Hal/devices/computer");
if (uname (&un) >= 0) {
diff --git a/hald/linux/pmu.c b/hald/linux/pmu.c
index 67ff785..0222cb3 100644
--- a/hald/linux/pmu.c
+++ b/hald/linux/pmu.c
@@ -215,7 +215,6 @@ pmu_lid_compute_udi (HalDevice *d, PMUDevHandler *handler)
hald_compute_udi (udi, sizeof (udi),
"/org/freedesktop/Hal/devices/pmu_lid");
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -226,7 +225,6 @@ pmu_laptop_panel_compute_udi (HalDevice *d, PMUDevHandler *handler)
hald_compute_udi (udi, sizeof (udi),
"/org/freedesktop/Hal/devices/pmu_lcd");
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
@@ -405,7 +403,6 @@ pmu_generic_compute_udi (HalDevice *d, PMUDevHandler *handler)
hal_util_get_last_element (hal_device_property_get_string (d, "linux.pmu_path")),
hal_device_property_get_int (d, "linux.pmu_type"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
return TRUE;
}
diff --git a/hald/solaris/devinfo.c b/hald/solaris/devinfo.c
index b6a2ddc..f830bbd 100644
--- a/hald/solaris/devinfo.c
+++ b/hald/solaris/devinfo.c
@@ -100,7 +100,6 @@ devinfo_set_default_properties (HalDevice *d, HalDevice *parent, di_node_t node,
devfs_path,
di_instance (node));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
if (di_prop_lookup_strings (DDI_DEV_T_ANY, node, "model", &s) > 0) {
hal_device_property_set_string (d, "info.product", s);
diff --git a/hald/solaris/devinfo_misc.c b/hald/solaris/devinfo_misc.c
index d684445..dafffd2 100644
--- a/hald/solaris/devinfo_misc.c
+++ b/hald/solaris/devinfo_misc.c
@@ -71,7 +71,6 @@ devinfo_computer_add(HalDevice *parent, di_node_t node, char *devfs_path, char *
hal_device_property_set_string (d, "info.subsystem", "unknown");
hal_device_property_set_string (d, "info.product", "Computer");
- hal_device_property_set_string (d, "info.udi", "/org/freedesktop/Hal/devices/computer");
hal_device_set_udi (d, "/org/freedesktop/Hal/devices/computer");
hal_device_property_set_string (d, "solaris.devfs_path", devfs_path);
@@ -89,7 +88,6 @@ devinfo_computer_add(HalDevice *parent, di_node_t node, char *devfs_path, char *
hal_device_property_set_string (local_d, "info.parent", hal_device_get_udi (d));
hal_device_property_set_string (local_d, "info.subsystem", "unknown");
hal_device_property_set_string (local_d, "info.product", "Local devices");
- hal_device_property_set_string (local_d, "info.udi", "/org/freedesktop/Hal/devices/local");
hal_device_set_udi (local_d, "/org/freedesktop/Hal/devices/local");
hal_device_property_set_string (local_d, "solaris.devfs_path", "/local");
diff --git a/hald/solaris/devinfo_storage.c b/hald/solaris/devinfo_storage.c
index 61f50aa..5175d9b 100644
--- a/hald/solaris/devinfo_storage.c
+++ b/hald/solaris/devinfo_storage.c
@@ -213,7 +213,6 @@ devinfo_ide_storage_add(HalDevice *grampa, HalDevice *parent, di_node_t node, ch
"%s/%s%d", hal_device_get_udi (parent),
driver_name, di_instance (node));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
PROP_STR(d, node, s, "devid", "info.product");
hal_device_add_capability (d, "storage");
@@ -260,7 +259,6 @@ devinfo_scsi_add(HalDevice *parent, di_node_t node, char *devfs_path, char *devi
"%s/%s%d", hal_device_get_udi (parent),
di_node_name(node), di_instance (node));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
hal_device_property_set_int (d, "scsi.host",
hal_device_property_get_int (parent, "scsi_host.host"));
@@ -291,7 +289,6 @@ devinfo_scsi_storage_add(HalDevice *grampa, HalDevice *parent, di_node_t node, c
"%s/sd%d", hal_device_get_udi (parent),
di_instance (node));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
PROP_STR(d, node, s, "inquiry-product-id", "info.product");
hal_device_add_capability (d, "storage");
@@ -549,7 +546,6 @@ devinfo_lofi_add_major(HalDevice *parent, di_node_t node, char *devfs_path, char
"%s/%s%d", hal_device_get_udi (parent),
di_node_name(node), di_instance (node));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
devinfo_add_enqueue (d, devfs_path, &devinfo_lofi_handler);
} else {
@@ -946,7 +942,6 @@ devinfo_volume_add(HalDevice *parent, di_node_t node, devinfo_storage_minor_t *m
hald_compute_udi (udi, sizeof (udi),
"%s/%s", hal_device_get_udi (parent), slice);
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
hal_device_property_set_string (d, "info.product", slice);
hal_device_add_capability (d, "volume");
diff --git a/hald/solaris/devinfo_usb.c b/hald/solaris/devinfo_usb.c
index fd3d37e..a933272 100644
--- a/hald/solaris/devinfo_usb.c
+++ b/hald/solaris/devinfo_usb.c
@@ -122,7 +122,6 @@ devinfo_usb_if_add(HalDevice *parent, di_node_t node, gchar *devfs_path, int ifn
hald_compute_udi (udi, sizeof (udi),
"%s_if%d", hal_device_get_udi (parent), ifnum);
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
hal_device_property_set_string (d, "info.product", "USB Device Interface");
/* copy parent's usb_device.* properties */
@@ -213,7 +212,6 @@ devinfo_usb_scsa2usb_add(HalDevice *usbd, di_node_t node, gchar *devfs_path)
"%s/scsi_host%d", hal_device_get_udi (usbd),
hal_device_property_get_int (d, "scsi_host.host"));
hal_device_set_udi (d, udi);
- hal_device_property_set_string (d, "info.udi", udi);
hal_device_property_set_string (d, "info.product", "SCSI Host Adapter");
devinfo_add_enqueue (d, minor_path, &devinfo_usb_handler);
More information about the hal-commit
mailing list