[SCSI] u14-34f: Fix 32bit only problem
[safe/jmp/linux-2.6] / drivers / hid / hid-input.c
index 60de16a..c3eb3f1 100644 (file)
 #include <linux/hid.h>
 #include <linux/hid-debug.h>
 
-static int hid_pb_fnmode = 1;
-module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);
+static int hid_apple_fnmode = 1;
+module_param_named(pb_fnmode, hid_apple_fnmode, int, 0644);
 MODULE_PARM_DESC(pb_fnmode,
-               "Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");
+               "Mode of fn key on Apple keyboards (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");
 
 #define unk    KEY_UNKNOWN
 
@@ -53,7 +53,7 @@ static const unsigned char hid_keyboard[256] = {
        115,114,unk,unk,unk,121,unk, 89, 93,124, 92, 94, 95,unk,unk,unk,
        122,123, 90, 91, 85,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,
        unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,
-       unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,
+       unk,unk,unk,unk,unk,unk,179,180,unk,unk,unk,unk,unk,unk,unk,unk,
        unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,
        unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,unk,
         29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113,
@@ -94,20 +94,39 @@ struct hidinput_key_translation {
        u8 flags;
 };
 
-#define POWERBOOK_FLAG_FKEY 0x01
+#define APPLE_FLAG_FKEY 0x01
+
+static struct hidinput_key_translation apple_fn_keys[] = {
+       { KEY_BACKSPACE, KEY_DELETE },
+       { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
+       { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
+       { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
+       { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
+       { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
+       { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
+       { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
+       { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
+       { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
+       { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
+       { KEY_UP,       KEY_PAGEUP },
+       { KEY_DOWN,     KEY_PAGEDOWN },
+       { KEY_LEFT,     KEY_HOME },
+       { KEY_RIGHT,    KEY_END },
+       { }
+};
 
 static struct hidinput_key_translation powerbook_fn_keys[] = {
        { KEY_BACKSPACE, KEY_DELETE },
-       { KEY_F1,       KEY_BRIGHTNESSDOWN,     POWERBOOK_FLAG_FKEY },
-       { KEY_F2,       KEY_BRIGHTNESSUP,       POWERBOOK_FLAG_FKEY },
-       { KEY_F3,       KEY_MUTE,               POWERBOOK_FLAG_FKEY },
-       { KEY_F4,       KEY_VOLUMEDOWN,         POWERBOOK_FLAG_FKEY },
-       { KEY_F5,       KEY_VOLUMEUP,           POWERBOOK_FLAG_FKEY },
-       { KEY_F6,       KEY_NUMLOCK,            POWERBOOK_FLAG_FKEY },
-       { KEY_F7,       KEY_SWITCHVIDEOMODE,    POWERBOOK_FLAG_FKEY },
-       { KEY_F8,       KEY_KBDILLUMTOGGLE,     POWERBOOK_FLAG_FKEY },
-       { KEY_F9,       KEY_KBDILLUMDOWN,       POWERBOOK_FLAG_FKEY },
-       { KEY_F10,      KEY_KBDILLUMUP,         POWERBOOK_FLAG_FKEY },
+       { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
+       { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
+       { KEY_F3,       KEY_MUTE,               APPLE_FLAG_FKEY },
+       { KEY_F4,       KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
+       { KEY_F5,       KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+       { KEY_F6,       KEY_NUMLOCK,            APPLE_FLAG_FKEY },
+       { KEY_F7,       KEY_SWITCHVIDEOMODE,    APPLE_FLAG_FKEY },
+       { KEY_F8,       KEY_KBDILLUMTOGGLE,     APPLE_FLAG_FKEY },
+       { KEY_F9,       KEY_KBDILLUMDOWN,       APPLE_FLAG_FKEY },
+       { KEY_F10,      KEY_KBDILLUMUP,         APPLE_FLAG_FKEY },
        { KEY_UP,       KEY_PAGEUP },
        { KEY_DOWN,     KEY_PAGEDOWN },
        { KEY_LEFT,     KEY_HOME },
@@ -138,7 +157,7 @@ static struct hidinput_key_translation powerbook_numlock_keys[] = {
        { }
 };
 
-static struct hidinput_key_translation powerbook_iso_keyboard[] = {
+static struct hidinput_key_translation apple_iso_keyboard[] = {
        { KEY_GRAVE,    KEY_102ND },
        { KEY_102ND,    KEY_GRAVE },
        { }
@@ -156,39 +175,42 @@ static struct hidinput_key_translation *find_translation(struct hidinput_key_tra
        return NULL;
 }
 
-static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
+int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                struct hid_usage *usage, __s32 value)
 {
        struct hidinput_key_translation *trans;
 
        if (usage->code == KEY_FN) {
-               if (value) hid->quirks |=  HID_QUIRK_POWERBOOK_FN_ON;
-               else       hid->quirks &= ~HID_QUIRK_POWERBOOK_FN_ON;
+               if (value) hid->quirks |=  HID_QUIRK_APPLE_FN_ON;
+               else       hid->quirks &= ~HID_QUIRK_APPLE_FN_ON;
 
                input_event(input, usage->type, usage->code, value);
 
                return 1;
        }
 
-       if (hid_pb_fnmode) {
+       if (hid_apple_fnmode) {
                int do_translate;
 
-               trans = find_translation(powerbook_fn_keys, usage->code);
+               trans = find_translation((hid->product < 0x220 ||
+                                         hid->product >= 0x300) ?
+                                        powerbook_fn_keys : apple_fn_keys,
+                                        usage->code);
                if (trans) {
-                       if (test_bit(usage->code, hid->pb_pressed_fn))
+                       if (test_bit(usage->code, hid->apple_pressed_fn))
                                do_translate = 1;
-                       else if (trans->flags & POWERBOOK_FLAG_FKEY)
+                       else if (trans->flags & APPLE_FLAG_FKEY)
                                do_translate =
-                                       (hid_pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||
-                                       (hid_pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));
+                                       (hid_apple_fnmode == 2 &&  (hid->quirks & HID_QUIRK_APPLE_FN_ON)) ||
+                                       (hid_apple_fnmode == 1 && !(hid->quirks & HID_QUIRK_APPLE_FN_ON));
                        else
-                               do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON);
+                               do_translate = (hid->quirks & HID_QUIRK_APPLE_FN_ON);
 
                        if (do_translate) {
                                if (value)
-                                       set_bit(usage->code, hid->pb_pressed_fn);
+                                       set_bit(usage->code, hid->apple_pressed_fn);
                                else
-                                       clear_bit(usage->code, hid->pb_pressed_fn);
+                                       clear_bit(usage->code, hid->apple_pressed_fn);
 
                                input_event(input, usage->type, trans->to, value);
 
@@ -213,8 +235,8 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
                }
        }
 
-       if (hid->quirks & HID_QUIRK_POWERBOOK_ISO_KEYBOARD) {
-               trans = find_translation(powerbook_iso_keyboard, usage->code);
+       if (hid->quirks & HID_QUIRK_APPLE_ISO_KEYBOARD) {
+               trans = find_translation(apple_iso_keyboard, usage->code);
                if (trans) {
                        input_event(input, usage->type, trans->to, value);
                        return 1;
@@ -224,31 +246,35 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
        return 0;
 }
 
-static void hidinput_pb_setup(struct input_dev *input)
+static void hidinput_apple_setup(struct input_dev *input)
 {
        struct hidinput_key_translation *trans;
 
        set_bit(KEY_NUMLOCK, input->keybit);
 
        /* Enable all needed keys */
+       for (trans = apple_fn_keys; trans->from; trans++)
+               set_bit(trans->to, input->keybit);
+
        for (trans = powerbook_fn_keys; trans->from; trans++)
                set_bit(trans->to, input->keybit);
 
        for (trans = powerbook_numlock_keys; trans->from; trans++)
                set_bit(trans->to, input->keybit);
 
-       for (trans = powerbook_iso_keyboard; trans->from; trans++)
+       for (trans = apple_iso_keyboard; trans->from; trans++)
                set_bit(trans->to, input->keybit);
 
 }
 #else
-static inline int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,
-               struct hid_usage *usage, __s32 value)
+inline int hidinput_apple_event(struct hid_device *hid,
+                                      struct input_dev *input,
+                                      struct hid_usage *usage, __s32 value)
 {
        return 0;
 }
 
-static inline void hidinput_pb_setup(struct input_dev *input)
+static inline void hidinput_apple_setup(struct input_dev *input)
 {
 }
 #endif
@@ -293,9 +319,9 @@ static struct hid_usage *hidinput_find_key(struct hid_device *hid,
 static int hidinput_getkeycode(struct input_dev *dev, int scancode,
                                int *keycode)
 {
-       struct hid_device *hid = dev->private;
+       struct hid_device *hid = input_get_drvdata(dev);
        struct hid_usage *usage;
-       
+
        usage = hidinput_find_key(hid, scancode, 0);
        if (usage) {
                *keycode = usage->code;
@@ -307,31 +333,29 @@ static int hidinput_getkeycode(struct input_dev *dev, int scancode,
 static int hidinput_setkeycode(struct input_dev *dev, int scancode,
                                int keycode)
 {
-       struct hid_device *hid = dev->private;
+       struct hid_device *hid = input_get_drvdata(dev);
        struct hid_usage *usage;
        int old_keycode;
-       
+
        if (keycode < 0 || keycode > KEY_MAX)
                return -EINVAL;
-       
+
        usage = hidinput_find_key(hid, scancode, 0);
        if (usage) {
                old_keycode = usage->code;
                usage->code = keycode;
-               
+
                clear_bit(old_keycode, dev->keybit);
                set_bit(usage->code, dev->keybit);
-#ifdef CONFIG_HID_DEBUG
-               printk (KERN_DEBUG "Assigned keycode %d to HID usage code %x\n", keycode, scancode);
-#endif
+               dbg_hid(KERN_DEBUG "Assigned keycode %d to HID usage code %x\n", keycode, scancode);
                /* Set the keybit for the old keycode if the old keycode is used
                 * by another key */
                if (hidinput_find_key (hid, 0, old_keycode))
                        set_bit(old_keycode, dev->keybit);
-               
+
                return 0;
        }
-       
+
        return -EINVAL;
 }
 
@@ -341,20 +365,30 @@ 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;
 
-#ifdef CONFIG_HID_DEBUG
-       printk(KERN_DEBUG "Mapping: ");
+       dbg_hid("Mapping: ");
        hid_resolv_usage(usage->hid);
-       printk(" ---> ");
-#endif
+       dbg_hid_line(" ---> ");
 
        if (field->flags & HID_MAIN_ITEM_CONSTANT)
                goto ignore;
 
+       /* only LED usages are supported in output fields */
+       if (field->report_type == HID_OUTPUT_REPORT &&
+                       (usage->hid & HID_USAGE_PAGE) != HID_UP_LED) {
+               dbg_hid_line(" [non-LED output field] ");
+               goto ignore;
+       }
+
+       /* handle input mappings for quirky devices */
+       ret = hidinput_mapping_quirks(usage, input, &bit, &max);
+       if (ret)
+               goto mapped;
+
        switch (usage->hid & HID_USAGE_PAGE) {
 
                case HID_UP_UNDEFINED:
@@ -542,14 +576,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;
@@ -595,10 +621,7 @@ 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;
-
+                               case 0x182: map_key_clear(KEY_BOOKMARKS);       break;
                                case 0x183: map_key_clear(KEY_CONFIG);          break;
                                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
                                case 0x185: map_key_clear(KEY_EDITOR);          break;
@@ -615,9 +638,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x192: map_key_clear(KEY_CALC);            break;
                                case 0x194: map_key_clear(KEY_FILE);            break;
                                case 0x196: map_key_clear(KEY_WWW);             break;
+                               case 0x19c: map_key_clear(KEY_LOGOFF);          break;
                                case 0x19e: map_key_clear(KEY_COFFEE);          break;
                                case 0x1a6: map_key_clear(KEY_HELP);            break;
                                case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                               case 0x1ab: map_key_clear(KEY_SPELLCHECK);      break;
+                               case 0x1b6: map_key_clear(KEY_MEDIA);           break;
+                               case 0x1b7: map_key_clear(KEY_SOUND);           break;
                                case 0x1bc: map_key_clear(KEY_MESSENGER);       break;
                                case 0x1bd: map_key_clear(KEY_INFO);            break;
                                case 0x201: map_key_clear(KEY_NEW);             break;
@@ -653,51 +680,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;
@@ -724,36 +706,16 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
 
                case HID_UP_MSVENDOR:
 
-                       /* special case - Chicony Chicony KU-0418 tactical pad */
-                       if (device->vendor == 0x04f2 && device->product == 0x0418) {
-                               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;
-                               }
-                       } else {
-                               goto ignore;
-                       }
-                       break;
+                       goto ignore;
 
-               case HID_UP_CUSTOM: /* Reported on Logitech and Powerbook USB keyboards */
+               case HID_UP_CUSTOM: /* Reported on Logitech and Apple USB keyboards */
 
                        set_bit(EV_REP, input->evbit);
                        switch(usage->hid & HID_USAGE) {
                                case 0x003:
-                                       /* The fn key on Apple PowerBooks */
+                                       /* The fn key on Apple USB keyboards */
                                        map_key_clear(KEY_FN);
-                                       hidinput_pb_setup(input);
+                                       hidinput_apple_setup(input);
                                        break;
 
                                default:    goto ignore;
@@ -761,38 +723,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) {
@@ -819,6 +752,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);
@@ -828,9 +762,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        map_key(BTN_1);
        }
 
-       if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5)) &&
-                (usage->type == EV_REL) && (usage->code == REL_WHEEL))
-                       set_bit(REL_HWHEEL, bit);
+       if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5 |
+                       HID_QUIRK_2WHEEL_MOUSE_HACK_B8)) && (usage->type == EV_REL) &&
+                       (usage->code == REL_WHEEL))
+               set_bit(REL_HWHEEL, bit);
 
        if (((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
                || ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007)))
@@ -882,23 +817,36 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        field->dpad = usage->code;
        }
 
+       /* for those devices which produce Consumer volume usage as relative,
+        * we emulate pressing volumeup/volumedown appropriate number of times
+        * in hidinput_hid_event()
+        */
+       if ((usage->type == EV_ABS) && (field->flags & HID_MAIN_ITEM_RELATIVE) &&
+                       (usage->code == ABS_VOLUME)) {
+               set_bit(KEY_VOLUMEUP, input->keybit);
+               set_bit(KEY_VOLUMEDOWN, input->keybit);
+       }
+
+       if (usage->type == EV_KEY) {
+               set_bit(EV_MSC, input->evbit);
+               set_bit(MSC_SCAN, input->mscbit);
+       }
+
        hid_resolv_event(usage->type, usage->code);
-#ifdef CONFIG_HID_DEBUG
-       printk("\n");
-#endif
+
+       dbg_hid_line("\n");
+
        return;
 
 ignore:
-#ifdef CONFIG_HID_DEBUG
-       printk("IGNORED\n");
-#endif
+       dbg_hid_line("IGNORED\n");
        return;
 }
 
 void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
 {
        struct input_dev *input;
-       int *quirks = &hid->quirks;
+       unsigned *quirks = &hid->quirks;
 
        if (!field->hidinput)
                return;
@@ -908,24 +856,8 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
        if (!usage->type)
                return;
 
-       if (((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
-               || ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007))) {
-               if (value) hid->quirks |=  HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-               else       hid->quirks &= ~HID_QUIRK_2WHEEL_MOUSE_HACK_ON;
-               return;
-       }
-
-       if ((hid->quirks & HID_QUIRK_INVERT_HWHEEL) && (usage->code == REL_HWHEEL)) {
-               input_event(input, usage->type, usage->code, -value);
-               return;
-       }
-
-       if ((hid->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_ON) && (usage->code == REL_WHEEL)) {
-               input_event(input, usage->type, REL_HWHEEL, value);
-               return;
-       }
-
-       if ((hid->quirks & HID_QUIRK_POWERBOOK_HAS_FN) && hidinput_pb_event(hid, input, usage, value))
+       /* handle input events for quirky devices */
+       if (hidinput_event_quirks(hid, field, usage, value))
                return;
 
        if (usage->hat_min < usage->hat_max || usage->hat_dir) {
@@ -960,18 +892,37 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
        }
 
        if (usage->hid == (HID_UP_PID | 0x83UL)) { /* Simultaneous Effects Max */
-               dbg("Maximum Effects - %d",value);
+               dbg_hid("Maximum Effects - %d\n",value);
                return;
        }
 
        if (usage->hid == (HID_UP_PID | 0x7fUL)) {
-               dbg("PID Pool Report\n");
+               dbg_hid("PID Pool Report\n");
                return;
        }
 
        if ((usage->type == EV_KEY) && (usage->code == 0)) /* Key 0 is "unassigned", not KEY_UNKNOWN */
                return;
 
+       if ((usage->type == EV_ABS) && (field->flags & HID_MAIN_ITEM_RELATIVE) &&
+                       (usage->code == ABS_VOLUME)) {
+               int count = abs(value);
+               int direction = value > 0 ? KEY_VOLUMEUP : KEY_VOLUMEDOWN;
+               int i;
+
+               for (i = 0; i < count; i++) {
+                       input_event(input, EV_KEY, direction, 1);
+                       input_sync(input);
+                       input_event(input, EV_KEY, direction, 0);
+                       input_sync(input);
+               }
+               return;
+       }
+
+       /* report the usage code as scancode if the key status has changed */
+       if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value)
+               input_event(input, EV_MSC, MSC_SCAN, usage->hid);
+
        input_event(input, usage->type, usage->code, value);
 
        if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY))
@@ -1032,6 +983,9 @@ int hidinput_connect(struct hid_device *hid)
        int i, j, k;
        int max_report_type = HID_OUTPUT_REPORT;
 
+       if (hid->quirks & HID_QUIRK_IGNORE_HIDINPUT)
+               return -1;
+
        INIT_LIST_HEAD(&hid->inputs);
 
        for (i = 0; i < hid->maxcollection; i++)
@@ -1058,8 +1012,8 @@ int hidinput_connect(struct hid_device *hid)
                                if (!hidinput || !input_dev) {
                                        kfree(hidinput);
                                        input_free_device(input_dev);
-                                       err("Out of memory during hid input probe");
-                                       return -1;
+                                       err_hid("Out of memory during hid input probe");
+                                       goto out_unwind;
                                }
 
                                input_set_drvdata(input_dev, hid);
@@ -1093,15 +1047,25 @@ int hidinput_connect(struct hid_device *hid)
                                 * UGCI) cram a lot of unrelated inputs into the
                                 * same interface. */
                                hidinput->report = report;
-                               input_register_device(hidinput->input);
+                               if (input_register_device(hidinput->input))
+                                       goto out_cleanup;
                                hidinput = NULL;
                        }
                }
 
-       if (hidinput)
-               input_register_device(hidinput->input);
+       if (hidinput && input_register_device(hidinput->input))
+               goto out_cleanup;
 
        return 0;
+
+out_cleanup:
+       input_free_device(hidinput->input);
+       kfree(hidinput);
+out_unwind:
+       /* unwind the ones we already registered */
+       hidinput_disconnect(hid);
+
+       return -1;
 }
 EXPORT_SYMBOL_GPL(hidinput_connect);