|
Lines 1-5
Link Here
|
| 1 |
--- hald/freebsd/hf-usb.c.orig 2008-05-07 19:24:02.000000000 -0400 |
1 |
--- hald/freebsd/hf-usb.c.orig 2008-05-08 01:24:02.000000000 +0200 |
| 2 |
+++ hald/freebsd/hf-usb.c 2009-02-27 14:01:46.000000000 -0500 |
2 |
+++ hald/freebsd/hf-usb.c 2009-03-02 04:23:32.000000000 +0100 |
| 3 |
@@ -25,13 +25,18 @@ |
3 |
@@ -25,13 +25,18 @@ |
| 4 |
# include <config.h> |
4 |
# include <config.h> |
| 5 |
#endif |
5 |
#endif |
|
Lines 31-37
Link Here
|
| 31 |
|
31 |
|
| 32 |
typedef struct |
32 |
typedef struct |
| 33 |
{ |
33 |
{ |
| 34 |
@@ -231,7 +241,7 @@ hf_usb_get_full_config_descriptor (int f |
34 |
@@ -231,7 +241,7 @@ |
| 35 |
* Adapted from usb_compute_udi() in linux2/physdev.c and |
35 |
* Adapted from usb_compute_udi() in linux2/physdev.c and |
| 36 |
* usbclass_compute_udi() in linux2/classdev.c. |
36 |
* usbclass_compute_udi() in linux2/classdev.c. |
| 37 |
*/ |
37 |
*/ |
|
Lines 40-46
Link Here
|
| 40 |
hf_usb_device_compute_udi (HalDevice *device) |
40 |
hf_usb_device_compute_udi (HalDevice *device) |
| 41 |
{ |
41 |
{ |
| 42 |
g_return_if_fail(HAL_IS_DEVICE(device)); |
42 |
g_return_if_fail(HAL_IS_DEVICE(device)); |
| 43 |
@@ -250,12 +260,13 @@ hf_usb_device_compute_udi (HalDevice *de |
43 |
@@ -250,12 +260,13 @@ |
| 44 |
hf_device_set_udi(device, "usb_device_%x_%x_%s", |
44 |
hf_device_set_udi(device, "usb_device_%x_%x_%s", |
| 45 |
hal_device_property_get_int(device, "usb_device.vendor_id"), |
45 |
hal_device_property_get_int(device, "usb_device.vendor_id"), |
| 46 |
hal_device_property_get_int(device, "usb_device.product_id"), |
46 |
hal_device_property_get_int(device, "usb_device.product_id"), |
|
Lines 56-62
Link Here
|
| 56 |
hf_usb_add_webcam_properties (HalDevice *device) |
56 |
hf_usb_add_webcam_properties (HalDevice *device) |
| 57 |
{ |
57 |
{ |
| 58 |
int unit; |
58 |
int unit; |
| 59 |
@@ -575,6 +586,8 @@ hf_usb_probe_device (HalDevice *parent, |
59 |
@@ -424,7 +435,7 @@ |
|
|
60 |
hf_devtree_device_set_name(device, di->udi_devnames[0]); |
| 61 |
|
| 62 |
if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */ |
| 63 |
- hf_device_set_input(device, "keyboard", devname); |
| 64 |
+ hf_device_set_input(device, "keyboard", NULL); |
| 65 |
else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */ |
| 66 |
hf_device_set_input(device, "mouse", devname); |
| 67 |
else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */ |
| 68 |
@@ -575,6 +586,8 @@ |
| 60 |
{ |
69 |
{ |
| 61 |
if (hal_device_has_capability(device, "hiddev")) |
70 |
if (hal_device_has_capability(device, "hiddev")) |
| 62 |
hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL); |
71 |
hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL); |
|
Lines 65-71
Link Here
|
| 65 |
|
74 |
|
| 66 |
hf_device_add(device); |
75 |
hf_device_add(device); |
| 67 |
} |
76 |
} |
| 68 |
@@ -633,9 +646,18 @@ hf_usb_privileged_init (void) |
77 |
@@ -633,9 +646,18 @@ |
| 69 |
{ |
78 |
{ |
| 70 |
int i; |
79 |
int i; |