Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2380854 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  [PATCH] Generic HID layer - update MAINTAINERS
  input/hid: Supporting more keys from the HUT Consumer Page
  [PATCH] Generic HID layer - build: USB_HID should select HID
parents a240d9f1 4ef4caad

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,12 @@ L: linux-nvidia@lists.surfsouth.com 
W:	http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml

S:	Maintained



HID CORE LAYER

P:	Jiri Kosina

M:	jkosina@suse.cz

L:	linux-input@atrey.karlin.mff.cuni.cz

S:	Maintained



HIGH-SPEED SCC DRIVER FOR AX.25

P:	Klaus Kudielka

M:	klaus.kudielka@ieee.org

drivers/hid/hid-input.c

+44 −0
Original line number Diff line number Diff line
@@ -415,12 +415,31 @@ 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;

				case 0x040: map_key_clear(KEY_MENU);		break;

				case 0x045: map_key_clear(KEY_RADIO);		break;



				case 0x088: map_key_clear(KEY_PC);		break;

				case 0x089: map_key_clear(KEY_TV);		break;

				case 0x08a: map_key_clear(KEY_WWW);		break;

				case 0x08b: map_key_clear(KEY_DVD);		break;

				case 0x08c: map_key_clear(KEY_PHONE);		break;

				case 0x08d: map_key_clear(KEY_PROGRAM);		break;

				case 0x08e: map_key_clear(KEY_VIDEOPHONE);	break;

				case 0x08f: map_key_clear(KEY_GAMES);		break;

				case 0x090: map_key_clear(KEY_MEMO);		break;

				case 0x091: map_key_clear(KEY_CD);		break;

				case 0x092: map_key_clear(KEY_VCR);		break;

				case 0x093: map_key_clear(KEY_TUNER);		break;

				case 0x094: map_key_clear(KEY_EXIT);		break;

				case 0x095: map_key_clear(KEY_HELP);		break;

				case 0x096: map_key_clear(KEY_TAPE);		break;

				case 0x097: map_key_clear(KEY_TV2);		break;

				case 0x098: map_key_clear(KEY_SAT);		break;



				case 0x09c: map_key_clear(KEY_CHANNELUP);	break;

				case 0x09d: map_key_clear(KEY_CHANNELDOWN);	break;

				case 0x0a0: map_key_clear(KEY_VCR2);		break;



				case 0x0b0: map_key_clear(KEY_PLAY);		break;

				case 0x0b1: map_key_clear(KEY_PAUSE);		break;

				case 0x0b2: map_key_clear(KEY_RECORD);		break;
@@ -430,6 +449,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
				case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);	break;

				case 0x0b7: map_key_clear(KEY_STOPCD);		break;

				case 0x0b8: map_key_clear(KEY_EJECTCD);		break;



				case 0x0cd: map_key_clear(KEY_PLAYPAUSE);	break;

			        case 0x0e0: map_abs_clear(ABS_VOLUME);		break;

				case 0x0e2: map_key_clear(KEY_MUTE);		break;
@@ -437,11 +457,30 @@ 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;

				case 0x183: map_key_clear(KEY_CONFIG);		break;

				case 0x184: map_key_clear(KEY_WORDPROCESSOR);	break;

				case 0x185: map_key_clear(KEY_EDITOR);		break;

				case 0x186: map_key_clear(KEY_SPREADSHEET);	break;

				case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);	break;

				case 0x188: map_key_clear(KEY_PRESENTATION);	break;

				case 0x189: map_key_clear(KEY_DATABASE);	break;

				case 0x18a: map_key_clear(KEY_MAIL);		break;

				case 0x18b: map_key_clear(KEY_NEWS);		break;

				case 0x18c: map_key_clear(KEY_VOICEMAIL);	break;

				case 0x18d: map_key_clear(KEY_ADDRESSBOOK);	break;

				case 0x18e: map_key_clear(KEY_CALENDAR);	break;

				case 0x191: map_key_clear(KEY_FINANCE);		break;

				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 0x19e: map_key_clear(KEY_COFFEE);		break;

				case 0x1a6: map_key_clear(KEY_HELP);		break;

				case 0x1a7: map_key_clear(KEY_DOCUMENTS);	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;

				case 0x202: map_key_clear(KEY_OPEN);		break;

				case 0x203: map_key_clear(KEY_CLOSE);		break;

				case 0x204: map_key_clear(KEY_EXIT);		break;

				case 0x207: map_key_clear(KEY_SAVE);		break;

				case 0x208: map_key_clear(KEY_PRINT);		break;

				case 0x209: map_key_clear(KEY_PROPS);		break;
@@ -456,10 +495,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
				case 0x226: map_key_clear(KEY_STOP);		break;

				case 0x227: map_key_clear(KEY_REFRESH);		break;

				case 0x22a: map_key_clear(KEY_BOOKMARKS);	break;

				case 0x22d: map_key_clear(KEY_ZOOMIN);		break;

				case 0x22e: map_key_clear(KEY_ZOOMOUT);		break;

				case 0x22f: map_key_clear(KEY_ZOOMRESET);	break;

				case 0x233: map_key_clear(KEY_SCROLLUP);	break;

				case 0x234: map_key_clear(KEY_SCROLLDOWN);	break;

				case 0x238: map_rel(REL_HWHEEL);		break;

				case 0x25f: map_key_clear(KEY_CANCEL);		break;

				case 0x279: map_key_clear(KEY_REDO);		break;



				case 0x289: map_key_clear(KEY_REPLY);		break;

				case 0x28b: map_key_clear(KEY_FORWARDMAIL);	break;

				case 0x28c: map_key_clear(KEY_SEND);		break;

drivers/usb/input/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ comment "USB Input Devices" 
config USB_HID

	tristate "USB Human Interface Device (full HID) support"

	default y

	depends on USB && HID

	depends on USB

	select HID

	---help---

	  Say Y here if you want full HID support to connect USB keyboards,

	  mice, joysticks, graphic tablets, or any other HID based devices

include/linux/input.h

+15 −0
Original line number Diff line number Diff line
@@ -491,6 +491,21 @@ struct input_absinfo { 
#define KEY_DIGITS		0x19d

#define KEY_TEEN		0x19e

#define KEY_TWEN		0x19f

#define KEY_VIDEOPHONE		0x1a0

#define KEY_GAMES		0x1a1

#define KEY_ZOOMIN		0x1a2

#define KEY_ZOOMOUT		0x1a3

#define KEY_ZOOMRESET		0x1a4

#define KEY_WORDPROCESSOR	0x1a5

#define KEY_EDITOR		0x1a6

#define KEY_SPREADSHEET		0x1a7

#define KEY_GRAPHICSEDITOR	0x1a8

#define KEY_PRESENTATION	0x1a9

#define KEY_DATABASE		0x1aa

#define KEY_NEWS		0x1ab

#define KEY_VOICEMAIL		0x1ac

#define KEY_ADDRESSBOOK		0x1ad

#define KEY_MESSENGER		0x1ae



#define KEY_DEL_EOL		0x1c0

#define KEY_DEL_EOS		0x1c1