HID: uclogic: Add support for Ugee M540

Add support for Ugee M540 to hid-uclogic.

Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index f57bf26..72a073a 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -897,9 +897,29 @@ int uclogic_params_init(struct uclogic_params *params,
                break;
        case VID_PID(USB_VENDOR_ID_UCLOGIC,
                     USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U):
-               rc = WITH_OPT_DESC(WPXXXXU_ORIG, wp5540u_fixed);
-               if (rc != 0)
-                       goto cleanup;
+               if (hdev->dev_rsize == UCLOGIC_RDESC_WP5540U_V2_ORIG_SIZE) {
+                       if (bInterfaceNumber == 0) {
+                               /* Try to probe v1 pen parameters */
+                               rc = uclogic_params_pen_init_v1(&p.pen,
+                                                               &found, hdev);
+                               if (rc != 0) {
+                                       hid_err(hdev,
+                                               "pen probing failed: %d\n",
+                                               rc);
+                                       goto cleanup;
+                               }
+                               if (!found) {
+                                       hid_warn(hdev,
+                                                "pen parameters not found");
+                               }
+                       } else {
+                               uclogic_params_init_invalid(&p);
+                       }
+               } else {
+                       rc = WITH_OPT_DESC(WPXXXXU_ORIG, wp5540u_fixed);
+                       if (rc != 0)
+                               goto cleanup;
+               }
                break;
        case VID_PID(USB_VENDOR_ID_UCLOGIC,
                     USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U):

diff --git a/drivers/hid/hid-uclogic-rdesc.h b/drivers/hid/hid-uclogic-rdesc.h
index f205254..cc5f3dd 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.h
+++ b/drivers/hid/hid-uclogic-rdesc.h
@@ -34,6 +34,9 @@ extern const size_t uclogic_rdesc_wp5540u_fixed_size;
 extern __u8 uclogic_rdesc_wp8060u_fixed_arr[];
 extern const size_t uclogic_rdesc_wp8060u_fixed_size;
 
+/* Size of the original descriptor of the new WP5540U tablet */
+#define UCLOGIC_RDESC_WP5540U_V2_ORIG_SIZE     232
+
 /* Size of the original descriptor of WP1062 tablet */
 #define UCLOGIC_RDESC_WP1062_ORIG_SIZE         254