On 8/29/07, Alfred E. Heggestad <[EMAIL PROTECTED]> wrote:
> here is an updated version of the CM109 driver, now supporting both KIP1000
...
> diff -uprN -X linux-2.6.22.5/Documentation/dontdiff
> linux-2.6.22.5-orig/drivers/hid/usbhid/hid-quirks.c
> linux-2.6.22.5/drivers/hid/usbhid/hid-quirks.c
> --- linux-2.6.22.5-orig/drivers/hid/usbhid/hid-quirks.c 2007-08-29
> 11:51:07.000000000 +0200
> +++ linux-2.6.22.5/drivers/hid/usbhid/hid-quirks.c 2007-08-27
> 21:21:01.000000000 +0200
> @@ -259,6 +259,9 @@
> #define USB_VENDOR_ID_YEALINK 0x6993
> #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001
>
> +#define USB_VENDOR_ID_CMEDIA 0x0d8c
> +#define USB_DEVICE_ID_CM109 0x000e
> +
> /*
> * Alphabetically sorted blacklist by quirk type.
> */
> @@ -405,6 +408,7 @@ static const struct hid_blacklist {
> { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20,
> HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT,
> HID_QUIRK_IGNORE },
> { USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K,
> HID_QUIRK_IGNORE },
> + { USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109, HID_QUIRK_IGNORE },
>
> { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE
> },
> { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },
A minor detail, but the CMEDIA entry should be sorted alphabetically,
as the comment says. See below.
Cheers,
Shaun
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 6b21a21..a435f5b 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -90,6 +90,9 @@
#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST 0x1500
#define USB_DEVICE_ID_CODEMERCS_IOW_LAST 0x15ff
+#define USB_VENDOR_ID_CMEDIA 0x0d8c
+#define USB_DEVICE_ID_CMEDIA_CM109 0x000e
+
#define USB_VENDOR_ID_CYPRESS 0x04b4
#define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001
#define USB_DEVICE_ID_CYPRESS_HIDCOM 0x5500
@@ -387,6 +390,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, HID_QUIRK_IGNORE},
{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD,
HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CMEDIA_CM109, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE
},
{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE,
HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE,
HID_QUIRK_IGNORE },
