tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Input: appletouch - use canonical names in USB IDs
Small readability improvement for appletouch: use canonical names
instead of raw USB IDs for some of the devices.
Signed-off-by: Julien BLACHE <jb@jblache.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
authored by
Julien BLACHE
and committed by
Dmitry Torokhov
e5d9832c
009ad0e7
+17
-10
+17
-10
drivers/usb/input/appletouch.c
+17
-10
drivers/usb/input/appletouch.c
···
38
38
#define APPLE_VENDOR_ID 0x05AC
39
39
40
40
/* These names come from Info.plist in AppleUSBTrackpad.kext */
41
-
#define GEYSER_ANSI_PRODUCT_ID 0x0214
42
-
#define GEYSER_ISO_PRODUCT_ID 0x0215
43
-
#define GEYSER_JIS_PRODUCT_ID 0x0216
41
+
#define FOUNTAIN_ANSI_PRODUCT_ID 0x020E
42
+
#define FOUNTAIN_ISO_PRODUCT_ID 0x020F
43
+
44
+
#define FOUNTAIN_TP_ONLY_PRODUCT_ID 0x030A
45
+
46
+
#define GEYSER1_TP_ONLY_PRODUCT_ID 0x030B
47
+
48
+
#define GEYSER_ANSI_PRODUCT_ID 0x0214
49
+
#define GEYSER_ISO_PRODUCT_ID 0x0215
50
+
#define GEYSER_JIS_PRODUCT_ID 0x0216
44
51
45
52
/* MacBook devices */
46
-
#define GEYSER3_ANSI_PRODUCT_ID 0x0217
47
-
#define GEYSER3_ISO_PRODUCT_ID 0x0218
48
-
#define GEYSER3_JIS_PRODUCT_ID 0x0219
53
+
#define GEYSER3_ANSI_PRODUCT_ID 0x0217
54
+
#define GEYSER3_ISO_PRODUCT_ID 0x0218
55
+
#define GEYSER3_JIS_PRODUCT_ID 0x0219
49
56
50
57
/*
51
58
* Geyser IV: same as Geyser III according to Info.plist in AppleUSBTrackpad.kext
···
73
66
74
67
/* table of devices that work with this driver */
75
68
static struct usb_device_id atp_table [] = {
76
-
{ ATP_DEVICE(0x020E) },
77
-
{ ATP_DEVICE(0x020F) },
78
-
{ ATP_DEVICE(0x030A) },
79
-
{ ATP_DEVICE(0x030B) },
69
+
{ ATP_DEVICE(FOUNTAIN_ANSI_PRODUCT_ID) },
70
+
{ ATP_DEVICE(FOUNTAIN_ISO_PRODUCT_ID) },
71
+
{ ATP_DEVICE(FOUNTAIN_TP_ONLY_PRODUCT_ID) },
72
+
{ ATP_DEVICE(GEYSER1_TP_ONLY_PRODUCT_ID) },
80
73
81
74
/* PowerBooks Oct 2005 */
82
75
{ ATP_DEVICE(GEYSER_ANSI_PRODUCT_ID) },