d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Export more USB device ID's.

Browse Source 
- Update bus_auto.conf accordingly.

MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2011-06-24 22:01:56 +00:00
parent 0dbe859d2f
commit 9c916c627f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=223521
4 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
etc/devd/bus_auto.conf
View File

@ -83,6 +83,14 @@ nomatch 32 {
action "kldload uipaq";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0123";
match "product" "0x0001";
action "kldload uep";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
@ -1251,6 +1259,14 @@ nomatch 32 {
action "kldload uplcom";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0eef";
match "product" "(0x0001|0x0002)";
action "kldload uep";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
@ -2260,6 +2276,24 @@ nomatch 32 {
action "kldload umodem";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "intclass" "0x03";
match "intsubclass" "0x01";
match "intprotocol" "0x01";
action "kldload ukbd";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "intclass" "0x03";
match "intsubclass" "0x01";
match "intprotocol" "0x02";
action "kldload ums";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
@ -2343,5 +2377,5 @@ nomatch 32 {
action "kldload umass";
};
# 1626 usb_host entries processed
# 1631 usb_host entries processed

21
sys/dev/usb/input/uep.c
View File

@ -288,6 +288,12 @@ static const struct usb_config uep_config[UEP_N_TRANSFER] = {
},
};
static const STRUCT_USB_HOST_ID uep_devs[] = {
{USB_VPI(USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL, 0)},
{USB_VPI(USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL2, 0)},
{USB_VPI(USB_VENDOR_EGALAX2, USB_PRODUCT_EGALAX2_TPANEL, 0)},
};
static int
uep_probe(device_t dev)
{
@ -295,17 +301,12 @@ uep_probe(device_t dev)
if (uaa->usb_mode != USB_MODE_HOST)
return (ENXIO);
if (uaa->info.bConfigIndex != 0)
return (ENXIO);
if (uaa->info.bIfaceIndex != 0)
return (ENXIO);
if ((uaa->info.idVendor == USB_VENDOR_EGALAX) &&
((uaa->info.idProduct == USB_PRODUCT_EGALAX_TPANEL) ||
(uaa->info.idProduct == USB_PRODUCT_EGALAX_TPANEL2)))
return (BUS_PROBE_SPECIFIC);
if ((uaa->info.idVendor == USB_VENDOR_EGALAX2) &&
(uaa->info.idProduct == USB_PRODUCT_EGALAX2_TPANEL))
return (BUS_PROBE_SPECIFIC);
return (ENXIO);
return (usbd_lookup_id_by_uaa(uep_devs, sizeof(uep_devs), uaa));
}
static int

7
sys/dev/usb/input/ukbd.c
View File

@ -745,6 +745,13 @@ static const struct usb_config ukbd_config[UKBD_N_TRANSFER] = {
},
};
/* A match on these entries will load ukbd */
static const STRUCT_USB_HOST_ID __used ukbd_devs[] = {
{USB_IFACE_CLASS(UICLASS_HID),
USB_IFACE_SUBCLASS(UISUBCLASS_BOOT),
USB_IFACE_PROTOCOL(UIPROTO_BOOT_KEYBOARD),},
};
static int
ukbd_probe(device_t dev)
{

7
sys/dev/usb/input/ums.c
View File

@ -355,6 +355,13 @@ static const struct usb_config ums_config[UMS_N_TRANSFER] = {
},
};
/* A match on these entries will load ums */
static const STRUCT_USB_HOST_ID __used ums_devs[] = {
{USB_IFACE_CLASS(UICLASS_HID),
USB_IFACE_SUBCLASS(UISUBCLASS_BOOT),
USB_IFACE_PROTOCOL(UIPROTO_MOUSE),},
};
static int
ums_probe(device_t dev)
{