* Re: Device IDs for new Apple Wireless Keyboard
@ 2009-12-28 13:17 Jiri Slaby
2010-01-04 10:57 ` Jiri Kosina
0 siblings, 1 reply; 8+ messages in thread
From: Jiri Slaby @ 2009-12-28 13:17 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-input, LKML, Christian Schuerer-Waldheim
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Hi, I added some proper CCs. For me they look good. Care to add
signed-off-by line? Thanks.
---- original message ----
Hello Jiri,
I'm writing to you because you are the last in the list of contributors
in the
file hid-apple.c of the linux kernel.
Since November 2009 Apple is selling a new make of its Wireless Keyboard,
which have new device IDs. In order to make the kernel driver hid-apple to
take care about this new devices, the new IDs have to be added. I've
created
patches for the 2.6.31 and 2.6.32 kernel. Could you please integrate
them into
the main kernel?
If you are not responsible for it anymore, please tell me whom I may
contact
instead. Thank you!
N.B.: The ID of the JIS-version is an assumption. The other two IDs
where read
from the new devices.
Greetings,
Christian Schürer-Waldheim
[-- Attachment #2: apple-wireless-keyboard-2009-linux-2.6.31.9.diff --]
[-- Type: text/x-patch, Size: 2652 bytes --]
=== modified file 'drivers/hid/hid-apple.c'
--- old/drivers/hid/hid-apple.c 2009-12-23 23:29:17 +0000
+++ new/drivers/hid/hid-apple.c 2009-12-23 23:51:58 +0000
@@ -413,6 +413,13 @@
APPLE_ISO_KEYBOARD },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
.driver_data = APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
=== modified file 'drivers/hid/hid-core.c'
--- old/drivers/hid/hid-core.c 2009-12-23 23:29:17 +0000
+++ new/drivers/hid/hid-core.c 2009-12-23 23:51:58 +0000
@@ -1250,6 +1250,9 @@
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
=== modified file 'drivers/hid/hid-ids.h'
--- old/drivers/hid/hid-ids.h 2009-12-23 23:29:17 +0000
+++ new/drivers/hid/hid-ids.h 2009-12-23 23:51:58 +0000
@@ -82,6 +82,9 @@
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231
#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
[-- Attachment #3: apple-wireless-keyboard-2009-linux-2.6.32.2.diff --]
[-- Type: text/x-patch, Size: 2652 bytes --]
=== modified file 'drivers/hid/hid-apple.c'
--- old/drivers/hid/hid-apple.c 2009-12-24 00:17:19 +0000
+++ new/drivers/hid/hid-apple.c 2009-12-24 00:19:58 +0000
@@ -413,6 +413,13 @@
APPLE_ISO_KEYBOARD },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
.driver_data = APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
=== modified file 'drivers/hid/hid-core.c'
--- old/drivers/hid/hid-core.c 2009-12-24 00:17:19 +0000
+++ new/drivers/hid/hid-core.c 2009-12-24 00:19:58 +0000
@@ -1278,6 +1278,9 @@
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
=== modified file 'drivers/hid/hid-ids.h'
--- old/drivers/hid/hid-ids.h 2009-12-24 00:17:19 +0000
+++ new/drivers/hid/hid-ids.h 2009-12-24 00:19:58 +0000
@@ -82,6 +82,9 @@
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230
#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231
#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: Device IDs for new Apple Wireless Keyboard
2009-12-28 13:17 Device IDs for new Apple Wireless Keyboard Jiri Slaby
@ 2010-01-04 10:57 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.33-rc2 - " Christian Schuerer
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jiri Kosina @ 2010-01-04 10:57 UTC (permalink / raw)
To: Jiri Slaby, Christian Schuerer-Waldheim; +Cc: linux-input, LKML
On Mon, 28 Dec 2009, Jiri Slaby wrote:
> Hi, I added some proper CCs. For me they look good. Care to add
> signed-off-by line? Thanks.
>
> ---- original message ----
> Hello Jiri,
>
> I'm writing to you because you are the last in the list of contributors
> in the
> file hid-apple.c of the linux kernel.
>
> Since November 2009 Apple is selling a new make of its Wireless
> Keyboard, which have new device IDs. In order to make the kernel driver
> hid-apple to take care about this new devices, the new IDs have to be
> added. I've created patches for the 2.6.31 and 2.6.32 kernel. Could you
> please integrate them into the main kernel?
>
> If you are not responsible for it anymore, please tell me whom I may
> contact instead. Thank you!
Christian,
thanks for the patch. Could you please make the following two updates to
it, and send it to me, so that I could merge it? Thanks.
- add a proper Signed-off-by: line, as described in
Documentation/SubmittingPatches
- keep the list of Apple IDs ordered by the product number
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] linux-2.6.33-rc2 - Re: Device IDs for new Apple Wireless Keyboard
2010-01-04 10:57 ` Jiri Kosina
@ 2010-01-06 1:16 ` Christian Schuerer
2010-01-06 10:14 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.31.9 - " Christian Schuerer
2010-01-06 1:16 ` [PATCH] linux-2.6.32.2 " Christian Schuerer
2 siblings, 1 reply; 8+ messages in thread
From: Christian Schuerer @ 2010-01-06 1:16 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Jiri Slaby, linux-input, LKML
On Monday 04 January 2010 11:57:33 Jiri Kosina wrote:
> On Mon, 28 Dec 2009, Jiri Slaby wrote:
> > Hi, I added some proper CCs. For me they look good. Care to add
> > signed-off-by line? Thanks.
> thanks for the patch. Could you please make the following two updates to
> it, and send it to me, so that I could merge it? Thanks.
>
> - add a proper Signed-off-by: line, as described in
> Documentation/SubmittingPatches
> - keep the list of Apple IDs ordered by the product number
Jiri,
here is the patch for linux-2.6.33-rc2:
Changes:
Added device IDs for the new model of the Apple Wireless Keyboard (November
2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-
rc2-vanilla/drivers/hid/hid-apple.c linux-2.6.33-rc2-apple/drivers/hid/hid-
apple.c
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-apple.c 2009-12-24
22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-apple.c 2010-01-06
01:39:29.000000000 +0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-
rc2-vanilla/drivers/hid/hid-core.c linux-2.6.33-rc2-apple/drivers/hid/hid-
core.c
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-core.c 2009-12-24
22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-core.c 2010-01-06 01:41:21.000000000
+0100
@@ -1285,6 +1285,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS)
},
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-
rc2-vanilla/drivers/hid/hid-ids.h linux-2.6.33-rc2-apple/drivers/hid/hid-ids.h
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-ids.h 2009-12-24
22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-ids.h 2010-01-06 01:42:30.000000000
+0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] linux-2.6.31.9 - Re: Device IDs for new Apple Wireless Keyboard
2010-01-04 10:57 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.33-rc2 - " Christian Schuerer
@ 2010-01-06 1:16 ` Christian Schuerer
2010-01-06 1:16 ` [PATCH] linux-2.6.32.2 " Christian Schuerer
2 siblings, 0 replies; 8+ messages in thread
From: Christian Schuerer @ 2010-01-06 1:16 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Jiri Slaby, linux-input, LKML
On Monday 04 January 2010 11:57:33 Jiri Kosina wrote:
> On Mon, 28 Dec 2009, Jiri Slaby wrote:
> > Hi, I added some proper CCs. For me they look good. Care to add
> > signed-off-by line? Thanks.
> thanks for the patch. Could you please make the following two updates to
> it, and send it to me, so that I could merge it? Thanks.
>
> - add a proper Signed-off-by: line, as described in
> Documentation/SubmittingPatches
> - keep the list of Apple IDs ordered by the product number
Jiri,
thank you for your feedback. Here is the patch for linux-2.6.31.9:
Changes:
Added device IDs for the new model of the Apple Wireless Keyboard (November
2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-
vanilla/drivers/hid/hid-apple.c linux-2.6.31.9-apple/drivers/hid/hid-apple.c
--- linux-2.6.31.9-vanilla/drivers/hid/hid-apple.c 2009-12-18
22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-apple.c 2010-01-06 01:39:33.000000000
+0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-
vanilla/drivers/hid/hid-core.c linux-2.6.31.9-apple/drivers/hid/hid-core.c
--- linux-2.6.31.9-vanilla/drivers/hid/hid-core.c 2009-12-18
22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-core.c 2010-01-06 01:40:39.000000000
+0100
@@ -1259,6 +1259,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS)
},
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-
vanilla/drivers/hid/hid-ids.h linux-2.6.31.9-apple/drivers/hid/hid-ids.h
--- linux-2.6.31.9-vanilla/drivers/hid/hid-ids.h 2009-12-18
22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-ids.h 2010-01-06 01:41:51.000000000
+0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] linux-2.6.32.2 - Re: Device IDs for new Apple Wireless Keyboard
2010-01-04 10:57 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.33-rc2 - " Christian Schuerer
2010-01-06 1:16 ` [PATCH] linux-2.6.31.9 - " Christian Schuerer
@ 2010-01-06 1:16 ` Christian Schuerer
2 siblings, 0 replies; 8+ messages in thread
From: Christian Schuerer @ 2010-01-06 1:16 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Jiri Slaby, linux-input, LKML
On Monday 04 January 2010 11:57:33 Jiri Kosina wrote:
> On Mon, 28 Dec 2009, Jiri Slaby wrote:
> > Hi, I added some proper CCs. For me they look good. Care to add
> > signed-off-by line? Thanks.
> thanks for the patch. Could you please make the following two updates to
> it, and send it to me, so that I could merge it? Thanks.
>
> - add a proper Signed-off-by: line, as described in
> Documentation/SubmittingPatches
> - keep the list of Apple IDs ordered by the product number
Jiri,
here is the patch for linux-2.6.32.2:
Changes:
Added device IDs for the new model of the Apple Wireless Keyboard (November
2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-
vanilla/drivers/hid/hid-apple.c linux-2.6.32.2-apple/drivers/hid/hid-apple.c
--- linux-2.6.32.2-vanilla/drivers/hid/hid-apple.c 2009-12-18
23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-apple.c 2010-01-06 01:39:31.000000000
+0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-
vanilla/drivers/hid/hid-core.c linux-2.6.32.2-apple/drivers/hid/hid-core.c
--- linux-2.6.32.2-vanilla/drivers/hid/hid-core.c 2009-12-18
23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-core.c 2010-01-06 01:41:01.000000000
+0100
@@ -1287,6 +1287,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS)
},
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY)
},
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-
vanilla/drivers/hid/hid-ids.h linux-2.6.32.2-apple/drivers/hid/hid-ids.h
--- linux-2.6.32.2-vanilla/drivers/hid/hid-ids.h 2009-12-18
23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-ids.h 2010-01-06 01:42:02.000000000
+0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] linux-2.6.33-rc2 - Re: Device IDs for new Apple Wireless Keyboard
2010-01-06 1:16 ` [PATCH] linux-2.6.33-rc2 - " Christian Schuerer
@ 2010-01-06 10:14 ` Jiri Kosina
2010-01-06 12:57 ` [PATCH] linux-2.6.31.9, linux-2.6.32.2, linux-2.6.33-rc2 -- " Christian Schuerer
0 siblings, 1 reply; 8+ messages in thread
From: Jiri Kosina @ 2010-01-06 10:14 UTC (permalink / raw)
To: Christian Schuerer; +Cc: Jiri Slaby, linux-input, LKML
On Wed, 6 Jan 2010, Christian Schuerer wrote:
> here is the patch for linux-2.6.33-rc2:
Thanks. Unfortunately, it's wordwrapped, so it can't be easily applied.
Could you please fix up your e-mail client so that it doesn't mangle long
lines, or eventually send is as an attachment?
> Added device IDs for the new model of the Apple Wireless Keyboard (November
> 2009).
>
> Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
>
> diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-
> rc2-vanilla/drivers/hid/hid-apple.c linux-2.6.33-rc2-apple/drivers/hid/hid-
> apple.c
> --- linux-2.6.33-rc2-vanilla/drivers/hid/hid-apple.c 2009-12-24
> 22:09:41.000000000 +0100
> +++ linux-2.6.33-rc2-apple/drivers/hid/hid-apple.c 2010-01-06
> 01:39:29.000000000 +0100
> @@ -431,6 +431,13 @@ static const struct hid_device_id apple_
> .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
> .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
> + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
> + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
> + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
> + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
> + APPLE_ISO_KEYBOARD },
> + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
> USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
> + .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
These are solely Bluetooth device, and there is no USB variant, right?
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] linux-2.6.31.9, linux-2.6.32.2, linux-2.6.33-rc2 -- Re: Device IDs for new Apple Wireless Keyboard
2010-01-06 10:14 ` Jiri Kosina
@ 2010-01-06 12:57 ` Christian Schuerer
2010-01-06 13:46 ` Jiri Kosina
0 siblings, 1 reply; 8+ messages in thread
From: Christian Schuerer @ 2010-01-06 12:57 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Jiri Slaby, linux-input, LKML
[-- Attachment #1: Type: Text/Plain, Size: 725 bytes --]
Hello Jiri,
On Wednesday 06 January 2010 11:14:38 Jiri Kosina wrote:
> On Wed, 6 Jan 2010, Christian Schuerer wrote:
> > here is the patch for linux-2.6.33-rc2:
> > Thanks. Unfortunately, it's wordwrapped, so it can't be easily applied.
> Could you please fix up your e-mail client so that it doesn't mangle long
> lines, or eventually send is as an attachment?
I'm sorry, I have attached all three patches as text files.
> > Added device IDs for the new model of the Apple Wireless Keyboard
> > (November 2009).
> These are solely Bluetooth device, and there is no USB variant, right?
As far as I know of only a new variant of the wireless (bluetooth) keyboard
has been released in November 2009.
Greetings,
Christian
[-- Attachment #2: patch-2.6.31.9 --]
[-- Type: text/plain, Size: 3362 bytes --]
Added device IDs for the new model of the Apple Wireless Keyboard (November 2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-vanilla/drivers/hid/hid-apple.c linux-2.6.31.9-apple/drivers/hid/hid-apple.c
--- linux-2.6.31.9-vanilla/drivers/hid/hid-apple.c 2009-12-18 22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-apple.c 2010-01-06 01:39:33.000000000 +0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-vanilla/drivers/hid/hid-core.c linux-2.6.31.9-apple/drivers/hid/hid-core.c
--- linux-2.6.31.9-vanilla/drivers/hid/hid-core.c 2009-12-18 22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-core.c 2010-01-06 01:40:39.000000000 +0100
@@ -1259,6 +1259,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.31.9-vanilla/Documentation/dontdiff linux-2.6.31.9-vanilla/drivers/hid/hid-ids.h linux-2.6.31.9-apple/drivers/hid/hid-ids.h
--- linux-2.6.31.9-vanilla/drivers/hid/hid-ids.h 2009-12-18 22:47:01.000000000 +0100
+++ linux-2.6.31.9-apple/drivers/hid/hid-ids.h 2010-01-06 01:41:51.000000000 +0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
[-- Attachment #3: patch-2.6.32.2 --]
[-- Type: text/plain, Size: 3362 bytes --]
Added device IDs for the new model of the Apple Wireless Keyboard (November 2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-vanilla/drivers/hid/hid-apple.c linux-2.6.32.2-apple/drivers/hid/hid-apple.c
--- linux-2.6.32.2-vanilla/drivers/hid/hid-apple.c 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-apple.c 2010-01-06 01:39:31.000000000 +0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-vanilla/drivers/hid/hid-core.c linux-2.6.32.2-apple/drivers/hid/hid-core.c
--- linux-2.6.32.2-vanilla/drivers/hid/hid-core.c 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-core.c 2010-01-06 01:41:01.000000000 +0100
@@ -1287,6 +1287,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.32.2-vanilla/Documentation/dontdiff linux-2.6.32.2-vanilla/drivers/hid/hid-ids.h linux-2.6.32.2-apple/drivers/hid/hid-ids.h
--- linux-2.6.32.2-vanilla/drivers/hid/hid-ids.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2-apple/drivers/hid/hid-ids.h 2010-01-06 01:42:02.000000000 +0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
[-- Attachment #4: patch-2.6.33-rc2 --]
[-- Type: text/plain, Size: 3392 bytes --]
Added device IDs for the new model of the Apple Wireless Keyboard (November 2009).
Signed-off-by: Christian Schuerer-Waldheim <csw@xray.at>
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-rc2-vanilla/drivers/hid/hid-apple.c linux-2.6.33-rc2-apple/drivers/hid/hid-apple.c
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-apple.c 2009-12-24 22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-apple.c 2010-01-06 01:39:29.000000000 +0100
@@ -431,6 +431,13 @@ static const struct hid_device_id apple_
.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
+ APPLE_ISO_KEYBOARD },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),
+ .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-rc2-vanilla/drivers/hid/hid-core.c linux-2.6.33-rc2-apple/drivers/hid/hid-core.c
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-core.c 2009-12-24 22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-core.c 2010-01-06 01:41:21.000000000 +0100
@@ -1285,6 +1285,9 @@ static const struct hid_device_id hid_bl
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
diff -uprN -X linux-2.6.33-rc2-vanilla/Documentation/dontdiff linux-2.6.33-rc2-vanilla/drivers/hid/hid-ids.h linux-2.6.33-rc2-apple/drivers/hid/hid-ids.h
--- linux-2.6.33-rc2-vanilla/drivers/hid/hid-ids.h 2009-12-24 22:09:41.000000000 +0100
+++ linux-2.6.33-rc2-apple/drivers/hid/hid-ids.h 2010-01-06 01:42:30.000000000 +0100
@@ -88,6 +88,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
+#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] linux-2.6.31.9, linux-2.6.32.2, linux-2.6.33-rc2 -- Re: Device IDs for new Apple Wireless Keyboard
2010-01-06 12:57 ` [PATCH] linux-2.6.31.9, linux-2.6.32.2, linux-2.6.33-rc2 -- " Christian Schuerer
@ 2010-01-06 13:46 ` Jiri Kosina
0 siblings, 0 replies; 8+ messages in thread
From: Jiri Kosina @ 2010-01-06 13:46 UTC (permalink / raw)
To: Christian Schuerer; +Cc: Jiri Slaby, linux-input, LKML
On Wed, 6 Jan 2010, Christian Schuerer wrote:
> > > here is the patch for linux-2.6.33-rc2:
> > > Thanks. Unfortunately, it's wordwrapped, so it can't be easily applied.
> > Could you please fix up your e-mail client so that it doesn't mangle long
> > lines, or eventually send is as an attachment?
>
> I'm sorry, I have attached all three patches as text files.
>
> > > Added device IDs for the new model of the Apple Wireless Keyboard
> > > (November 2009).
> > These are solely Bluetooth device, and there is no USB variant, right?
>
> As far as I know of only a new variant of the wireless (bluetooth) keyboard
> has been released in November 2009.
Applied to my tree, thanks Christian.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-01-06 13:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-28 13:17 Device IDs for new Apple Wireless Keyboard Jiri Slaby
2010-01-04 10:57 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.33-rc2 - " Christian Schuerer
2010-01-06 10:14 ` Jiri Kosina
2010-01-06 12:57 ` [PATCH] linux-2.6.31.9, linux-2.6.32.2, linux-2.6.33-rc2 -- " Christian Schuerer
2010-01-06 13:46 ` Jiri Kosina
2010-01-06 1:16 ` [PATCH] linux-2.6.31.9 - " Christian Schuerer
2010-01-06 1:16 ` [PATCH] linux-2.6.32.2 " Christian Schuerer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).