Page MenuHomeFreeBSD
Files F142428489

D17689.diff
No OneTemporary
Actions

D17689.diff
View Options

Index: head/sys/dev/usb/input/uhid.c
===================================================================
--- head/sys/dev/usb/input/uhid.c
+++ head/sys/dev/usb/input/uhid.c
@@ -675,6 +675,8 @@
{
struct usb_attach_arg *uaa = device_get_ivars(dev);
int error;
+ void *buf;
+ uint16_t len;
DPRINTFN(11, "\n");
@@ -700,6 +702,25 @@
((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) &&
!usb_test_quirk(uaa, UQ_UMS_IGNORE))))
return (ENXIO);
+
+ /* Check for mandatory multitouch usages to give wmt(4) a chance */
+ if (!usb_test_quirk(uaa, UQ_WMT_IGNORE)) {
+ error = usbd_req_get_hid_desc(uaa->device, NULL,
+ &buf, &len, M_USBDEV, uaa->info.bIfaceIndex);
+ /* Let HID decscriptor-less devices to be handled at attach */
+ if (!error) {
+ if (hid_locate(buf, len,
+ HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX),
+ hid_feature, 0, NULL, NULL, NULL) &&
+ hid_locate(buf, len,
+ HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTID),
+ hid_input, 0, NULL, NULL, NULL)) {
+ free(buf, M_USBDEV);
+ return (ENXIO);
+ }
+ free(buf, M_USBDEV);
+ }
+ }
return (BUS_PROBE_GENERIC);
}
Index: head/sys/dev/usb/input/wmt.c
===================================================================
--- head/sys/dev/usb/input/wmt.c
+++ head/sys/dev/usb/input/wmt.c
@@ -856,6 +856,12 @@
}
}
+static const STRUCT_USB_HOST_ID wmt_devs[] = {
+ /* generic HID class w/o boot interface */
+ {USB_IFACE_CLASS(UICLASS_HID),
+ USB_IFACE_SUBCLASS(0),},
+};
+
static devclass_t wmt_devclass;
static device_method_t wmt_methods[] = {
@@ -876,3 +882,4 @@
MODULE_DEPEND(wmt, usb, 1, 1, 1);
MODULE_DEPEND(wmt, evdev, 1, 1, 1);
MODULE_VERSION(wmt, 1);
+USB_PNP_HOST_INFO(wmt_devs);

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 20, 9:26 PM (1 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27777443
Default Alt Text
D17689.diff (1 KB)

Event Timeline