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

Commit 6e7edabf authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: Microsoft Win8 Wireless Radio Controls cleanup 



Use a better URL for the HUTRR40 Radio HID Usages documentation and use the
HID_GD_WIRELESS_RADIO_CTLS define rather then hardcoding a check for
0x0001000c.

Fixes: 61df56be ("HID: Add mapping for Microsoft Win8 Wireless Radio Controls extensions")
Suggested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f1918be1

drivers/hid/hid-input.c

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 


		case HID_GD_RFKILL_BTN:

			/* MS wireless radio ctl extension, also check CA */

			if (field->application == 0x0001000c) {

			if (field->application == HID_GD_WIRELESS_RADIO_CTLS) {

				map_key_clear(KEY_RFKILL);

				/* We need to simulate the btn release */

				field->flags |= HID_MAIN_ITEM_RELATIVE;

include/linux/hid.h

+2 −3
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ struct hid_item { 
#define HID_GD_KEYPAD		0x00010007

#define HID_GD_MULTIAXIS	0x00010008

/*

 * Microsoft Win8 Wireless Radio Controls extensions CA, see (checked 09052017):

 * https://docs.microsoft.com/en-us/windows-hardware/drivers/hid/airplane-mode-radio-management

 * https://web.archive.org/web/20170509144631/https://docs.microsoft.com/en-us/windows-hardware/drivers/hid/airplane-mode-radio-management

 * Microsoft Win8 Wireless Radio Controls extensions CA, see:

 * http://www.usb.org/developers/hidpage/HUTRR40RadioHIDUsagesFinal.pdf

 */

#define HID_GD_WIRELESS_RADIO_CTLS	0x0001000c

#define HID_GD_X		0x00010030