Commit 93b40b3e authored by José Expósito's avatar José Expósito Committed by Jiri Kosina
Browse files

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

The XP-PEN Deco Pro S is a UGEE v2 device with a frame with 8 buttons,
a bitmap dial and a mouse. Its pen has 2 buttons, supports tilt and
pressure.

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

The required Wireshark traces were captured by Jouke Witteveen.
For more information check [1].

Link: https://gitlab.freedesktop.org/libinput/libinput/-/issues/738

  [1]
Tested-by: default avatarJouke Witteveen <j.witteveen@gmail.com>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 387dcab7

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1280,6 +1280,7 @@ 
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640	0x0094

#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_PRO_S	0x0909

#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06	0x0078

#define USB_DEVICE_ID_UGEE_TABLET_G5		0x0074

#define USB_DEVICE_ID_UGEE_TABLET_EX07S		0x0071

drivers/hid/hid-uclogic-core.c

+2 −0
Original line number Diff line number Diff line
@@ -524,6 +524,8 @@ static const struct hid_device_id uclogic_devices[] = { 
				USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },

	{ 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_PRO_S) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,

				USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06) },

	{ }

drivers/hid/hid-uclogic-params.c

+2 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,8 @@ int uclogic_params_init(struct uclogic_params *params, 
		break;

	case VID_PID(USB_VENDOR_ID_UGEE,

		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):

	case VID_PID(USB_VENDOR_ID_UGEE,

		     USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S):

		rc = uclogic_params_ugee_v2_init(&p, hdev);

		if (rc != 0)

			goto cleanup;