Merge branch 'for-5.1/hid-uclogic' into for-linus (487b6d0c) · Commits · 戴 / test

drivers/hid/Kconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -412,6 +412,12 @@ config HID_WALTOP
		---help---
		Support for Waltop tablets.

		config HID_VIEWSONIC
		tristate "ViewSonic/Signotec"
		depends on HID
		help
		Support for ViewSonic/Signotec PD1011 signature pad.

		config HID_GYRATION
		tristate "Gyration remote control"
		depends on HID

drivers/hid/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -109,12 +109,16 @@ obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
		obj-$(CONFIG_HID_TIVO) += hid-tivo.o
		obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
		obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o
		hid-uclogic-objs := hid-uclogic-core.o \
		hid-uclogic-rdesc.o \
		hid-uclogic-params.o
		obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o
		obj-$(CONFIG_HID_UDRAW_PS3) += hid-udraw-ps3.o
		obj-$(CONFIG_HID_LED) += hid-led.o
		obj-$(CONFIG_HID_XINMO) += hid-xinmo.o
		obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
		obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
		obj-$(CONFIG_HID_VIEWSONIC) += hid-viewsonic.o

		wacom-objs := wacom_wac.o wacom_sys.o
		obj-$(CONFIG_HID_WACOM) += wacom.o

drivers/hid/hid-ids.h

+14 −2

Original line number	Diff line number	Diff line
		@@ -663,6 +663,7 @@
		#define USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2 0x501a
		#define USB_DEVICE_ID_KYE_EASYPEN_M610X 0x5013
		#define USB_DEVICE_ID_KYE_PENSKETCH_M912 0x5015
		#define USB_DEVICE_ID_KYE_EASYPEN_M406XE 0x5019

		#define USB_VENDOR_ID_LABTEC 0x1020
		#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006
		@@ -1138,11 +1139,16 @@
		#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522
		#define USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60 0x0781
		#define USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3 0x3031
		#define USB_DEVICE_ID_UGEE_TABLET_81 0x0081
		#define USB_DEVICE_ID_UGEE_TABLET_45 0x0045
		#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_81 0x0081
		#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_45 0x0045
		#define USB_DEVICE_ID_UCLOGIC_UGEE_TABLET_47 0x0047
		#define USB_DEVICE_ID_YIYNOVA_TABLET 0x004d

		#define USB_VENDOR_ID_UGEE 0x28bd
		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540 0x0075
		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640 0x0094
		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
		#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
		#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071

		#define USB_VENDOR_ID_UNITEC 0x227d
		@@ -1244,4 +1250,10 @@
		#define USB_VENDOR_ID_UGTIZER 0x2179
		#define USB_DEVICE_ID_UGTIZER_TABLET_GP0610 0x0053

		#define USB_VENDOR_ID_VIEWSONIC 0x0543
		#define USB_DEVICE_ID_VIEWSONIC_PD1011 0xe621

		#define USB_VENDOR_ID_SIGNOTEC 0x2133
		#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018

		#endif

drivers/hid/hid-kye.c

+83 −0

