HID: move belkin quirks

Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>

HID: move belkin quirks
Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Jiri Slaby · Jiri Kosina
1 parent fcfacfd359
Showing 8 changed files with 123 additions and 22 deletions Side-by-side Diff
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-belkin.c
drivers/hid/hid-core.c
drivers/hid/hid-dummy.c
drivers/hid/hid-ids.h
drivers/hid/hid-input-quirks.c
drivers/hid/usbhid/hid-quirks.c
@@ -103,6 +103,13 @@
  
 	If unsure, say M.
  
+config HID_BELKIN
+	tristate "Belkin"
+	default m
+	depends on USB_HID
+	---help---
+	Support for Belkin Flip KVM and Wireless keyboard.
+
 config HID_CHERRY
 	tristate "Cherry"
 	default m
@@ -14,6 +14,7 @@
  
 obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o
 obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
+obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o
 obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o
 obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o
 obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o
+/*
+ *  HID driver for some belkin "special" devices
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
+ *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
+ *  Copyright (c) 2006-2007 Jiri Kosina
+ *  Copyright (c) 2007 Paul Walmsley
+ *  Copyright (c) 2008 Jiri Slaby
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define BELKIN_HIDDEV	0x01
+#define BELKIN_WKBD	0x02
+
+#define belkin_map_key_clear(c)	hid_map_usage_clear(hi, usage, bit, max, \
+					EV_KEY, (c))
+static int belkin_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+		struct hid_field *field, struct hid_usage *usage,
+		unsigned long **bit, int *max)
+{
+	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
+
+	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER ||
+			!(quirks & BELKIN_WKBD))
+		return 0;
+
+	switch (usage->hid & HID_USAGE) {
+	case 0x03a: belkin_map_key_clear(KEY_SOUND);		break;
+	case 0x03b: belkin_map_key_clear(KEY_CAMERA);		break;
+	case 0x03c: belkin_map_key_clear(KEY_DOCUMENTS);	break;
+	default:
+		return 0;
+	}
+	return 1;
+}
+
+static int belkin_probe(struct hid_device *hdev, const struct hid_device_id *id)
+{
+	unsigned long quirks = id->driver_data;
+	int ret;
+
+	hid_set_drvdata(hdev, (void *)quirks);
+
+	if (quirks & BELKIN_HIDDEV)
+		hdev->quirks |= HID_QUIRK_HIDDEV;
+
+	ret = hid_parse(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "parse failed\n");
+		goto err_free;
+	}
+
+	ret = hid_hw_start(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "hw start failed\n");
+		goto err_free;
+	}
+
+	return 0;
+err_free:
+	return ret;
+}
+
+static const struct hid_device_id belkin_devices[] = {
+	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM),
+		.driver_data = BELKIN_HIDDEV },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD),
+		.driver_data = BELKIN_WKBD },
+	{ }
+};
+MODULE_DEVICE_TABLE(hid, belkin_devices);
+
+static struct hid_driver belkin_driver = {
+	.name = "belkin",
+	.id_table = belkin_devices,
+	.input_mapping = belkin_input_mapping,
+	.probe = belkin_probe,
+};
+
+static int belkin_init(void)
+{
+	return hid_register_driver(&belkin_driver);
+}
+
+static void belkin_exit(void)
+{
+	hid_unregister_driver(&belkin_driver);
+}
+
+module_init(belkin_init);
+module_exit(belkin_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(belkin);
@@ -1164,12 +1164,14 @@
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_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) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
@@ -10,6 +10,9 @@
 #ifdef CONFIG_HID_APPLE_MODULE
 	HID_COMPAT_CALL_DRIVER(apple);
 #endif
+#ifdef CONFIG_HID_BELKIN_MODULE
+	HID_COMPAT_CALL_DRIVER(belkin);
+#endif
 #ifdef CONFIG_HID_CHERRY_MODULE
 	HID_COMPAT_CALL_DRIVER(cherry);
 #endif
@@ -234,6 +234,9 @@
 #define USB_VENDOR_ID_KBGEAR		0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO	0x1001
  
+#define USB_VENDOR_ID_LABTEC		0x1020
+#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD	0x0006
+
 #define USB_VENDOR_ID_LD		0x0f11
 #define USB_DEVICE_ID_LD_CASSY		0x1000
 #define USB_DEVICE_ID_LD_POCKETCASSY	0x1010
@@ -19,22 +19,6 @@
 #define map_key_clear(c)	hid_map_usage_clear(hidinput, usage, bit, \
 		max, EV_KEY, (c))
  
-static int quirk_belkin_wkbd(struct hid_usage *usage,
-		struct hid_input *hidinput, unsigned long **bit, int *max)
-{
-	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
-		return 0;
-
-	switch (usage->hid & HID_USAGE) {
-		case 0x03a: map_key_clear(KEY_SOUND);		break;
-		case 0x03b: map_key_clear(KEY_CAMERA);		break;
-		case 0x03c: map_key_clear(KEY_DOCUMENTS);	break;
-		default:
-			return 0;
-	}
-	return 1;
-}
-
 static int quirk_gyration_remote(struct hid_usage *usage,
 		struct hid_input *hidinput, unsigned long **bit, int *max)
 {
@@ -104,9 +88,6 @@
 	return 1;
 }
  
-#define VENDOR_ID_BELKIN			0x1020
-#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD	0x0006
-
 #define VENDOR_ID_GYRATION			0x0c16
 #define DEVICE_ID_GYRATION_REMOTE		0x0002
  
@@ -122,8 +103,6 @@
 	int (*quirk)(struct hid_usage *, struct hid_input *, unsigned long **,
 			int *);
 } hid_input_blacklist[] = {
-	{ VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
-
 	{ VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
  
 	{ VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
@@ -43,7 +43,6 @@
  
 	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
  
-	{ USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
 	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },
  
 	{ USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
...	...	@@ -103,6 +103,13 @@
103	103
104	104	If unsure, say M.
105	105
	106	+config HID_BELKIN
	107	+ tristate "Belkin"
	108	+ default m
	109	+ depends on USB_HID
	110	+ ---help---
	111	+ Support for Belkin Flip KVM and Wireless keyboard.
	112	+
106	113	config HID_CHERRY
107	114	tristate "Cherry"
108	115	default m
...	...	@@ -14,6 +14,7 @@
14	14
15	15	obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o
16	16	obj-$(CONFIG_HID_APPLE) += hid-apple.o
	17	+obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
17	18	obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
18	19	obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
19	20	obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
	1	+/*
	2	+ * HID driver for some belkin "special" devices
	3	+ *
	4	+ * Copyright (c) 1999 Andreas Gal
	5	+ * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
	6	+ * Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
	7	+ * Copyright (c) 2006-2007 Jiri Kosina
	8	+ * Copyright (c) 2007 Paul Walmsley
	9	+ * Copyright (c) 2008 Jiri Slaby
	10	+ */
	11	+
	12	+/*
	13	+ * This program is free software; you can redistribute it and/or modify it
	14	+ * under the terms of the GNU General Public License as published by the Free
	15	+ * Software Foundation; either version 2 of the License, or (at your option)
	16	+ * any later version.
	17	+ */
	18	+
	19	+#include <linux/device.h>
	20	+#include <linux/hid.h>
	21	+#include <linux/module.h>
	22	+
	23	+#include "hid-ids.h"
	24	+
	25	+#define BELKIN_HIDDEV 0x01
	26	+#define BELKIN_WKBD 0x02
	27	+
	28	+#define belkin_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
	29	+ EV_KEY, (c))
	30	+static int belkin_input_mapping(struct hid_device hdev, struct hid_input hi,
	31	+ struct hid_field field, struct hid_usage usage,
	32	+ unsigned long *bit, int max)
	33	+{
	34	+ unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);
	35	+
	36	+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER \|\|
	37	+ !(quirks & BELKIN_WKBD))
	38	+ return 0;
	39	+
	40	+ switch (usage->hid & HID_USAGE) {
	41	+ case 0x03a: belkin_map_key_clear(KEY_SOUND); break;
	42	+ case 0x03b: belkin_map_key_clear(KEY_CAMERA); break;
	43	+ case 0x03c: belkin_map_key_clear(KEY_DOCUMENTS); break;
	44	+ default:
	45	+ return 0;
	46	+ }
	47	+ return 1;
	48	+}
	49	+
	50	+static int belkin_probe(struct hid_device hdev, const struct hid_device_id id)
	51	+{
	52	+ unsigned long quirks = id->driver_data;
	53	+ int ret;
	54	+
	55	+ hid_set_drvdata(hdev, (void *)quirks);
	56	+
	57	+ if (quirks & BELKIN_HIDDEV)
	58	+ hdev->quirks \|= HID_QUIRK_HIDDEV;
	59	+
	60	+ ret = hid_parse(hdev);
	61	+ if (ret) {
	62	+ dev_err(&hdev->dev, "parse failed\n");
	63	+ goto err_free;
	64	+ }
	65	+
	66	+ ret = hid_hw_start(hdev);
	67	+ if (ret) {
	68	+ dev_err(&hdev->dev, "hw start failed\n");
	69	+ goto err_free;
	70	+ }
	71	+
	72	+ return 0;
	73	+err_free:
	74	+ return ret;
	75	+}
	76	+
	77	+static const struct hid_device_id belkin_devices[] = {
	78	+ { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM),
	79	+ .driver_data = BELKIN_HIDDEV },
	80	+ { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD),
	81	+ .driver_data = BELKIN_WKBD },
	82	+ { }
	83	+};
	84	+MODULE_DEVICE_TABLE(hid, belkin_devices);
	85	+
	86	+static struct hid_driver belkin_driver = {
	87	+ .name = "belkin",
	88	+ .id_table = belkin_devices,
	89	+ .input_mapping = belkin_input_mapping,
	90	+ .probe = belkin_probe,
	91	+};
	92	+
	93	+static int belkin_init(void)
	94	+{
	95	+ return hid_register_driver(&belkin_driver);
	96	+}
	97	+
	98	+static void belkin_exit(void)
	99	+{
	100	+ hid_unregister_driver(&belkin_driver);
	101	+}
	102	+
	103	+module_init(belkin_init);
	104	+module_exit(belkin_exit);
	105	+MODULE_LICENSE("GPL");
	106	+
	107	+HID_COMPAT_LOAD_DRIVER(belkin);
