HID: move ezkey quirks

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 85aabb5d971240998fa7927ed58c9a36ddb4b442..8098ad322b71e54136592b9167b71c35b6750a48 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -117,6 +117,13 @@ config HID_CYPRESS
        ---help---
        Support for Cypress mouse and barcodes.
 
+config HID_EZKEY
+       tristate "Ezkey"
+       default m
+       depends on USB_HID
+       ---help---
+       Support for Ezkey mouse and barcodes.
+
 config HID_LOGITECH
        tristate "Logitech"
        default m

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index cd6bd024767c5913f62e13ef1acd6130275335f6..4790777f8435b2981aeae45f84cc6890a53315a3 100644 (file)
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_HID_A4TECH)      += hid-a4tech.o
 obj-$(CONFIG_HID_APPLE)                += hid-apple.o
 obj-$(CONFIG_HID_CHERRY)       += hid-cherry.o
 obj-$(CONFIG_HID_CYPRESS)      += hid-cypress.o
+obj-$(CONFIG_HID_EZKEY)                += hid-ezkey.o
 obj-$(CONFIG_HID_LOGITECH)     += hid-logitech.o
 obj-$(CONFIG_HID_MICROSOFT)    += hid-microsoft.o
 obj-$(CONFIG_HID_SUNPLUS)      += hid-sunplus.o

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5acdc3742851182a070a2ea6306da9445b1b3fe8..84e478df057cb68f25a4689ff85fe1e1cc5d5dab 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1168,6 +1168,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { 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_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) },

diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c
index 178344ea651bf067da2ee3c283f90282fbe62682..0dbdbb73b73c568f93b1829a696cd51822b037a9 100644 (file)
--- a/drivers/hid/hid-dummy.c
+++ b/drivers/hid/hid-dummy.c
@@ -16,6 +16,9 @@ static int __init hid_dummy_init(void)
 #ifdef CONFIG_HID_CYPRESS_MODULE
        HID_COMPAT_CALL_DRIVER(cypress);
 #endif
+#ifdef CONFIG_HID_EZKEY_MODULE
+       HID_COMPAT_CALL_DRIVER(ezkey);
+#endif
 #ifdef CONFIG_HID_LOGITECH_MODULE
        HID_COMPAT_CALL_DRIVER(logitech);
 #endif

diff --git a/drivers/hid/hid-ezkey.c b/drivers/hid/hid-ezkey.c
new file mode 100644 (file)
index 0000000..deb42f9
--- /dev/null
+++ b/drivers/hid/hid-ezkey.c
@@ -0,0 +1,95 @@
+/*
+ *  HID driver for some ezkey "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/input.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+#define ez_map_rel(c)  hid_map_usage(hi, usage, bit, max, EV_REL, (c))
+#define ez_map_key(c)  hid_map_usage(hi, usage, bit, max, EV_KEY, (c))
+
+static int ez_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+               struct hid_field *field, struct hid_usage *usage,
+               unsigned long **bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+               return 0;
+
+       switch (usage->hid & HID_USAGE) {
+       case 0x230: ez_map_key(BTN_MOUSE);      break;
+       case 0x231: ez_map_rel(REL_WHEEL);      break;
+       /*
+        * this keyboard has a scrollwheel implemented in
+        * totally broken way. We map this usage temporarily
+        * to HWHEEL and handle it in the event quirk handler
+        */
+       case 0x232: ez_map_rel(REL_HWHEEL);     break;
+       default:
+               return 0;
+       }
+       return 1;
+}
+
+static int ez_event(struct hid_device *hdev, struct hid_field *field,
+               struct hid_usage *usage, __s32 value)
+{
+       if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput ||
+                       !usage->type)
+               return 0;
+
+       /* handle the temporary quirky mapping to HWHEEL */
+       if (usage->type == EV_REL && usage->code == REL_HWHEEL) {
+               struct input_dev *input = field->hidinput->input;
+               input_event(input, usage->type, REL_WHEEL, -value);
+               return 1;
+       }
+
+       return 0;
+}
+
+static const struct hid_device_id ez_devices[] = {
+       { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+       { }
+};
+MODULE_DEVICE_TABLE(hid, ez_devices);
+
+static struct hid_driver ez_driver = {
+       .name = "ezkey",
+       .id_table = ez_devices,
+       .input_mapping = ez_input_mapping,
+       .event = ez_event,
+};
+
+static int ez_init(void)
+{
+       return hid_register_driver(&ez_driver);
+}
+
+static void ez_exit(void)
+{
+       hid_unregister_driver(&ez_driver);
+}
+
+module_init(ez_init);
+module_exit(ez_exit);
+MODULE_LICENSE("GPL");
+
+HID_COMPAT_LOAD_DRIVER(ezkey);

diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
index 97ee75064a0e70d246c7064a50f7c6ccb79f3924..4cd585b64ae03f8b3825770e3530bd5a85ce0ce5 100644 (file)
--- a/drivers/hid/hid-input-quirks.c
+++ b/drivers/hid/hid-input-quirks.c
@@ -16,9 +16,6 @@
 #include <linux/input.h>
 #include <linux/hid.h>
 
-#define map_rel(c)     hid_map_usage(hidinput, usage, bit, max, EV_REL, (c))
-#define map_key(c)     hid_map_usage(hidinput, usage, bit, max, EV_KEY, (c))
-
 #define map_key_clear(c)       hid_map_usage_clear(hidinput, usage, bit, \
                max, EV_KEY, (c))
 
