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

Commit f974008f authored by Olivier Gay's avatar Olivier Gay Committed by Jiri Kosina
Browse files

HID: add keyboard input assist hid usages 

Add keyboard input assist controls usages from approved
hid usage table request HUTTR42:
http://www.usb.org/developers/hidpage/HUTRR42c.pdf



Signed-off-by: default avatarOlivier Gay <ogay@logitech.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 1af39588

drivers/hid/hid-debug.c

+6 −0
Original line number Diff line number Diff line
@@ -946,6 +946,12 @@ static const char *keys[KEY_MAX + 1] = { 
	[KEY_BRIGHTNESS_MIN] = "BrightnessMin",

	[KEY_BRIGHTNESS_MAX] = "BrightnessMax",

	[KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",

	[KEY_KBDINPUTASSIST_PREV] = "KbdInputAssistPrev",

	[KEY_KBDINPUTASSIST_NEXT] = "KbdInputAssistNext",

	[KEY_KBDINPUTASSIST_PREVGROUP] = "KbdInputAssistPrevGroup",

	[KEY_KBDINPUTASSIST_NEXTGROUP] = "KbdInputAssistNextGroup",

	[KEY_KBDINPUTASSIST_ACCEPT] = "KbdInputAssistAccept",

	[KEY_KBDINPUTASSIST_CANCEL] = "KbdInputAssistCancel",

};



static const char *relatives[REL_MAX + 1] = {

drivers/hid/hid-input.c

+7 −0
Original line number Diff line number Diff line
@@ -862,6 +862,13 @@ 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;



		case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);		break;

		case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);		break;

		case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);		break;

		case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP);		break;

		case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT);	break;

		case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL);	break;



		default:    goto ignore;

		}

		break;

include/uapi/linux/input.h

+7 −0
Original line number Diff line number Diff line
@@ -739,6 +739,13 @@ struct input_keymap_entry { 
#define KEY_BRIGHTNESS_MIN		0x250	/* Set Brightness to Minimum */

#define KEY_BRIGHTNESS_MAX		0x251	/* Set Brightness to Maximum */



#define KEY_KBDINPUTASSIST_PREV		0x260

#define KEY_KBDINPUTASSIST_NEXT		0x261

#define KEY_KBDINPUTASSIST_PREVGROUP		0x262

#define KEY_KBDINPUTASSIST_NEXTGROUP		0x263

#define KEY_KBDINPUTASSIST_ACCEPT		0x264

#define KEY_KBDINPUTASSIST_CANCEL		0x265



#define BTN_TRIGGER_HAPPY		0x2c0

#define BTN_TRIGGER_HAPPY1		0x2c0

#define BTN_TRIGGER_HAPPY2		0x2c1