[Linux-usb-users] [patch] Workaround for the ATEN switches (kernel 2.5)

[Vojtech Pavlik]

Hi!

Here is the patch I promised for the Aten KVM switches for kernel 2.5.

-- 
Vojtech Pavlik
SuSE Labs

diff -urN linux-2.5.6/drivers/usb/hid-core.c 
linux-2.5.6-hidblack/drivers/usb/hid-core.c
--- linux-2.5.6/drivers/usb/hid-core.c  Wed Mar 13 12:03:23 2002
+++ linux-2.5.6-hidblack/drivers/usb/hid-core.c Wed Mar 13 22:11:32 2002
@@ -1096,6 +1096,9 @@
        int head;
        unsigned long flags;
 
+       if ((hid->quirks & HID_QUIRK_NOGET) && dir == USB_DIR_IN)
+               return;
+
        if (hid->urbout && dir == USB_DIR_OUT && report->type == HID_OUTPUT_REPORT) {
 
                spin_lock_irqsave(&hid->outlock, flags);
@@ -1238,18 +1241,27 @@
 #define USB_DEVICE_ID_POWERMATE                0x0410
 #define USB_DEVICE_ID_SOUNDKNOB                0x04AA
 
+#define USB_VENDOR_ID_ATEN             0x0557  
+#define USB_DEVICE_ID_ATEN_UC100KM     0x2004
+#define USB_DEVICE_ID_ATEN_CS124U      0x2202
+#define USB_DEVICE_ID_ATEN_2PORTKVM    0x2204
+
 struct hid_blacklist {
        __u16 idVendor;
        __u16 idProduct;
+       unsigned quirks;
 } hid_blacklist[] = {
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE },
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS },
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 1},
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 2},
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 3},
-       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 4},
-       { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE },
-       { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 1, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 2, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 3, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 4, HID_QUIRK_IGNORE },
+       { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE, HID_QUIRK_IGNORE  },
+       { USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB, HID_QUIRK_IGNORE  },
+       { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
+       { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
+       { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
        { 0, 0 }
 };
 
@@ -1258,13 +1270,17 @@
        struct usb_interface_descriptor *interface = 
dev->actconfig->interface[ifnum].altsetting + 0;
        struct hid_descriptor *hdesc;
        struct hid_device *hid;
-       unsigned rsize = 0;
+       unsigned quirks = 0, rsize = 0;
        char *buf;
        int n;
 
        for (n = 0; hid_blacklist[n].idVendor; n++)
                if ((hid_blacklist[n].idVendor == dev->descriptor.idVendor) &&
-                       (hid_blacklist[n].idProduct == dev->descriptor.idProduct)) 
return NULL;
+                       (hid_blacklist[n].idProduct == dev->descriptor.idProduct))
+                               quirks = hid_blacklist[n].quirks;
+
+       if (quirks & HID_QUIRK_IGNORE)
+               return NULL;
 
        if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) && 
((!interface->bNumEndpoints) ||
                usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID, 
&hdesc))) {
@@ -1301,6 +1317,8 @@
                        return NULL;
                }
        }
+
+       hid->quirks = quirks;
 
        for (n = 0; n < interface->bNumEndpoints; n++) {
 
diff -urN linux-2.5.6/drivers/usb/hid.h linux-2.5.6-hidblack/drivers/usb/hid.h
--- linux-2.5.6/drivers/usb/hid.h       Wed Feb 20 03:10:53 2002
+++ linux-2.5.6-hidblack/drivers/usb/hid.h      Wed Mar 13 22:10:14 2002
@@ -203,6 +203,8 @@
 
 #define HID_QUIRK_INVERT       0x01
 #define HID_QUIRK_NOTOUCH      0x02
+#define HID_QUIRK_IGNORE       0x04
+#define HID_QUIRK_NOGET                0x08
 
 /*
  * This is the global enviroment of the parser. This information is