]> err.no Git - linux-2.6/commitdiff
HID: refactor mapping to input subsystem for quirky devices
authorJiri Kosina <jkosina@suse.cz>
Thu, 22 Nov 2007 14:18:18 +0000 (15:18 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 28 Jan 2008 13:51:20 +0000 (14:51 +0100)
Currently, the handling of mapping between hid and input for devices
that don't conform to HUT 1.12 specification is very messy -- no per-device
handling, no blacklists, conditions on idVendor and idProduct placed
all over the code.

This patch moves all the device-specific input mapping to a separate
file, and introduces a blacklist-style handling for non-standard
device-specific mappings.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/Makefile
drivers/hid/hid-input-quirks.c [new file with mode: 0644]
drivers/hid/hid-input.c
include/linux/hid.h

index 1ac5103f7c93b151e47aca38a5431ce16234b8dc..275dc522c7389489583f7424fb75427d2a04867d 100644 (file)
@@ -1,7 +1,7 @@
 #
 # Makefile for the HID driver
 #
-hid-objs                       := hid-core.o hid-input.o
+hid-objs                       := hid-core.o hid-input.o hid-input-quirks.o
 
 obj-$(CONFIG_HID)              += hid.o
 
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c
new file mode 100644 (file)
index 0000000..e05e9ad
--- /dev/null
@@ -0,0 +1,326 @@
+/*
+ *  HID-input usage mapping quirks
+ *
+ *  This is used to handle HID-input mappings for devices violating
+ *  HUT 1.12 specification.
+ *
+ * Copyright (c) 2007 Jiri Kosina
+ */
+
+/*
+ * 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
+ */
+
+#include <linux/input.h>
+#include <linux/hid.h>
+
+#define map_abs(c)      do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; *max = ABS_MAX; } while (0)
+#define map_rel(c)      do { usage->code = c; usage->type = EV_REL; bit = input->relbit; *max = REL_MAX; } while (0)
+#define map_key(c)      do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; *max = KEY_MAX; } while (0)
+#define map_led(c)      do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; *max = LED_MAX; } while (0)
+
+#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, bit); } while (0)
+#define map_key_clear(c)        do { map_key(c); clear_bit(c, bit); } while (0)
+
+static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
+                             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_cherry_cymotion(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+               return 0;
+
+       switch (usage->hid & HID_USAGE) {
+               case 0x301: map_key_clear(KEY_PROG1);           break;
+               case 0x302: map_key_clear(KEY_PROG2);           break;
+               case 0x303: map_key_clear(KEY_PROG3);           break;
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
+               return 0;
+
+       set_bit(EV_REP, input->evbit);
+       switch(usage->hid & HID_USAGE) {
+               /* Reported on Logitech Ultra X Media Remote */
+               case 0x004: map_key_clear(KEY_AGAIN);           break;
+               case 0x00d: map_key_clear(KEY_HOME);            break;
+               case 0x024: map_key_clear(KEY_SHUFFLE);         break;
+               case 0x025: map_key_clear(KEY_TV);              break;
+               case 0x026: map_key_clear(KEY_MENU);            break;
+               case 0x031: map_key_clear(KEY_AUDIO);           break;
+               case 0x032: map_key_clear(KEY_TEXT);            break;
+               case 0x033: map_key_clear(KEY_LAST);            break;
+               case 0x047: map_key_clear(KEY_MP3);             break;
+               case 0x048: map_key_clear(KEY_DVD);             break;
+               case 0x049: map_key_clear(KEY_MEDIA);           break;
+               case 0x04a: map_key_clear(KEY_VIDEO);           break;
+               case 0x04b: map_key_clear(KEY_ANGLE);           break;
+               case 0x04c: map_key_clear(KEY_LANGUAGE);        break;
+               case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
+               case 0x051: map_key_clear(KEY_RED);             break;
+               case 0x052: map_key_clear(KEY_CLOSE);           break;
+
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+               return 0;
+
+       set_bit(EV_REP, input->evbit);
+       switch (usage->hid & HID_USAGE) {
+               case 0xff01: map_key_clear(BTN_1);              break;
+               case 0xff02: map_key_clear(BTN_2);              break;
+               case 0xff03: map_key_clear(BTN_3);              break;
+               case 0xff04: map_key_clear(BTN_4);              break;
+               case 0xff05: map_key_clear(BTN_5);              break;
+               case 0xff06: map_key_clear(BTN_6);              break;
+               case 0xff07: map_key_clear(BTN_7);              break;
+               case 0xff08: map_key_clear(BTN_8);              break;
+               case 0xff09: map_key_clear(BTN_9);              break;
+               case 0xff0a: map_key_clear(BTN_A);              break;
+               case 0xff0b: map_key_clear(BTN_B);              break;
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+               return 0;
+
+       switch(usage->hid & HID_USAGE) {
+               case 0xfd06: map_key_clear(KEY_CHAT);           break;
+               case 0xfd07: map_key_clear(KEY_PHONE);          break;
+               case 0xff05:
+                       set_bit(EV_REP, input->evbit);
+                       map_key_clear(KEY_F13);
+                       set_bit(KEY_F14, input->keybit);
+                       set_bit(KEY_F15, input->keybit);
+                       set_bit(KEY_F16, input->keybit);
+                       set_bit(KEY_F17, input->keybit);
+                       set_bit(KEY_F18, input->keybit);
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
+               return 0;
+
+       set_bit(EV_REP, input->evbit);
+       switch(usage->hid & HID_USAGE) {
+               case 0xfd08: map_key_clear(KEY_RIGHT);          break;
+               case 0xfd09: map_key_clear(KEY_LEFT);           break;
+               case 0xfd0b: map_key_clear(KEY_PAUSE);          break;
+               case 0xfd0f: map_key_clear(KEY_F5);             break;
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
+                       ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
+               return 0;
+
+       if ((usage->hid & HID_USAGE_PAGE) == HID_UP_LOGIVENDOR)
+               switch(usage->hid & HID_USAGE) {
+                       case 0x05a: map_key_clear(KEY_TEXT);            break;
+                       case 0x05b: map_key_clear(KEY_RED);             break;
+                       case 0x05c: map_key_clear(KEY_GREEN);           break;
+                       case 0x05d: map_key_clear(KEY_YELLOW);          break;
+                       case 0x05e: map_key_clear(KEY_BLUE);            break;
+                       default:
+                               return 0;
+               }
+
+       if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER)
+               switch(usage->hid & HID_USAGE) {
+                       case 0x0f6: map_key_clear(KEY_NEXT);            break;
+                       case 0x0fa: map_key_clear(KEY_BACK);            break;
+                       default:
+                               return 0;
+               }
+       return 1;
+}
+
+static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+               return 0;
+
+       switch (usage->hid & HID_USAGE) {
+               case 0x1001: map_key_clear(KEY_MESSENGER);      break;
+               case 0x1003: map_key_clear(KEY_SOUND);          break;
+               case 0x1004: map_key_clear(KEY_VIDEO);          break;
+               case 0x1005: map_key_clear(KEY_AUDIO);          break;
+               case 0x100a: map_key_clear(KEY_DOCUMENTS);      break;
+               case 0x1011: map_key_clear(KEY_PREVIOUSSONG);   break;
+               case 0x1012: map_key_clear(KEY_NEXTSONG);       break;
+               case 0x1013: map_key_clear(KEY_CAMERA);         break;
+               case 0x1014: map_key_clear(KEY_MESSENGER);      break;
+               case 0x1015: map_key_clear(KEY_RECORD);         break;
+               case 0x1016: map_key_clear(KEY_PLAYER);         break;
+               case 0x1017: map_key_clear(KEY_EJECTCD);        break;
+               case 0x1018: map_key_clear(KEY_MEDIA);          break;
+               case 0x1019: map_key_clear(KEY_PROG1);          break;
+               case 0x101a: map_key_clear(KEY_PROG2);          break;
+               case 0x101b: map_key_clear(KEY_PROG3);          break;
+               case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
+               case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
+               case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
+               case 0x1023: map_key_clear(KEY_CLOSE);          break;
+               case 0x1027: map_key_clear(KEY_MENU);           break;
+               /* this one is marked as 'Rotate' */
+               case 0x1028: map_key_clear(KEY_ANGLE);          break;
+               case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
+               case 0x102a: map_key_clear(KEY_BACK);           break;
+               case 0x102b: map_key_clear(KEY_CYCLEWINDOWS);   break;
+               case 0x1041: map_key_clear(KEY_BATTERY);        break;
+               case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
+               case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
+               case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
+               case 0x1045: map_key_clear(KEY_UNDO);           break;
+               case 0x1046: map_key_clear(KEY_REDO);           break;
+               case 0x1047: map_key_clear(KEY_PRINT);          break;
+               case 0x1048: map_key_clear(KEY_SAVE);           break;
+               case 0x1049: map_key_clear(KEY_PROG1);          break;
+               case 0x104a: map_key_clear(KEY_PROG2);          break;
+               case 0x104b: map_key_clear(KEY_PROG3);          break;
+               case 0x104c: map_key_clear(KEY_PROG4);          break;
+
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input,
+                             unsigned long *bit, int *max)
+{
+       if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
+               return 0;
+
+       switch (usage->hid & HID_USAGE) {
+               case 0x156: map_key_clear(KEY_WORDPROCESSOR);   break;
+               case 0x157: map_key_clear(KEY_SPREADSHEET);     break;
+               case 0x158: map_key_clear(KEY_PRESENTATION);    break;
+               case 0x15c: map_key_clear(KEY_STOP);            break;
+
+               default:
+                       return 0;
+       }
+       return 1;
+}
+
+
+#define VENDOR_ID_BELKIN                       0x1020
+#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD     0x0006
+
+#define VENDOR_ID_CHERRY                       0x046a
+#define DEVICE_ID_CHERRY_CYMOTION              0x0023
+
+#define VENDOR_ID_CHICONY                      0x04f2
+#define DEVICE_ID_CHICONY_TACTICAL_PAD         0x0418
+
+#define VENDOR_ID_LOGITECH                     0x046d
+#define DEVICE_ID_LOGITECH_RECEIVER            0xc101
+#define DEVICE_ID_S510_RECEIVER                        0xc50c
+#define DEVICE_ID_S510_RECEIVER_2              0xc517
+#define DEVICE_ID_MX3000_RECEIVER              0xc513
+
+#define VENDOR_ID_MICROSOFT                    0x045e
+#define DEVICE_ID_MS4K                         0x00db
+#define DEVICE_ID_MS6K                         0x00f9
+#define DEVICE_ID_MS_PRESENTER_8K              0x0713
+
+#define VENDOR_ID_MONTEREY                     0x0566
+#define DEVICE_ID_GENIUS_KB29E                 0x3004
+
+#define VENDOR_ID_PETALYNX                     0x18b1
+#define DEVICE_ID_PETALYNX_MAXTER_REMOTE       0x0037
+
+static const struct hid_input_blacklist {
+       __u16 idVendor;
+       __u16 idProduct;
+       int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long *, int *);
+} hid_input_blacklist[] = {
+       { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
+
+       { VENDOR_ID_CHERRY, DEVICE_ID_CHERRY_CYMOTION, quirk_cherry_cymotion },
+
+       { VENDOR_ID_CHICONY, DEVICE_ID_CHICONY_TACTICAL_PAD, quirk_chicony_tactical_pad },
+
+       { VENDOR_ID_LOGITECH, DEVICE_ID_LOGITECH_RECEIVER, quirk_logitech_ultrax_remote },
+       { VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER, quirk_logitech_wireless },
+       { VENDOR_ID_LOGITECH, DEVICE_ID_S510_RECEIVER_2, quirk_logitech_wireless },
+       { VENDOR_ID_LOGITECH, DEVICE_ID_MX3000_RECEIVER, quirk_logitech_wireless },
+
+       { VENDOR_ID_MICROSOFT, DEVICE_ID_MS4K, quirk_microsoft_ergonomy_kb },
+       { VENDOR_ID_MICROSOFT, DEVICE_ID_MS6K, quirk_microsoft_ergonomy_kb },
+       { VENDOR_ID_MICROSOFT, DEVICE_ID_MS_PRESENTER_8K, quirk_microsoft_presenter_8k },
+
+       { VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e },
+
+       { VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },
+       
+       { 0, 0, 0 }
+};
+
+int hidinput_mapping_quirks(struct hid_usage *usage, 
+                                  struct input_dev *input, 
+                                  unsigned long *bit, int *max)
+{
+       struct hid_device *device = input_get_drvdata(input);
+       int i = 0;
+       
+       while (hid_input_blacklist[i].quirk) {
+               if (hid_input_blacklist[i].idVendor == device->vendor &&
+                               hid_input_blacklist[i].idProduct == device->product)
+                       return hid_input_blacklist[i].quirk(usage, input, bit, max);
+               i++;
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(hidinput_mapping_quirks);
+
index 0da29cf437137edf46ed9953059403770268e5b9..3d448037c82fc9b4cc726c857e6cab7800793b97 100644 (file)
@@ -367,7 +367,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 {
        struct input_dev *input = hidinput->input;
        struct hid_device *device = input_get_drvdata(input);
-       int max = 0, code;
+       int max = 0, code, ret;
        unsigned long *bit = NULL;
 
        field->hidinput = hidinput;
@@ -386,6 +386,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                goto ignore;
        }
 
+       ret = hidinput_mapping_quirks(usage, input, bit, &max);
+       if (ret)
+               goto mapped;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 
                case HID_UP_UNDEFINED:
@@ -573,14 +577,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x000: goto ignore;
                                case 0x034: map_key_clear(KEY_SLEEP);           break;
                                case 0x036: map_key_clear(BTN_MISC);            break;
-                               /*
-                                * The next three are reported by Belkin wireless
-                                * keyboard (1020:0006). These values are "reserved"
-                                * in HUT 1.12.
-                                */
-                               case 0x03a: map_key_clear(KEY_SOUND);           break;
-                               case 0x03b: map_key_clear(KEY_CAMERA);          break;
-                               case 0x03c: map_key_clear(KEY_DOCUMENTS);       break;
 
                                case 0x040: map_key_clear(KEY_MENU);            break;
                                case 0x045: map_key_clear(KEY_RADIO);           break;
@@ -626,16 +622,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
                                case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
 
-                               /* reserved in HUT 1.12. Reported on Petalynx remote */
-                               case 0x0f6: map_key_clear(KEY_NEXT);            break;
-                               case 0x0fa: map_key_clear(KEY_BACK);            break;
-
-                               /* reserved in HUT 1.12. Reported on Genius KB29E */
-                               case 0x156: map_key_clear(KEY_WORDPROCESSOR);   break;
-                               case 0x157: map_key_clear(KEY_SPREADSHEET);     break;
-                               case 0x158: map_key_clear(KEY_PRESENTATION);    break;
-                               case 0x15c: map_key_clear(KEY_STOP);            break;
-
                                case 0x182: map_key_clear(KEY_BOOKMARKS);       break;
                                case 0x183: map_key_clear(KEY_CONFIG);          break;
                                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
@@ -695,51 +681,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
                                case 0x28c: map_key_clear(KEY_SEND);            break;
 
-                               /* Reported on a Cherry Cymotion keyboard */
-                               case 0x301: map_key_clear(KEY_PROG1);           break;
-                               case 0x302: map_key_clear(KEY_PROG2);           break;
-                               case 0x303: map_key_clear(KEY_PROG3);           break;
-
-                               /* Reported on certain Logitech wireless keyboards */
-                               case 0x1001: map_key_clear(KEY_MESSENGER);      break;
-                               case 0x1003: map_key_clear(KEY_SOUND);          break;
-                               case 0x1004: map_key_clear(KEY_VIDEO);          break;
-                               case 0x1005: map_key_clear(KEY_AUDIO);          break;
-                               case 0x100a: map_key_clear(KEY_DOCUMENTS);      break;
-                               case 0x1011: map_key_clear(KEY_PREVIOUSSONG);   break;
-                               case 0x1012: map_key_clear(KEY_NEXTSONG);       break;
-                               case 0x1013: map_key_clear(KEY_CAMERA);         break;
-                               case 0x1014: map_key_clear(KEY_MESSENGER);      break;
-                               case 0x1015: map_key_clear(KEY_RECORD);         break;
-                               case 0x1016: map_key_clear(KEY_PLAYER);         break;
-                               case 0x1017: map_key_clear(KEY_EJECTCD);        break;
-                               case 0x1018: map_key_clear(KEY_MEDIA);          break;
-                               case 0x1019: map_key_clear(KEY_PROG1);          break;
-                               case 0x101a: map_key_clear(KEY_PROG2);          break;
-                               case 0x101b: map_key_clear(KEY_PROG3);          break;
-                               case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
-                               case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
-                               case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
-                               case 0x1023: map_key_clear(KEY_CLOSE);          break;
-                               case 0x1027: map_key_clear(KEY_MENU);           break;
-                               /* this one is marked as 'Rotate' */
-                               case 0x1028: map_key_clear(KEY_ANGLE);          break;
-                               case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
-                               case 0x102a: map_key_clear(KEY_BACK);           break;
-                               case 0x102b: map_key_clear(KEY_CYCLEWINDOWS);   break;
-                               case 0x1041: map_key_clear(KEY_BATTERY);        break;
-                               case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
-                               case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
-                               case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
-                               case 0x1045: map_key_clear(KEY_UNDO);           break;
-                               case 0x1046: map_key_clear(KEY_REDO);           break;
-                               case 0x1047: map_key_clear(KEY_PRINT);          break;
-                               case 0x1048: map_key_clear(KEY_SAVE);           break;
-                               case 0x1049: map_key_clear(KEY_PROG1);          break;
-                               case 0x104a: map_key_clear(KEY_PROG2);          break;
-                               case 0x104b: map_key_clear(KEY_PROG3);          break;
-                               case 0x104c: map_key_clear(KEY_PROG4);          break;
-
                                default:    goto ignore;
                        }
                        break;
@@ -766,65 +707,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                case HID_UP_MSVENDOR:
 
-                       /* Unfortunately, there are multiple devices which
-                        * emit usages from MSVENDOR page that require different
-                        * handling. If this list grows too much in the future,
-                        * more general handling will have to be introduced here
-                        * (i.e. another blacklist).
-                        */
-
-                       /* Chicony Chicony KU-0418 tactical pad */
-                       if (IS_CHICONY_TACTICAL_PAD(device)) {
-                               set_bit(EV_REP, input->evbit);
-                               switch(usage->hid & HID_USAGE) {
-                                       case 0xff01: map_key_clear(BTN_1);              break;
-                                       case 0xff02: map_key_clear(BTN_2);              break;
-                                       case 0xff03: map_key_clear(BTN_3);              break;
-                                       case 0xff04: map_key_clear(BTN_4);              break;
-                                       case 0xff05: map_key_clear(BTN_5);              break;
-                                       case 0xff06: map_key_clear(BTN_6);              break;
-                                       case 0xff07: map_key_clear(BTN_7);              break;
-                                       case 0xff08: map_key_clear(BTN_8);              break;
-                                       case 0xff09: map_key_clear(BTN_9);              break;
-                                       case 0xff0a: map_key_clear(BTN_A);              break;
-                                       case 0xff0b: map_key_clear(BTN_B);              break;
-                                       default:    goto ignore;
-                               }
-
-                       /* Microsoft Natural Ergonomic Keyboard 4000 */
-                       } else if (IS_MS_KB(device)) {
-                               switch(usage->hid & HID_USAGE) {
-                                       case 0xfd06:
-                                               map_key_clear(KEY_CHAT);
-                                               break;
-                                       case 0xfd07:
-                                               map_key_clear(KEY_PHONE);
-                                               break;
-                                       case 0xff05:
-                                               set_bit(EV_REP, input->evbit);
-                                               map_key_clear(KEY_F13);
-                                               set_bit(KEY_F14, input->keybit);
-                                               set_bit(KEY_F15, input->keybit);
-                                               set_bit(KEY_F16, input->keybit);
-                                               set_bit(KEY_F17, input->keybit);
-                                               set_bit(KEY_F18, input->keybit);
-                                       default:        goto ignore;
-                               }
-
-                       /* Microsoft Wireless Notebook Presenter Mouse 8000 */
-                       } else if (IS_MS_PRESENTER_8000(device)) {
-                               set_bit(EV_REP, input->evbit);
-                               switch(usage->hid & HID_USAGE) {
-                                       /* Useful mappings of bottom-side keys for presentations */
-                                       case 0xfd08: map_key_clear(KEY_RIGHT);          break;
-                                       case 0xfd09: map_key_clear(KEY_LEFT);           break;
-                                       case 0xfd0b: map_key_clear(KEY_PAUSE);          break;
-                                       case 0xfd0f: map_key_clear(KEY_F5);             break;
-                                       default:    goto ignore;
-                               }
-                       } else
-                               goto ignore;
-                       break;
+                       goto ignore;
 
                case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */
 
@@ -841,38 +724,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        break;
 
                case HID_UP_LOGIVENDOR:
-                       set_bit(EV_REP, input->evbit);
-                       switch(usage->hid & HID_USAGE) {
-                               /* Reported on Logitech Ultra X Media Remote */
-                               case 0x004: map_key_clear(KEY_AGAIN);           break;
-                               case 0x00d: map_key_clear(KEY_HOME);            break;
-                               case 0x024: map_key_clear(KEY_SHUFFLE);         break;
-                               case 0x025: map_key_clear(KEY_TV);              break;
-                               case 0x026: map_key_clear(KEY_MENU);            break;
-                               case 0x031: map_key_clear(KEY_AUDIO);           break;
-                               case 0x032: map_key_clear(KEY_TEXT);            break;
-                               case 0x033: map_key_clear(KEY_LAST);            break;
-                               case 0x047: map_key_clear(KEY_MP3);             break;
-                               case 0x048: map_key_clear(KEY_DVD);             break;
-                               case 0x049: map_key_clear(KEY_MEDIA);           break;
-                               case 0x04a: map_key_clear(KEY_VIDEO);           break;
-                               case 0x04b: map_key_clear(KEY_ANGLE);           break;
-                               case 0x04c: map_key_clear(KEY_LANGUAGE);        break;
-                               case 0x04d: map_key_clear(KEY_SUBTITLE);        break;
-                               case 0x051: map_key_clear(KEY_RED);             break;
-                               case 0x052: map_key_clear(KEY_CLOSE);           break;
-
-                               /* Reported on Petalynx Maxter remote */
-                               case 0x05a: map_key_clear(KEY_TEXT);            break;
-                               case 0x05b: map_key_clear(KEY_RED);             break;
-                               case 0x05c: map_key_clear(KEY_GREEN);           break;
-                               case 0x05d: map_key_clear(KEY_YELLOW);          break;
-                               case 0x05e: map_key_clear(KEY_BLUE);            break;
-
-                               default:    goto ignore;
-                       }
-                       break;
 
+                       goto ignore;
+               
                case HID_UP_PID:
 
                        switch(usage->hid & HID_USAGE) {
@@ -899,6 +753,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        break;
        }
 
+mapped:
        if (device->quirks & HID_QUIRK_MIGHTYMOUSE) {
                if (usage->hid == HID_GD_Z)
                        map_rel(REL_HWHEEL);
index c67eeb51604005143b6ffbc4c129991b0dba08cc..cd5d562b1b7c9aa8ff64a0d721303280d5418921 100644 (file)
@@ -524,6 +524,7 @@ extern void hidinput_disconnect(struct hid_device *);
 int hid_set_field(struct hid_field *, unsigned, __s32);
 int hid_input_report(struct hid_device *, int type, u8 *, int, int);
 int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
+int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long *, int *);
 void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);
 void hid_output_report(struct hid_report *report, __u8 *data);
 void hid_free_device(struct hid_device *device);