HID: uclogic: Make template placeholder IDs generic

Up until now, the report descriptor template parameter IDs were only
used with pen report descriptors and they were named accordingly.

Rename the enum and the total number of IDs to make them interface
agnostic.

Refactor, no functional changes.

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-params.c b/drivers/hid/hid-uclogic-params.c
index db838f16282d6488e40b57d18f5b0b4d29b79990..b43142f98a8b7f5a89115e9b883f021e9adc608b 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -234,7 +234,7 @@ static int uclogic_params_pen_init_v1(struct uclogic_params_pen *pen,
        const int len = 12;
        s32 resolution;
        /* Pen report descriptor template parameters */
-       s32 desc_params[UCLOGIC_RDESC_PEN_PH_ID_NUM];
+       s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM];
        __u8 *desc_ptr = NULL;
 
        /* Check arguments */
@@ -379,7 +379,7 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen,
        size_t i;
        s32 resolution;
        /* Pen report descriptor template parameters */
-       s32 desc_params[UCLOGIC_RDESC_PEN_PH_ID_NUM];
+       s32 desc_params[UCLOGIC_RDESC_PH_ID_NUM];
        __u8 *desc_ptr = NULL;
 
        /* Check arguments */

diff --git a/drivers/hid/hid-uclogic-rdesc.c b/drivers/hid/hid-uclogic-rdesc.c
index 13f9ce73f1b161b20706c4d6ae5460b16c7df214..7126fba8096839a62a667ddb07e460ffaa1690a2 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.c
+++ b/drivers/hid/hid-uclogic-rdesc.c
@@ -979,7 +979,7 @@ const size_t uclogic_rdesc_xppen_deco01_frame_size =
  * uclogic_rdesc_template_apply() - apply report descriptor parameters to a
  * report descriptor template, creating a report descriptor. Copies the
  * template over to the new report descriptor and replaces every occurrence of
- * UCLOGIC_RDESC_PH_HEAD, followed by an index byte, with the value from the
+ * UCLOGIC_RDESC_PEN_PH_HEAD, followed by an index byte, with the value from the
  * parameter list at that index.
  *
  * @template_ptr:      Pointer to the template buffer.
@@ -996,7 +996,7 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr,
                                   const s32 *param_list,
                                   size_t param_num)
 {
-       static const __u8 head[] = {UCLOGIC_RDESC_PH_HEAD};
+       static const __u8 pen_head[] = {UCLOGIC_RDESC_PEN_PH_HEAD};
        __u8 *rdesc_ptr;
        __u8 *p;
        s32 v;
@@ -1005,12 +1005,12 @@ __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr,
        if (rdesc_ptr == NULL)
                return NULL;
 
-       for (p = rdesc_ptr; p + sizeof(head) < rdesc_ptr + template_size;) {
-               if (memcmp(p, head, sizeof(head)) == 0 &&
-                   p[sizeof(head)] < param_num) {
-                       v = param_list[p[sizeof(head)]];
+       for (p = rdesc_ptr; p + sizeof(pen_head) < rdesc_ptr + template_size;) {
+               if (memcmp(p, pen_head, sizeof(pen_head)) == 0 &&
+                   p[sizeof(pen_head)] < param_num) {
+                       v = param_list[p[sizeof(pen_head)]];
                        put_unaligned(cpu_to_le32(v), (s32 *)p);
-                       p += sizeof(head) + 1;
+                       p += sizeof(pen_head) + 1;
                } else {
                        p++;
                }

diff --git a/drivers/hid/hid-uclogic-rdesc.h b/drivers/hid/hid-uclogic-rdesc.h
index 0c6e95e8bde7419b3b2e2d7e29e12f90b89d754b..9d37090c39d13f1932af7bc35620b830c5c93ad7 100644 (file)
--- a/drivers/hid/hid-uclogic-rdesc.h
+++ b/drivers/hid/hid-uclogic-rdesc.h
@@ -81,7 +81,7 @@ extern __u8 uclogic_rdesc_twha60_fixed1_arr[];
 extern const size_t uclogic_rdesc_twha60_fixed1_size;
 
 /* Report descriptor template placeholder head */
-#define UCLOGIC_RDESC_PH_HEAD  0xFE, 0xED, 0x1D
+#define UCLOGIC_RDESC_PEN_PH_HEAD      0xFE, 0xED, 0x1D
 
 /* Apply report descriptor parameters to a report descriptor template */
 extern __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr,
@@ -89,19 +89,19 @@ extern __u8 *uclogic_rdesc_template_apply(const __u8 *template_ptr,
                                          const s32 *param_list,
                                          size_t param_num);
 
-/* Pen report descriptor template placeholder IDs */
-enum uclogic_rdesc_pen_ph_id {
+/* Report descriptor template placeholder IDs */
+enum uclogic_rdesc_ph_id {
        UCLOGIC_RDESC_PEN_PH_ID_X_LM,
        UCLOGIC_RDESC_PEN_PH_ID_X_PM,
        UCLOGIC_RDESC_PEN_PH_ID_Y_LM,
        UCLOGIC_RDESC_PEN_PH_ID_Y_PM,
        UCLOGIC_RDESC_PEN_PH_ID_PRESSURE_LM,
-       UCLOGIC_RDESC_PEN_PH_ID_NUM
+       UCLOGIC_RDESC_PH_ID_NUM
 };
 
 /* Report descriptor pen template placeholder */
 #define UCLOGIC_RDESC_PEN_PH(_ID) \
-       UCLOGIC_RDESC_PH_HEAD, UCLOGIC_RDESC_PEN_PH_ID_##_ID
+       UCLOGIC_RDESC_PEN_PH_HEAD, UCLOGIC_RDESC_PEN_PH_ID_##_ID
 
 /* Report ID for v1 pen reports */
 #define UCLOGIC_RDESC_V1_PEN_ID        0x07