Revision: 65
http://svn.sourceforge.net/mactel-linux/?rev=65&view=rev
Author: nboichat
Date: 2006-11-26 06:45:24 -0800 (Sun, 26 Nov 2006)
Log Message:
-----------
Add usbhid.patch, that I forgot to port from 2.6.18 patchset, and
appletouch-geyser4.patch.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.19/Changelog
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.19/appletouch-geyser4.patch
trunk/kernel/mactel-patches-2.6.19/usbhid.patch
Modified: trunk/kernel/mactel-patches-2.6.19/Changelog
===================================================================
--- trunk/kernel/mactel-patches-2.6.19/Changelog 2006-11-26 14:42:31 UTC
(rev 64)
+++ trunk/kernel/mactel-patches-2.6.19/Changelog 2006-11-26 14:45:24 UTC
(rev 65)
@@ -3,6 +3,9 @@
NOTE: SATA doesn't rely on SCSI anymore, so you need to set ATA=y and
ATA_PIIX=y to get a bootable system.
+New patch:
+appletouch-geyser4.patch
+
Unchanged:
acpi-blacklist-fix.patch
mouseemu.patch
@@ -12,6 +15,7 @@
applesmc.patch: offsets
ir.patch: offsets
piix.ich7.patch: offsets
+usbhid.patch: offsets, and add support for Geyser 4 devices
Updated, need check:
sci_en.patch (needs check since since 2.6.18)
Added: trunk/kernel/mactel-patches-2.6.19/appletouch-geyser4.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.19/appletouch-geyser4.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.19/appletouch-geyser4.patch 2006-11-26
14:45:24 UTC (rev 65)
@@ -0,0 +1,36 @@
+--- linux/drivers/usb/input/appletouch.c.orig 2006-11-08 11:28:43.000000000
-0600
++++ linux/drivers/usb/input/appletouch.c 2006-11-08 10:10:21.000000000
-0600
+@@ -47,6 +47,10 @@
+ #define GEYSER3_ISO_PRODUCT_ID 0x0218
+ #define GEYSER3_JIS_PRODUCT_ID 0x0219
+
++#define GEYSER4_ANSI_PRODUCT_ID 0x021A
++#define GEYSER4_ISO_PRODUCT_ID 0x021B
++#define GEYSER4_JIS_PRODUCT_ID 0x021C
++
+ #define ATP_DEVICE(prod) \
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
+ USB_DEVICE_ID_MATCH_INT_CLASS | \
+@@ -72,6 +76,10 @@
+ { ATP_DEVICE(GEYSER3_ISO_PRODUCT_ID) },
+ { ATP_DEVICE(GEYSER3_JIS_PRODUCT_ID) },
+
++ { ATP_DEVICE(GEYSER4_ANSI_PRODUCT_ID) },
++ { ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
++ { ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
++
+ /* Terminating entry */
+ { }
+ };
+@@ -174,7 +182,10 @@
+
+ return (productId == GEYSER3_ANSI_PRODUCT_ID) ||
+ (productId == GEYSER3_ISO_PRODUCT_ID) ||
+- (productId == GEYSER3_JIS_PRODUCT_ID);
++ (productId == GEYSER3_JIS_PRODUCT_ID) ||
++ (productId == GEYSER4_ANSI_PRODUCT_ID) ||
++ (productId == GEYSER4_ISO_PRODUCT_ID) ||
++ (productId == GEYSER4_JIS_PRODUCT_ID);
+ }
+
+ static int atp_calculate_abs(int *xy_sensors, int nb_sensors, int fact,
Added: trunk/kernel/mactel-patches-2.6.19/usbhid.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.19/usbhid.patch
(rev 0)
+++ trunk/kernel/mactel-patches-2.6.19/usbhid.patch 2006-11-26 14:45:24 UTC
(rev 65)
@@ -0,0 +1,78 @@
+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
+
+ #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_GEYSER4_ANSI 0x021A
++#define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021B
++#define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021C
++#define USB_DEVICE_ID_APPLE_IR 0x8240
+
+ #define USB_VENDOR_ID_CHERRY 0x046a
+ #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
+@@ -1794,16 +1804,21 @@ static const struct hid_blacklist {
+
+ { 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, 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_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 },
+@@ -1902,6 +1917,10 @@ static struct hid_device *usb_hid_config
+ if (quirks & HID_QUIRK_IGNORE)
+ return NULL;
+
++ if ((quirks & HID_QUIRK_IGNORE_MOUSE) &&
++ (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))) {
+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
+ #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
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
