Commit 7744ca57 authored Dec 26, 2022 by José Expósito Committed by Jiri Kosina Jan 18, 2023

HID: uclogic: Add support for XP-PEN Deco Pro SW



The XP-PEN Deco Pro SW is a UGEE v2 device with a frame with 8 buttons,
a bitmap dial and a mouse; however, the UCLOGIC_MOUSE_FRAME_QUIRK is
required because it reports an incorrect frame type. Its pen has 2
buttons, supports tilt and pressure.

It can be connected using a USB cable or, to use it in wireless mode,
using a USB Bluetooth dongle. When it is connected in wireless mode the
device battery is used to power it.

All the pieces to support it are already in place. Add its ID and
quirks in order to support the device.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent a251d657

drivers/hid/hid-ids.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1297,6 +1297,7 @@
	#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
	#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L 0x0935		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L 0x0935
	#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S 0x0909		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S 0x0909
			#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW 0x0933
	#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06 0x0078		#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06 0x0078
	#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074		#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
	#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071		#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071

drivers/hid/hid-input.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -376,6 +376,8 @@ static const struct hid_device_id hid_battery_quirks[] = {
	HID_BATTERY_QUIRK_IGNORE },		HID_BATTERY_QUIRK_IGNORE },
	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),		{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),
	HID_BATTERY_QUIRK_AVOID_QUERY },		HID_BATTERY_QUIRK_AVOID_QUERY },
			{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
			HID_BATTERY_QUIRK_AVOID_QUERY },
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),		{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),
	HID_BATTERY_QUIRK_IGNORE },		HID_BATTERY_QUIRK_IGNORE },
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),		{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),

drivers/hid/hid-uclogic-core.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -542,6 +542,9 @@ static const struct hid_device_id uclogic_devices[] = {
	USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },		USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,		{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
	USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S) },		USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
			USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW),
			.driver_data = UCLOGIC_MOUSE_FRAME_QUIRK \| UCLOGIC_BATTERY_QUIRK },
	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,		{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
	USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06) },		USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06) },
	{ }		{ }

drivers/hid/hid-uclogic-params.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1767,6 +1767,8 @@ int uclogic_params_init(struct uclogic_params *params,
	USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):		USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):
	case VID_PID(USB_VENDOR_ID_UGEE,		case VID_PID(USB_VENDOR_ID_UGEE,
	USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S):		USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S):
			case VID_PID(USB_VENDOR_ID_UGEE,
			USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_SW):
	rc = uclogic_params_ugee_v2_init(&p, hdev);		rc = uclogic_params_ugee_v2_init(&p, hdev);
	if (rc != 0)		if (rc != 0)
	goto cleanup;		goto cleanup;