Revision: 75
http://svn.sourceforge.net/mactel-linux/?rev=75&view=rev
Author: huceke
Date: 2006-12-02 03:27:16 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
Update for MacBook2,1
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.18/sci_en.patch
trunk/kernel/mactel-patches-2.6.18/usbhid.patch
Modified: trunk/kernel/mactel-patches-2.6.18/sci_en.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/sci_en.patch 2006-11-30 15:40:56 UTC
(rev 74)
+++ trunk/kernel/mactel-patches-2.6.18/sci_en.patch 2006-12-02 11:27:16 UTC
(rev 75)
@@ -57,7 +57,7 @@
break;
case PM_SUSPEND_DISK:
-@@ -191,12 +201,31 @@ static int __init init_ints_after_s1(str
+@@ -191,12 +201,36 @@ static int __init init_ints_after_s1(str
return 0;
}
@@ -86,6 +86,11 @@
+ .ident = "Apple MacBook",
+ .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),},
+ },
++ {
++ .callback = init_ich7_sci_en_quirk,
++ .ident = "Apple MacBook",
++ .matches = {DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"),},
++ },
{},
};
Modified: trunk/kernel/mactel-patches-2.6.18/usbhid.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.18/usbhid.patch 2006-11-30 15:40:56 UTC
(rev 74)
+++ trunk/kernel/mactel-patches-2.6.18/usbhid.patch 2006-12-02 11:27:16 UTC
(rev 75)
@@ -1,20 +1,8 @@
-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_FN_ON 0x00002000
- #define HID_QUIRK_INVERT_HWHEEL 0x00004000
- #define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00010000
-+#define HID_QUIRK_IGNORE_MOUSE 0x00008000
+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 @@
- /*
- * 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
@@ -23,30 +11,36 @@
+#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_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
-@@ -1731,16 +1738,18 @@
+@@ -1731,16 +1738,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 |
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 |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
-- { 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, 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 |
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 |
HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+- { 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_POWERBOOK_ISO_KEYBOARD |
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_POWERBOOK_ISO_KEYBOARD |
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 |
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},
+ { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN |
HID_QUIRK_IGNORE_MOUSE},
@@ -56,15 +50,25 @@
{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
-@@ -1837,6 +1846,10 @@
+@@ -1903,6 +1917,10 @@
if (quirks & HID_QUIRK_IGNORE)
return NULL;
-+ if (quirks & HID_QUIRK_IGNORE_MOUSE)
-+ if (interface->desc.bInterfaceProtocol ==
USB_INTERFACE_PROTOCOL_MOUSE)
++ 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 -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 0x00010000
++#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
