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

Commit 90231e7e authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: move sunplus quirks 



Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 78a849a6

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -112,6 +112,13 @@ config HID_MICROSOFT 
	Support for some Microsoft devices which breaks less or more

	HID specification.



config HID_SUNPLUS

	tristate "Sunplus"

	default m

	depends on USB_HID

	---help---

	Support for Sunplus WDesktop input device.



endmenu



endif # HID_SUPPORT

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ endif 
obj-$(CONFIG_HID_APPLE)		+= hid-apple.o

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o



obj-$(CONFIG_USB_HID)		+= usbhid/

obj-$(CONFIG_USB_MOUSE)		+= usbhid/

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },

drivers/hid/hid-dummy.c

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ static int __init hid_dummy_init(void) 
#ifdef CONFIG_HID_MICROSOFT_MODULE

	HID_COMPAT_CALL_DRIVER(microsoft);

#endif

#ifdef CONFIG_HID_SUNPLUS_MODULE

	HID_COMPAT_CALL_DRIVER(sunplus);

#endif



	return -EIO;

}

drivers/hid/hid-input-quirks.c

+0 −20
Original line number Diff line number Diff line
@@ -170,21 +170,6 @@ static int quirk_btc_8193(struct hid_usage *usage, struct hid_input *hidinput, 
	return 1;

}



static int quirk_sunplus_wdesktop(struct hid_usage *usage,

		struct hid_input *hidinput, unsigned long **bit, int *max)

{

	if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)

		return 0;



	switch (usage->hid & HID_USAGE) {

		case 0x2003: map_key_clear(KEY_ZOOMIN);		break;

		case 0x2103: map_key_clear(KEY_ZOOMOUT);	break;

		default:

			return 0;

	}

	return 1;

}



#define VENDOR_ID_BELKIN			0x1020

#define DEVICE_ID_BELKIN_WIRELESS_KEYBOARD	0x0006
@@ -206,9 +191,6 @@ static int quirk_sunplus_wdesktop(struct hid_usage *usage, 
#define VENDOR_ID_PETALYNX			0x18b1

#define DEVICE_ID_PETALYNX_MAXTER_REMOTE	0x0037



#define VENDOR_ID_SUNPLUS			0x04fc

#define DEVICE_ID_SUNPLUS_WDESKTOP		0x05d8



static const struct hid_input_blacklist {

	__u16 idVendor;

	__u16 idProduct;
@@ -229,8 +211,6 @@ static const struct hid_input_blacklist { 


	{ VENDOR_ID_PETALYNX, DEVICE_ID_PETALYNX_MAXTER_REMOTE, quirk_petalynx_remote },



	{ VENDOR_ID_SUNPLUS, DEVICE_ID_SUNPLUS_WDESKTOP, quirk_sunplus_wdesktop },



	{ 0, 0, NULL }

};