Original line number	Diff line number	Diff line
		@@ -483,6 +483,80 @@ static __u8 pensketch_m912_rdesc_fixed[] = {
		0xC0 /* End Collection */
		};

		/* Original EasyPen M406XE report descriptor size */
		#define EASYPEN_M406XE_RDESC_ORIG_SIZE 476

		/* Fixed EasyPen M406XE report descriptor */
		static __u8 easypen_m406xe_rdesc_fixed[] = {
		0x05, 0x01, /* Usage Page (Desktop), */
		0x09, 0x01, /* Usage (01h), */
		0xA1, 0x01, /* Collection (Application), */
		0x85, 0x05, /* Report ID (5), */
		0x09, 0x01, /* Usage (01h), */
		0x15, 0x80, /* Logical Minimum (-128), */
		0x25, 0x7F, /* Logical Maximum (127), */
		0x75, 0x08, /* Report Size (8), */
		0x95, 0x07, /* Report Count (7), */
		0xB1, 0x02, /* Feature (Variable), */
		0xC0, /* End Collection, */
		0x05, 0x0D, /* Usage Page (Digitizer), */
		0x09, 0x02, /* Usage (Pen), */
		0xA1, 0x01, /* Collection (Application), */
		0x85, 0x10, /* Report ID (16), */
		0x09, 0x20, /* Usage (Stylus), */
		0xA0, /* Collection (Physical), */
		0x14, /* Logical Minimum (0), */
		0x25, 0x01, /* Logical Maximum (1), */
		0x75, 0x01, /* Report Size (1), */
		0x09, 0x42, /* Usage (Tip Switch), */
		0x09, 0x44, /* Usage (Barrel Switch), */
		0x09, 0x46, /* Usage (Tablet Pick), */
		0x95, 0x03, /* Report Count (3), */
		0x81, 0x02, /* Input (Variable), */
		0x95, 0x04, /* Report Count (4), */
		0x81, 0x03, /* Input (Constant, Variable), */
		0x09, 0x32, /* Usage (In Range), */
		0x95, 0x01, /* Report Count (1), */
		0x81, 0x02, /* Input (Variable), */
		0x75, 0x10, /* Report Size (16), */
		0x95, 0x01, /* Report Count (1), */
		0xA4, /* Push, */
		0x05, 0x01, /* Usage Page (Desktop), */
		0x55, 0xFD, /* Unit Exponent (-3), */
		0x65, 0x13, /* Unit (Inch), */
		0x34, /* Physical Minimum (0), */
		0x09, 0x30, /* Usage (X), */
		0x46, 0x70, 0x17, /* Physical Maximum (6000), */
		0x26, 0x00, 0x3C, /* Logical Maximum (15360), */
		0x81, 0x02, /* Input (Variable), */
		0x09, 0x31, /* Usage (Y), */
		0x46, 0xA0, 0x0F, /* Physical Maximum (4000), */
		0x26, 0x00, 0x28, /* Logical Maximum (10240), */
		0x81, 0x02, /* Input (Variable), */
		0xB4, /* Pop, */
		0x09, 0x30, /* Usage (Tip Pressure), */
		0x26, 0xFF, 0x03, /* Logical Maximum (1023), */
		0x81, 0x02, /* Input (Variable), */
		0xC0, /* End Collection, */
		0xC0, /* End Collection */
		0x05, 0x0C, /* Usage Page (Consumer), */
		0x09, 0x01, /* Usage (Consumer Control), */
		0xA1, 0x01, /* Collection (Application), */
		0x85, 0x12, /* Report ID (18), */
		0x14, /* Logical Minimum (0), */
		0x25, 0x01, /* Logical Maximum (1), */
		0x75, 0x01, /* Report Size (1), */
		0x95, 0x04, /* Report Count (4), */
		0x0A, 0x79, 0x02, /* Usage (AC Redo Or Repeat), */
		0x0A, 0x1A, 0x02, /* Usage (AC Undo), */
		0x0A, 0x2D, 0x02, /* Usage (AC Zoom In), */
		0x0A, 0x2E, 0x02, /* Usage (AC Zoom Out), */
		0x81, 0x02, /* Input (Variable), */
		0x95, 0x34, /* Report Count (52), */
		0x81, 0x03, /* Input (Constant, Variable), */
		0xC0 /* End Collection */
		};

		static __u8 kye_consumer_control_fixup(struct hid_device hdev, __u8 *rdesc,
		unsigned int rsize, int offset, const char device_name) {
		/*
		@@ -555,6 +629,12 @@ static __u8 kye_report_fixup(struct hid_device hdev, __u8 *rdesc,
		*rsize = sizeof(easypen_m610x_rdesc_fixed);
		}
		break;
		case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
		if (*rsize == EASYPEN_M406XE_RDESC_ORIG_SIZE) {
		rdesc = easypen_m406xe_rdesc_fixed;
		*rsize = sizeof(easypen_m406xe_rdesc_fixed);
		}
		break;
		case USB_DEVICE_ID_KYE_PENSKETCH_M912:
		if (*rsize == PENSKETCH_M912_RDESC_ORIG_SIZE) {
		rdesc = pensketch_m912_rdesc_fixed;
		@@ -644,6 +724,7 @@ static int kye_probe(struct hid_device hdev, const struct hid_device_id id)
		case USB_DEVICE_ID_KYE_MOUSEPEN_I608X:
		case USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2:
		case USB_DEVICE_ID_KYE_EASYPEN_M610X:
		case USB_DEVICE_ID_KYE_EASYPEN_M406XE:
		case USB_DEVICE_ID_KYE_PENSKETCH_M912:
		ret = kye_tablet_enable(hdev);
		if (ret) {
		@@ -678,6 +759,8 @@ static const struct hid_device_id kye_devices[] = {
		USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
		USB_DEVICE_ID_KYE_EASYPEN_M610X) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
		USB_DEVICE_ID_KYE_EASYPEN_M406XE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,
		USB_DEVICE_ID_GENIUS_GILA_GAMING_MOUSE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE,

drivers/hid/hid-quirks.c

+1 −31

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ static const struct hid_device_id hid_quirks[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X), HID_QUIRK_MULTI_INPUT },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2), HID_QUIRK_MULTI_INPUT },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912), HID_QUIRK_MULTI_INPUT },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M406XE), HID_QUIRK_MULTI_INPUT },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE_ID2), HID_QUIRK_ALWAYS_POLL },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C007), HID_QUIRK_ALWAYS_POLL },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077), HID_QUIRK_ALWAYS_POLL },
		@@ -411,11 +412,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_MANTICORE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_GENIUS_GX_IMPERATOR) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X_V2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_PENSKETCH_M912) },
		#endif
		#if IS_ENABLED(CONFIG_HID_LCPOWER)
		{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000) },
		@@ -674,35 +670,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
		#if IS_ENABLED(CONFIG_HID_TWINHAN)
		{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
		#endif
		#if IS_ENABLED(CONFIG_HID_UCLOGIC)
		{ HID_USB_DEVICE(USB_VENDOR_ID_HUION, USB_DEVICE_ID_HUION_TABLET) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_HUION_TABLET) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP1062) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_DRAWIMAGE_G3) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_TABLET_EX07S) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_UGTIZER, USB_DEVICE_ID_UGTIZER_TABLET_GP0610) },
		#endif
		#if IS_ENABLED(CONFIG_HID_UDRAW_PS3)
		{ HID_USB_DEVICE(USB_VENDOR_ID_THQ, USB_DEVICE_ID_THQ_PS3_UDRAW) },
		#endif
		#if IS_ENABLED(CONFIG_HID_WALTOP)
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_Q_PAD) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_PID_0038) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET) },
		#endif
		#if IS_ENABLED(CONFIG_HID_XINMO)
		{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_THT_2P_ARCADE) },

Admin message