|
Lines 1-6
Link Here
|
| 1 |
--- hald/freebsd/hf-usb2.c.orig 2009-11-21 19:57:40.000000000 -0500 |
1 |
--- hald/freebsd/hf-usb2.c.orig 2010-01-21 11:13:33.000000000 +1300 |
| 2 |
+++ hald/freebsd/hf-usb2.c 2009-11-21 19:58:07.000000000 -0500 |
2 |
+++ hald/freebsd/hf-usb2.c 2010-01-21 11:22:12.000000000 +1300 |
| 3 |
@@ -0,0 +1,312 @@ |
3 |
@@ -0,0 +1,296 @@ |
| 4 |
+/*************************************************************************** |
4 |
+/*************************************************************************** |
| 5 |
+ * CVSID: $Id$ |
5 |
+ * CVSID: $Id$ |
| 6 |
+ * |
6 |
+ * |
|
Lines 45-66
Link Here
|
| 45 |
+static struct libusb20_backend *hf_usb2_be = NULL; |
45 |
+static struct libusb20_backend *hf_usb2_be = NULL; |
| 46 |
+ |
46 |
+ |
| 47 |
+static void |
47 |
+static void |
| 48 |
+hf_usb2_copy_parent (HalDevice *parent, |
|
|
| 49 |
+ const char *key, |
| 50 |
+ gpointer user_data) |
| 51 |
+{ |
| 52 |
+ HalDevice *device; |
| 53 |
+ |
| 54 |
+ g_return_if_fail(HAL_IS_DEVICE(parent)); |
| 55 |
+ g_return_if_fail(HAL_IS_DEVICE(user_data)); |
| 56 |
+ |
| 57 |
+ device = HAL_DEVICE(user_data); |
| 58 |
+ |
| 59 |
+ if (! strncmp(key, "usb_device.", strlen("usb_device."))) |
| 60 |
+ hal_device_copy_property(parent, key, device, key); |
| 61 |
+} |
| 62 |
+ |
| 63 |
+static void |
| 64 |
+hf_usb2_probe_interfaces(HalDevice *parent) |
48 |
+hf_usb2_probe_interfaces(HalDevice *parent) |
| 65 |
+{ |
49 |
+{ |
| 66 |
+ int num_interfaces; |
50 |
+ int num_interfaces; |
|
Lines 82-90
Link Here
|
| 82 |
+ |
66 |
+ |
| 83 |
+ hal_device_property_set_string(device, "info.subsystem", "usb"); |
67 |
+ hal_device_property_set_string(device, "info.subsystem", "usb"); |
| 84 |
+ hal_device_property_set_int(device, "usb.interface.number", i); |
68 |
+ hal_device_property_set_int(device, "usb.interface.number", i); |
| 85 |
+ hal_device_property_foreach(parent, hf_usb2_copy_parent, device); |
|
|
| 86 |
+ hal_device_copy_property(parent, "info.product", device, "info.product"); |
69 |
+ hal_device_copy_property(parent, "info.product", device, "info.product"); |
| 87 |
+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor"); |
70 |
+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor"); |
|
|
71 |
+ hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device."); |
| 88 |
+ |
72 |
+ |
| 89 |
+ if (hf_device_preprobe(device)) |
73 |
+ if (hf_device_preprobe(device)) |
| 90 |
+ { |
74 |
+ { |