Revision: 57
http://svn.sourceforge.net/mactel-linux/?rev=57&view=rev
Author: nboichat
Date: 2006-11-04 06:46:50 -0800 (Sat, 04 Nov 2006)
Log Message:
-----------
make usbhid not occupy the apple{ir, touch} driver (patch by Soeren
Sonnenburg)
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.18/usbhid.patch
Added: trunk/kernel/mactel-patches-2.6.18/usbhid.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/usbhid.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.18/usbhid.patch 2006-11-04 14:46:50 UTC
(rev 57)
@@ -0,0 +1,70 @@
+Signed-off-by: Soeren Sonnenburg <[EMAIL PROTECTED]>
+Signed-off-by: Sergey Vlasov <[EMAIL PROTECTED]>
+
+--- linux-2.6.18.1/drivers/usb/input/hid.h 2006-10-14 05:34:03.000000000
+0200
++++ linux-2.6.18.1-sonne/drivers/usb/input/hid.h 2006-10-28
21:44:32.000000000 +0200
+@@ -260,6 +260,7 @@
+ #define HID_QUIRK_POWERBOOK_HAS_FN 0x00001000
+ #define HID_QUIRK_POWERBOOK_FN_ON 0x00002000
+ #define HID_QUIRK_INVERT_HWHEEL 0x00004000
++#define HID_QUIRK_IGNORE_MOUSE 0x00008000
+
+ /*
+ * This is the global environment of the parser. This information is
+--- linux-2.6.18.1/drivers/usb/input/hid-core.c 2006-10-14
05:34:03.000000000 +0200
++++ linux-2.6.18.1-sonne/drivers/usb/input/hid-core.c 2006-10-28
21:46:50.000000000 +0200
+@@ -1585,6 +1585,13 @@
+
+ #define USB_VENDOR_ID_APPLE 0x05ac
+ #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
++#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214
++#define USB_DEVICE_ID_APPLE_GEYSER_ISO 0x0215
++#define USB_DEVICE_ID_APPLE_GEYSER_JIS 0x0216
++#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI 0x0217
++#define USB_DEVICE_ID_APPLE_GEYSER3_ISO 0x0218
++#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
++#define USB_DEVICE_ID_APPLE_IR 0x8240
+
+ #define USB_VENDOR_ID_CHERRY 0x046a
+ #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
+@@ -1731,16 +1738,18 @@
+
+ { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION,
HID_QUIRK_CYMOTION },
+
+- { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_IGNORE_MOUSE},
++
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IR, HID_QUIRK_IGNORE },
+
+ { USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
+@@ -1837,6 +1846,10 @@
+ if (quirks & HID_QUIRK_IGNORE)
+ return NULL;
+
++ if (quirks & HID_QUIRK_IGNORE_MOUSE)
++ if (interface->desc.bInterfaceProtocol ==
USB_INTERFACE_PROTOCOL_MOUSE)
++ return NULL;
++
+ if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
+ (!interface->desc.bNumEndpoints ||
+ usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID,
&hdesc))) {
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mactel-linux-devel mailing list
Mactel-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
