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

Commit 3596bb92 authored by Keng-Yu Lin's avatar Keng-Yu Lin Committed by Jiri Kosina
Browse files

HID: add extra hotkeys in Asus AIO keyboards 



The Asus All-In-One PC has a wireless keyboard with wifi toggle,
brightness up, brightness down and display off hotkeys.

This patch adds suppoort for these hotkeys.

Signed-off-by: default avatarKeng-Yu Lin <kengyu@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f62f6191

drivers/hid/hid-chicony.c

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	case 0xff09: ch_map_key_clear(BTN_9);	break;

	case 0xff0a: ch_map_key_clear(BTN_A);	break;

	case 0xff0b: ch_map_key_clear(BTN_B);	break;

	case 0x00f1: ch_map_key_clear(KEY_WLAN);	break;

	case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);	break;

	case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);	break;

	case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF);	break;

	default:

		return 0;

	}
@@ -53,6 +57,7 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 


static const struct hid_device_id ch_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ch_devices);

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
#define USB_DEVICE_ID_CHICONY_TACTICAL_PAD	0x0418

#define USB_DEVICE_ID_CHICONY_MULTI_TOUCH	0xb19d

#define USB_DEVICE_ID_CHICONY_WIRELESS	0x0618

#define USB_DEVICE_ID_CHICONY_WIRELESS2	0x1123



#define USB_VENDOR_ID_CHUNGHWAT		0x2247

#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH	0x0001