Revision: 67
http://svn.sourceforge.net/mactel-linux/?rev=67&view=rev
Author: huceke
Date: 2006-11-30 00:30:15 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
Update for 2.6.19
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.19/usbhid.patch
Modified: trunk/kernel/mactel-patches-2.6.19/usbhid.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.19/usbhid.patch 2006-11-27 22:25:24 UTC
(rev 66)
+++ trunk/kernel/mactel-patches-2.6.19/usbhid.patch 2006-11-30 08:30:15 UTC
(rev 67)
@@ -1,11 +1,7 @@
-2.6.19 version of the patch provided by:
-Signed-off-by: Soeren Sonnenburg <[EMAIL PROTECTED]>
-Signed-off-by: Sergey Vlasov <[EMAIL PROTECTED]>
-
-diff -pruN linux/drivers/usb/input.vanilla/hid-core.c
linux/drivers/usb/input/hid-core.c
---- linux/drivers/usb/input.vanilla/hid-core.c 2006-11-26 22:14:09.000000000
+0800
-+++ linux/drivers/usb/input/hid-core.c 2006-11-26 22:26:23.000000000 +0800
-@@ -1627,6 +1627,16 @@ void hid_init_reports(struct hid_device
+diff -uNr linux-2.6.19/drivers/usb/input/hid-core.c
linux-2.6.19-mactel/drivers/usb/input/hid-core.c
+--- linux-2.6.19/drivers/usb/input/hid-core.c 2006-11-29 22:57:37.000000000
+0100
++++ linux-2.6.19-mactel/drivers/usb/input/hid-core.c 2006-11-30
09:20:49.000000000 +0100
+@@ -1627,6 +1627,16 @@
#define USB_VENDOR_ID_APPLE 0x05ac
#define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
@@ -22,28 +18,29 @@
#define USB_VENDOR_ID_CHERRY 0x046a
#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
-@@ -1794,16 +1804,21 @@ static const struct hid_blacklist {
+@@ -1794,17 +1804,21 @@
{ 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, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
- { 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, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
- { USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },
+- { USB_VENDOR_ID_APPLE, 0x021B, 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_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+ { 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_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
-+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE},
++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO,
HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_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},
@@ -54,7 +51,7 @@
{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
-@@ -1902,6 +1917,10 @@ static struct hid_device *usb_hid_config
+@@ -1903,6 +1917,10 @@
if (quirks & HID_QUIRK_IGNORE)
return NULL;
@@ -65,13 +62,13 @@
if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
(!interface->desc.bNumEndpoints ||
usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID,
&hdesc))) {
-diff -pruN linux/drivers/usb/input.vanilla/hid.h linux/drivers/usb/input/hid.h
---- linux/drivers/usb/input.vanilla/hid.h 2006-11-26 22:14:09.000000000
+0800
-+++ linux/drivers/usb/input/hid.h 2006-11-26 22:15:31.000000000 +0800
-@@ -260,6 +260,7 @@ struct hid_item {
- #define HID_QUIRK_POWERBOOK_HAS_FN 0x00001000
+diff -uNr linux-2.6.19/drivers/usb/input/hid.h
linux-2.6.19-mactel/drivers/usb/input/hid.h
+--- linux-2.6.19/drivers/usb/input/hid.h 2006-11-29 22:57:37.000000000
+0100
++++ linux-2.6.19-mactel/drivers/usb/input/hid.h 2006-11-30
09:21:18.000000000 +0100
+@@ -261,6 +261,7 @@
#define HID_QUIRK_POWERBOOK_FN_ON 0x00002000
#define HID_QUIRK_INVERT_HWHEEL 0x00004000
+ #define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00008000
+#define HID_QUIRK_IGNORE_MOUSE 0x00008000
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mactel-linux-devel mailing list
Mactel-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
