Merge branch 'for-5.3/uclogic' into for-linus
This commit is contained in:
commit
86766756ac
|
@ -1157,6 +1157,7 @@
|
||||||
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
|
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
|
||||||
#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
|
||||||
|
#define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720 0x0055
|
||||||
|
|
||||||
#define USB_VENDOR_ID_UNITEC 0x227d
|
#define USB_VENDOR_ID_UNITEC 0x227d
|
||||||
#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
|
#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
|
||||||
|
|
|
@ -389,6 +389,8 @@ static const struct hid_device_id uclogic_devices[] = {
|
||||||
USB_DEVICE_ID_UGEE_TABLET_G5) },
|
USB_DEVICE_ID_UGEE_TABLET_G5) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
||||||
USB_DEVICE_ID_UGEE_TABLET_EX07S) },
|
USB_DEVICE_ID_UGEE_TABLET_EX07S) },
|
||||||
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
||||||
|
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
||||||
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540) },
|
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540) },
|
||||||
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
|
||||||
|
|
|
@ -1001,6 +1001,8 @@ int uclogic_params_init(struct uclogic_params *params,
|
||||||
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540):
|
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540):
|
||||||
case VID_PID(USB_VENDOR_ID_UGEE,
|
case VID_PID(USB_VENDOR_ID_UGEE,
|
||||||
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640):
|
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640):
|
||||||
|
case VID_PID(USB_VENDOR_ID_UGEE,
|
||||||
|
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720):
|
||||||
/* If this is the pen interface */
|
/* If this is the pen interface */
|
||||||
if (bInterfaceNumber == 1) {
|
if (bInterfaceNumber == 1) {
|
||||||
/* Probe v1 pen parameters */
|
/* Probe v1 pen parameters */
|
||||||
|
|
Loading…
Reference in New Issue