HID: uclogic: Add support for bitmap dials

A bitmap dial sends reports with a dedicated bit per direction: 1 means
clockwise rotation, 2 means counterclockwise, as opposed to the normal
1 and -1 values.

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

diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index 96f3fb8c492c320c0c52b51c8848aaf477999601..627f1d0c52f233adb6e7c92aca2e2bb372ace0a9 100644 (file)
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -382,6 +382,12 @@ static int uclogic_raw_event_frame(
                }
        }
 
+       /* If need to, and can, transform the bitmap dial reports */
+       if (frame->bitmap_dial_byte > 0 && frame->bitmap_dial_byte < size) {
+               if (data[frame->bitmap_dial_byte] == 2)
+                       data[frame->bitmap_dial_byte] = -1;
+       }
+
        return 0;
 }
 

diff --git a/drivers/hid/hid-uclogic-params.h b/drivers/hid/hid-uclogic-params.h
index 78965e683d20fdd25cd25d6d6cc49d462c7a4aa6..e5ccc558abc34de9e0b221ab690a5b4f96776be2 100644 (file)
--- a/drivers/hid/hid-uclogic-params.h
+++ b/drivers/hid/hid-uclogic-params.h
@@ -153,6 +153,13 @@ struct uclogic_params_frame {
         * Zero if no reversal should be done.
         */
        __s8 touch_ring_flip_at;
+       /*
+        * Offset of the bitmap dial byte, in the report. Zero if not present.
+        * Only valid if "id" is not zero. A bitmap dial sends reports with a
+        * dedicated bit per direction: 1 means clockwise rotation, 2 means
+        * counterclockwise, as opposed to the normal 1 and -1.
+        */
+       unsigned int bitmap_dial_byte;
 };
 
 /*
@@ -230,6 +237,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
        "\t\t.touch_ring_byte = %u\n"       \
        "\t\t.touch_ring_max = %hhd\n"      \
        "\t\t.touch_ring_flip_at = %hhd\n"  \
+       "\t\t.bitmap_dial_byte = %u\n"      \
        "\t},\n"                            \
        "\t{\n"                             \
        "\t\t.desc_ptr = %p\n"              \
@@ -241,6 +249,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
        "\t\t.touch_ring_byte = %u\n"       \
        "\t\t.touch_ring_max = %hhd\n"      \
        "\t\t.touch_ring_flip_at = %hhd\n"  \
+       "\t\t.bitmap_dial_byte = %u\n"      \
        "\t},\n"                            \
        "\t{\n"                             \
        "\t\t.desc_ptr = %p\n"              \
@@ -252,6 +261,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
        "\t\t.touch_ring_byte = %u\n"       \
        "\t\t.touch_ring_max = %hhd\n"      \
        "\t\t.touch_ring_flip_at = %hhd\n"  \
+       "\t\t.bitmap_dial_byte = %u\n"      \
        "\t},\n"                            \
        "}\n"
 
@@ -281,6 +291,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
        (_params)->frame_list[0].touch_ring_byte,                   \
        (_params)->frame_list[0].touch_ring_max,                    \
        (_params)->frame_list[0].touch_ring_flip_at,                \
+       (_params)->frame_list[0].bitmap_dial_byte,                  \
        (_params)->frame_list[1].desc_ptr,                          \
        (_params)->frame_list[1].desc_size,                         \
        (_params)->frame_list[1].id,                                \
@@ -290,6 +301,7 @@ extern int uclogic_params_init(struct uclogic_params *params,
        (_params)->frame_list[1].touch_ring_byte,                   \
        (_params)->frame_list[1].touch_ring_max,                    \
        (_params)->frame_list[1].touch_ring_flip_at,                \
+       (_params)->frame_list[1].bitmap_dial_byte,                  \
        (_params)->frame_list[2].desc_ptr,                          \
        (_params)->frame_list[2].desc_size,                         \
        (_params)->frame_list[2].id,                                \
@@ -298,7 +310,8 @@ extern int uclogic_params_init(struct uclogic_params *params,
        (_params)->frame_list[2].dev_id_byte,                       \
        (_params)->frame_list[2].touch_ring_byte,                   \
        (_params)->frame_list[2].touch_ring_max,                    \
-       (_params)->frame_list[2].touch_ring_flip_at
+       (_params)->frame_list[2].touch_ring_flip_at,                \
+       (_params)->frame_list[2].bitmap_dial_byte
 
 /* Get a replacement report descriptor for a tablet's interface. */
 extern int uclogic_params_get_desc(const struct uclogic_params *params,