...	...	@@ -1164,12 +1164,14 @@
1164	1164	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
1165	1165	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
1166	1166	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
	1167	+ { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
1167	1168	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
1168	1169	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
1169	1170	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
1170	1171	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
1171	1172	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
1172	1173	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
	1174	+ { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
1173	1175	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
1174	1176	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
1175	1177	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
...	...	@@ -10,6 +10,9 @@
10	10	#ifdef CONFIG_HID_APPLE_MODULE
11	11	HID_COMPAT_CALL_DRIVER(apple);
12	12	#endif
	13	+#ifdef CONFIG_HID_BELKIN_MODULE
	14	+ HID_COMPAT_CALL_DRIVER(belkin);
	15	+#endif
13	16	#ifdef CONFIG_HID_CHERRY_MODULE
14	17	HID_COMPAT_CALL_DRIVER(cherry);
15	18	#endif
...	...	@@ -234,6 +234,9 @@
234	234	#define USB_VENDOR_ID_KBGEAR 0x084e
235	235	#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO 0x1001
236	236
	237	+#define USB_VENDOR_ID_LABTEC 0x1020
	238	+#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006
	239	+
237	240	#define USB_VENDOR_ID_LD 0x0f11
238	241	#define USB_DEVICE_ID_LD_CASSY 0x1000
239	242	#define USB_DEVICE_ID_LD_POCKETCASSY 0x1010
...	...	@@ -19,22 +19,6 @@
19	19	#define map_key_clear(c) hid_map_usage_clear(hidinput, usage, bit, \
20	20	max, EV_KEY, (c))
21	21
22		-static int quirk_belkin_wkbd(struct hid_usage *usage,
23		- struct hid_input hidinput, unsigned long bit, int max)
24		-{
25		- if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
26		- return 0;
27		-
28		- switch (usage->hid & HID_USAGE) {
29		- case 0x03a: map_key_clear(KEY_SOUND); break;
30		- case 0x03b: map_key_clear(KEY_CAMERA); break;
31		- case 0x03c: map_key_clear(KEY_DOCUMENTS); break;
32		- default:
33		- return 0;
34		- }
35		- return 1;
36		-}
37		-
38	22	static int quirk_gyration_remote(struct hid_usage *usage,
39	23	struct hid_input hidinput, unsigned long bit, int max)
40	24	{
...	...	@@ -104,9 +88,6 @@
104	88	return 1;
105	89	}
106	90
107		-#define VENDOR_ID_BELKIN 0x1020
108		-#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD 0x0006
109		-
110	91	#define VENDOR_ID_GYRATION 0x0c16
111	92	#define DEVICE_ID_GYRATION_REMOTE 0x0002
112	93
...	...	@@ -122,8 +103,6 @@
122	103	int (quirk)(struct hid_usage , struct hid_input , unsigned long *,
123	104	int *);
124	105	} hid_input_blacklist[] = {
125		- { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
126		-
127	106	{ VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
128	107
129	108	{ VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
...	...	@@ -43,7 +43,6 @@
43	43
44	44	{ USB_VENDOR_ID_AFATECH, USB_DEVICE_ID_AFATECH_AF9016, HID_QUIRK_FULLSPEED_INTERVAL },
45	45
46		- { USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },
47	46	{ USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, HID_QUIRK_HIDDEV \| HID_QUIRK_IGNORE_HIDINPUT },
48	47
49	48	{ USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT \| HID_QUIRK_SKIP_OUTPUT_REPORTS },