aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorOlivier Gay <ogay@logitech.com>2014-04-25 14:26:44 -0400
committerJiri Kosina <jkosina@suse.cz>2014-04-28 10:57:58 -0400
commitf362e690e5530dd8ace289da991bda558731678e (patch)
tree3290585c9b7314751fd1ad5df108bbc357ede5d4 /drivers/hid/hid-input.c
parentb81fd5ba6002306f0c2bf82514b2eeae6ee2bf32 (diff)
HID: add missing hid usages
Add some missing hid usages from consumer page, add some display brightness control usages from approved hid usage table request HUTTR41: http://www.usb.org/developers/hidpage/HUTRR41.pdf and add voice command usage from approved request HUTTR45: http://www.usb.org/developers/hidpage/Voice_Command_Usage.pdf [jkosina@suse.cz: removed KEY_BRIGHTNESS_TOGGLE / KEY_DISPLAYTOGGLE conflict from hid-debug.c] Signed-off-by: Olivier Gay <ogay@logitech.com> Signed-off-by: Mathieu Meisser <mmeisser@logitech.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index e7e8b19a9284..9f2076acffb1 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -721,6 +721,13 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
721 case 0x06c: map_key_clear(KEY_YELLOW); break; 721 case 0x06c: map_key_clear(KEY_YELLOW); break;
722 case 0x06d: map_key_clear(KEY_ZOOM); break; 722 case 0x06d: map_key_clear(KEY_ZOOM); break;
723 723
724 case 0x06f: map_key_clear(KEY_BRIGHTNESSUP); break;
725 case 0x070: map_key_clear(KEY_BRIGHTNESSDOWN); break;
726 case 0x072: map_key_clear(KEY_BRIGHTNESS_TOGGLE); break;
727 case 0x073: map_key_clear(KEY_BRIGHTNESS_MIN); break;
728 case 0x074: map_key_clear(KEY_BRIGHTNESS_MAX); break;
729 case 0x075: map_key_clear(KEY_BRIGHTNESS_AUTO); break;
730
724 case 0x082: map_key_clear(KEY_VIDEO_NEXT); break; 731 case 0x082: map_key_clear(KEY_VIDEO_NEXT); break;
725 case 0x083: map_key_clear(KEY_LAST); break; 732 case 0x083: map_key_clear(KEY_LAST); break;
726 case 0x084: map_key_clear(KEY_ENTER); break; 733 case 0x084: map_key_clear(KEY_ENTER); break;
@@ -761,6 +768,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
761 case 0x0bf: map_key_clear(KEY_SLOW); break; 768 case 0x0bf: map_key_clear(KEY_SLOW); break;
762 769
763 case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break; 770 case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break;
771 case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break;
764 case 0x0e0: map_abs_clear(ABS_VOLUME); break; 772 case 0x0e0: map_abs_clear(ABS_VOLUME); break;
765 case 0x0e2: map_key_clear(KEY_MUTE); break; 773 case 0x0e2: map_key_clear(KEY_MUTE); break;
766 case 0x0e5: map_key_clear(KEY_BASSBOOST); break; 774 case 0x0e5: map_key_clear(KEY_BASSBOOST); break;
@@ -768,6 +776,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
768 case 0x0ea: map_key_clear(KEY_VOLUMEDOWN); break; 776 case 0x0ea: map_key_clear(KEY_VOLUMEDOWN); break;
769 case 0x0f5: map_key_clear(KEY_SLOW); break; 777 case 0x0f5: map_key_clear(KEY_SLOW); break;
770 778
779 case 0x181: map_key_clear(KEY_BUTTONCONFIG); break;
771 case 0x182: map_key_clear(KEY_BOOKMARKS); break; 780 case 0x182: map_key_clear(KEY_BOOKMARKS); break;
772 case 0x183: map_key_clear(KEY_CONFIG); break; 781 case 0x183: map_key_clear(KEY_CONFIG); break;
773 case 0x184: map_key_clear(KEY_WORDPROCESSOR); break; 782 case 0x184: map_key_clear(KEY_WORDPROCESSOR); break;
@@ -781,6 +790,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
781 case 0x18c: map_key_clear(KEY_VOICEMAIL); break; 790 case 0x18c: map_key_clear(KEY_VOICEMAIL); break;
782 case 0x18d: map_key_clear(KEY_ADDRESSBOOK); break; 791 case 0x18d: map_key_clear(KEY_ADDRESSBOOK); break;
783 case 0x18e: map_key_clear(KEY_CALENDAR); break; 792 case 0x18e: map_key_clear(KEY_CALENDAR); break;
793 case 0x18f: map_key_clear(KEY_TASKMANAGER); break;
794 case 0x190: map_key_clear(KEY_JOURNAL); break;
784 case 0x191: map_key_clear(KEY_FINANCE); break; 795 case 0x191: map_key_clear(KEY_FINANCE); break;
785 case 0x192: map_key_clear(KEY_CALC); break; 796 case 0x192: map_key_clear(KEY_CALC); break;
786 case 0x193: map_key_clear(KEY_PLAYER); break; 797 case 0x193: map_key_clear(KEY_PLAYER); break;
@@ -789,12 +800,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
789 case 0x199: map_key_clear(KEY_CHAT); break; 800 case 0x199: map_key_clear(KEY_CHAT); break;
790 case 0x19c: map_key_clear(KEY_LOGOFF); break; 801 case 0x19c: map_key_clear(KEY_LOGOFF); break;
791 case 0x19e: map_key_clear(KEY_COFFEE); break; 802 case 0x19e: map_key_clear(KEY_COFFEE); break;
803 case 0x19f: map_key_clear(KEY_CONTROLPANEL); break;
804 case 0x1a2: map_key_clear(KEY_APPSELECT); break;
792 case 0x1a3: map_key_clear(KEY_NEXT); break; 805 case 0x1a3: map_key_clear(KEY_NEXT); break;
793 case 0x1a4: map_key_clear(KEY_PREVIOUS); break; 806 case 0x1a4: map_key_clear(KEY_PREVIOUS); break;
794 case 0x1a6: map_key_clear(KEY_HELP); break; 807 case 0x1a6: map_key_clear(KEY_HELP); break;
795 case 0x1a7: map_key_clear(KEY_DOCUMENTS); break; 808 case 0x1a7: map_key_clear(KEY_DOCUMENTS); break;
796 case 0x1ab: map_key_clear(KEY_SPELLCHECK); break; 809 case 0x1ab: map_key_clear(KEY_SPELLCHECK); break;
797 case 0x1ae: map_key_clear(KEY_KEYBOARD); break; 810 case 0x1ae: map_key_clear(KEY_KEYBOARD); break;
811 case 0x1b1: map_key_clear(KEY_SCREENSAVER); break;
798 case 0x1b4: map_key_clear(KEY_FILE); break; 812 case 0x1b4: map_key_clear(KEY_FILE); break;
799 case 0x1b6: map_key_clear(KEY_IMAGES); break; 813 case 0x1b6: map_key_clear(KEY_IMAGES); break;
800 case 0x1b7: map_key_clear(KEY_AUDIO); break; 814 case 0x1b7: map_key_clear(KEY_AUDIO); break;