@@ -132,37 +129,12 @@ static int quirk_cherry_genius_29e(struct hid_usage *usage,
        return 1;
 }
 
-static int quirk_btc_8193(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 0x230: map_key(BTN_MOUSE);                 break;
-               case 0x231: map_rel(REL_WHEEL);                 break;
-               /* 
-                * this keyboard has a scrollwheel implemented in
-                * totally broken way. We map this usage temporarily
-                * to HWHEEL and handle it in the event quirk handler
-                */
-               case 0x232: map_rel(REL_HWHEEL);                break;
-
-               default:
-                       return 0;
-       }
-       return 1;
-}
-
 #define VENDOR_ID_BELKIN                       0x1020
 #define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD     0x0006
 
 #define VENDOR_ID_CHICONY                      0x04f2
 #define DEVICE_ID_CHICONY_TACTICAL_PAD         0x0418
 
-#define VENDOR_ID_EZKEY                                0x0518
-#define DEVICE_ID_BTC_8193                     0x0002
-
 #define VENDOR_ID_GYRATION                     0x0c16
 #define DEVICE_ID_GYRATION_REMOTE              0x0002
 
@@ -182,8 +154,6 @@ static const struct hid_input_blacklist {
 
        { VENDOR_ID_CHICONY, DEVICE_ID_CHICONY_TACTICAL_PAD, quirk_chicony_tactical_pad },
 
-       { VENDOR_ID_EZKEY, DEVICE_ID_BTC_8193, quirk_btc_8193 },
-
        { VENDOR_ID_GYRATION, DEVICE_ID_GYRATION_REMOTE, quirk_gyration_remote },
 
        { VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
@@ -215,13 +185,6 @@ int hidinput_event_quirks(struct hid_device *hid, struct hid_field *field, struc
 
        input = field->hidinput->input;
 
-       /* handle the temporary quirky mapping to HWHEEL */
-       if (hid->quirks & HID_QUIRK_HWHEEL_WHEEL_INVERT &&
-                       usage->type == EV_REL && usage->code == REL_HWHEEL) {
-               input_event(input, usage->type, REL_WHEEL, -value);
-               return 1;
-       }
-
        /* Gyration MCE remote "Sleep" key */
        if (hid->vendor == VENDOR_ID_GYRATION &&
            hid->product == DEVICE_ID_GYRATION_REMOTE &&

diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 0cc6e4223cd107b106afa1ff4b8c0850beecbaf4..ddc16ea159a3435516c913a45bbd906e393953ad 100644 (file)
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -46,8 +46,6 @@ static const struct hid_blacklist {
        { 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_EZKEY, USB_DEVICE_ID_BTC_8193, HID_QUIRK_HWHEEL_WHEEL_INVERT },
-
        { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
        { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
 

diff --git a/include/linux/hid.h b/include/linux/hid.h
index d9ab4a3af431f0dc1c9ad5909cade7a42eb96094..298cbcce3a2d79dc53a3c1da25a47ae9e5255c90 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -266,7 +266,6 @@ struct hid_item {
 #define HID_QUIRK_RESET_LEDS                   0x00100000
 #define HID_QUIRK_HIDINPUT                     0x00200000
 #define HID_QUIRK_IGNORE_HIDINPUT              0x01000000
-#define HID_QUIRK_HWHEEL_WHEEL_INVERT          0x04000000
 #define HID_QUIRK_FULLSPEED_INTERVAL           0x10000000
 
 /*