Skip to content

Commit a985de5

Browse files
spbnickJiri Kosina
spbnick
authored and
Jiri Kosina
committed
HID: uclogic: Put version first in rdesc namespace
Put general hardware version before everything else in uclogic_rdesc_ namespace. Signed-off-by: Nikolai Kondrashov <[email protected]> Signed-off-by: José Expósito <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 2e28f3e commit a985de5

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎drivers/hid/hid-uclogic-params.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ static int uclogic_params_pen_init_v1(struct uclogic_params_pen *pen,
207207
* Generate pen report descriptor
208208
*/
209209
desc_ptr = uclogic_rdesc_template_apply(
210-
uclogic_rdesc_pen_v1_template_arr,
211-
uclogic_rdesc_pen_v1_template_size,
210+
uclogic_rdesc_v1_pen_template_arr,
211+
uclogic_rdesc_v1_pen_template_size,
212212
desc_params, ARRAY_SIZE(desc_params));
213213
if (desc_ptr == NULL) {
214214
rc = -ENOMEM;
@@ -221,8 +221,8 @@ static int uclogic_params_pen_init_v1(struct uclogic_params_pen *pen,
221221
memset(pen, 0, sizeof(*pen));
222222
pen->desc_ptr = desc_ptr;
223223
desc_ptr = NULL;
224-
pen->desc_size = uclogic_rdesc_pen_v1_template_size;
225-
pen->id = UCLOGIC_RDESC_PEN_V1_ID;
224+
pen->desc_size = uclogic_rdesc_v1_pen_template_size;
225+
pen->id = UCLOGIC_RDESC_V1_PEN_ID;
226226
pen->inrange = UCLOGIC_PARAMS_PEN_INRANGE_INVERTED;
227227
found = true;
228228
finish:
@@ -351,8 +351,8 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen,
351351
* Generate pen report descriptor
352352
*/
353353
desc_ptr = uclogic_rdesc_template_apply(
354-
uclogic_rdesc_pen_v2_template_arr,
355-
uclogic_rdesc_pen_v2_template_size,
354+
uclogic_rdesc_v2_pen_template_arr,
355+
uclogic_rdesc_v2_pen_template_size,
356356
desc_params, ARRAY_SIZE(desc_params));
357357
if (desc_ptr == NULL) {
358358
rc = -ENOMEM;
@@ -365,8 +365,8 @@ static int uclogic_params_pen_init_v2(struct uclogic_params_pen *pen,
365365
memset(pen, 0, sizeof(*pen));
366366
pen->desc_ptr = desc_ptr;
367367
desc_ptr = NULL;
368-
pen->desc_size = uclogic_rdesc_pen_v2_template_size;
369-
pen->id = UCLOGIC_RDESC_PEN_V2_ID;
368+
pen->desc_size = uclogic_rdesc_v2_pen_template_size;
369+
pen->id = UCLOGIC_RDESC_V2_PEN_ID;
370370
pen->inrange = UCLOGIC_PARAMS_PEN_INRANGE_NONE;
371371
pen->fragmented_hires = true;
372372
pen->tilt_y_flipped = true;
@@ -487,9 +487,9 @@ static int uclogic_params_frame_init_v1(struct uclogic_params_frame *frame,
487487
hid_dbg(hdev, "generic buttons enabled\n");
488488
rc = uclogic_params_frame_init_with_desc(
489489
frame,
490-
uclogic_rdesc_frame_v1_arr,
491-
uclogic_rdesc_frame_v1_size,
492-
UCLOGIC_RDESC_FRAME_V1_ID);
490+
uclogic_rdesc_v1_frame_arr,
491+
uclogic_rdesc_v1_frame_size,
492+
UCLOGIC_RDESC_V1_FRAME_ID);
493493
if (rc != 0)
494494
goto cleanup;
495495
found = true;
@@ -752,9 +752,9 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
752752
/* Create v2 frame parameters */
753753
rc = uclogic_params_frame_init_with_desc(
754754
&p.frame,
755-
uclogic_rdesc_frame_v2_arr,
756-
uclogic_rdesc_frame_v2_size,
757-
UCLOGIC_RDESC_FRAME_V2_ID);
755+
uclogic_rdesc_v2_frame_arr,
756+
uclogic_rdesc_v2_frame_size,
757+
UCLOGIC_RDESC_V2_FRAME_ID);
758758
if (rc != 0) {
759759
hid_err(hdev,
760760
"failed creating v2 frame parameters: %d\n",
@@ -764,7 +764,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
764764
/* Link frame button subreports from pen reports */
765765
p.pen.subreport_list[0].value = 0xe0;
766766
p.pen.subreport_list[0].id =
767-
UCLOGIC_RDESC_FRAME_V2_ID;
767+
UCLOGIC_RDESC_V2_FRAME_ID;
768768
goto output;
769769
}
770770
hid_dbg(hdev, "pen v2 parameters not found\n");
@@ -791,7 +791,7 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
791791
/* Link frame button subreports from pen reports */
792792
p.pen.subreport_list[0].value = 0xe0;
793793
p.pen.subreport_list[0].id =
794-
UCLOGIC_RDESC_FRAME_V1_ID;
794+
UCLOGIC_RDESC_V1_FRAME_ID;
795795
}
796796
goto output;
797797
}

‎drivers/hid/hid-uclogic-rdesc.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ const size_t uclogic_rdesc_twha60_fixed1_size =
532532
sizeof(uclogic_rdesc_twha60_fixed1_arr);
533533

534534
/* Fixed report descriptor template for (tweaked) v1 pen reports */
535-
const __u8 uclogic_rdesc_pen_v1_template_arr[] = {
535+
const __u8 uclogic_rdesc_v1_pen_template_arr[] = {
536536
0x05, 0x0D, /* Usage Page (Digitizer), */
537537
0x09, 0x02, /* Usage (Pen), */
538538
0xA1, 0x01, /* Collection (Application), */
@@ -582,11 +582,11 @@ const __u8 uclogic_rdesc_pen_v1_template_arr[] = {
582582
0xC0 /* End Collection */
583583
};
584584

585-
const size_t uclogic_rdesc_pen_v1_template_size =
586-
sizeof(uclogic_rdesc_pen_v1_template_arr);
585+
const size_t uclogic_rdesc_v1_pen_template_size =
586+
sizeof(uclogic_rdesc_v1_pen_template_arr);
587587

588588
/* Fixed report descriptor template for (tweaked) v2 pen reports */
589-
const __u8 uclogic_rdesc_pen_v2_template_arr[] = {
589+
const __u8 uclogic_rdesc_v2_pen_template_arr[] = {
590590
0x05, 0x0D, /* Usage Page (Digitizer), */
591591
0x09, 0x02, /* Usage (Pen), */
592592
0xA1, 0x01, /* Collection (Application), */
@@ -648,8 +648,8 @@ const __u8 uclogic_rdesc_pen_v2_template_arr[] = {
648648
0xC0 /* End Collection */
649649
};
650650

651-
const size_t uclogic_rdesc_pen_v2_template_size =
652-
sizeof(uclogic_rdesc_pen_v2_template_arr);
651+
const size_t uclogic_rdesc_v2_pen_template_size =
652+
sizeof(uclogic_rdesc_v2_pen_template_arr);
653653

654654
/*
655655
* Expand to the contents of a generic frame report descriptor.
@@ -699,18 +699,18 @@ const size_t uclogic_rdesc_pen_v2_template_size =
699699
0xC0 /* End Collection */
700700

701701
/* Fixed report descriptor for (tweaked) v1 frame reports */
702-
const __u8 uclogic_rdesc_frame_v1_arr[] = {
703-
UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V1_ID, 8)
702+
const __u8 uclogic_rdesc_v1_frame_arr[] = {
703+
UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_V1_FRAME_ID, 8)
704704
};
705-
const size_t uclogic_rdesc_frame_v1_size =
706-
sizeof(uclogic_rdesc_frame_v1_arr);
705+
const size_t uclogic_rdesc_v1_frame_size =
706+
sizeof(uclogic_rdesc_v1_frame_arr);
707707

708708
/* Fixed report descriptor for (tweaked) v2 frame reports */
709-
const __u8 uclogic_rdesc_frame_v2_arr[] = {
710-
UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V2_ID, 12)
709+
const __u8 uclogic_rdesc_v2_frame_arr[] = {
710+
UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_V2_FRAME_ID, 12)
711711
};
712-
const size_t uclogic_rdesc_frame_v2_size =
713-
sizeof(uclogic_rdesc_frame_v2_arr);
712+
const size_t uclogic_rdesc_v2_frame_size =
713+
sizeof(uclogic_rdesc_v2_frame_arr);
714714

715715
/* Fixed report descriptor for Ugee EX07 frame */
716716
const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {

‎drivers/hid/hid-uclogic-rdesc.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,32 +104,32 @@ enum uclogic_rdesc_pen_ph_id {
104104
UCLOGIC_RDESC_PH_HEAD, UCLOGIC_RDESC_PEN_PH_ID_##_ID
105105

106106
/* Report ID for v1 pen reports */
107-
#define UCLOGIC_RDESC_PEN_V1_ID 0x07
107+
#define UCLOGIC_RDESC_V1_PEN_ID 0x07
108108

109109
/* Fixed report descriptor template for (tweaked) v1 pen reports */
110-
extern const __u8 uclogic_rdesc_pen_v1_template_arr[];
111-
extern const size_t uclogic_rdesc_pen_v1_template_size;
110+
extern const __u8 uclogic_rdesc_v1_pen_template_arr[];
111+
extern const size_t uclogic_rdesc_v1_pen_template_size;
112112

113113
/* Report ID for v2 pen reports */
114-
#define UCLOGIC_RDESC_PEN_V2_ID 0x08
114+
#define UCLOGIC_RDESC_V2_PEN_ID 0x08
115115

116116
/* Fixed report descriptor template for (tweaked) v2 pen reports */
117-
extern const __u8 uclogic_rdesc_pen_v2_template_arr[];
118-
extern const size_t uclogic_rdesc_pen_v2_template_size;
117+
extern const __u8 uclogic_rdesc_v2_pen_template_arr[];
118+
extern const size_t uclogic_rdesc_v2_pen_template_size;
119119

120120
/* Fixed report descriptor for (tweaked) v1 frame reports */
121-
extern const __u8 uclogic_rdesc_frame_v1_arr[];
122-
extern const size_t uclogic_rdesc_frame_v1_size;
121+
extern const __u8 uclogic_rdesc_v1_frame_arr[];
122+
extern const size_t uclogic_rdesc_v1_frame_size;
123123

124124
/* Report ID for tweaked v1 frame reports */
125-
#define UCLOGIC_RDESC_FRAME_V1_ID 0xf7
125+
#define UCLOGIC_RDESC_V1_FRAME_ID 0xf7
126126

127127
/* Fixed report descriptor for (tweaked) v2 frame reports */
128-
extern const __u8 uclogic_rdesc_frame_v2_arr[];
129-
extern const size_t uclogic_rdesc_frame_v2_size;
128+
extern const __u8 uclogic_rdesc_v2_frame_arr[];
129+
extern const size_t uclogic_rdesc_v2_frame_size;
130130

131131
/* Report ID for tweaked v2 frame reports */
132-
#define UCLOGIC_RDESC_FRAME_V2_ID 0xf7
132+
#define UCLOGIC_RDESC_V2_FRAME_ID 0xf7
133133

134134
/* Fixed report descriptor for Ugee EX07 frame */
135135
extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];

0 commit comments

Comments
 (0)