Skip to content

Commit 2e28f3e

Browse files
spbnickJiri Kosina
spbnick
authored and
Jiri Kosina
committed
HID: uclogic: Use "frame" instead of "buttonpad"
Use the term "frame" instead of "buttonpad" for consistency, in UC-Logic driver. 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>
1 parent 2f290b3 commit 2e28f3e

3 files changed

Lines changed: 51 additions & 53 deletions

File tree

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,8 @@ static int uclogic_params_frame_init_with_desc(
431431
}
432432

433433
/**
434-
* uclogic_params_frame_init_v1_buttonpad() - initialize abstract buttonpad
435-
* on a v1 tablet interface.
434+
* uclogic_params_frame_init_v1() - initialize v1 tablet interface frame
435+
* controls.
436436
*
437437
* @frame: Pointer to the frame parameters to initialize (to be cleaned
438438
* up with uclogic_params_frame_cleanup()). Not modified in case
@@ -446,8 +446,7 @@ static int uclogic_params_frame_init_with_desc(
446446
* Returns:
447447
* Zero, if successful. A negative errno code on error.
448448
*/
449-
static int uclogic_params_frame_init_v1_buttonpad(
450-
struct uclogic_params_frame *frame,
449+
static int uclogic_params_frame_init_v1(struct uclogic_params_frame *frame,
451450
bool *pfound,
452451
struct hid_device *hdev)
453452
{
@@ -488,9 +487,9 @@ static int uclogic_params_frame_init_v1_buttonpad(
488487
hid_dbg(hdev, "generic buttons enabled\n");
489488
rc = uclogic_params_frame_init_with_desc(
490489
frame,
491-
uclogic_rdesc_buttonpad_v1_arr,
492-
uclogic_rdesc_buttonpad_v1_size,
493-
UCLOGIC_RDESC_BUTTONPAD_V1_ID);
490+
uclogic_rdesc_frame_v1_arr,
491+
uclogic_rdesc_frame_v1_size,
492+
UCLOGIC_RDESC_FRAME_V1_ID);
494493
if (rc != 0)
495494
goto cleanup;
496495
found = true;
@@ -750,22 +749,22 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
750749
goto cleanup;
751750
} else if (found) {
752751
hid_dbg(hdev, "pen v2 parameters found\n");
753-
/* Create v2 buttonpad parameters */
752+
/* Create v2 frame parameters */
754753
rc = uclogic_params_frame_init_with_desc(
755754
&p.frame,
756-
uclogic_rdesc_buttonpad_v2_arr,
757-
uclogic_rdesc_buttonpad_v2_size,
758-
UCLOGIC_RDESC_BUTTONPAD_V2_ID);
755+
uclogic_rdesc_frame_v2_arr,
756+
uclogic_rdesc_frame_v2_size,
757+
UCLOGIC_RDESC_FRAME_V2_ID);
759758
if (rc != 0) {
760759
hid_err(hdev,
761-
"failed creating v2 buttonpad parameters: %d\n",
760+
"failed creating v2 frame parameters: %d\n",
762761
rc);
763762
goto cleanup;
764763
}
765764
/* Link frame button subreports from pen reports */
766765
p.pen.subreport_list[0].value = 0xe0;
767766
p.pen.subreport_list[0].id =
768-
UCLOGIC_RDESC_BUTTONPAD_V2_ID;
767+
UCLOGIC_RDESC_FRAME_V2_ID;
769768
goto output;
770769
}
771770
hid_dbg(hdev, "pen v2 parameters not found\n");
@@ -779,21 +778,20 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
779778
goto cleanup;
780779
} else if (found) {
781780
hid_dbg(hdev, "pen v1 parameters found\n");
782-
/* Try to probe v1 buttonpad */
783-
rc = uclogic_params_frame_init_v1_buttonpad(
784-
&p.frame,
785-
&found, hdev);
781+
/* Try to probe v1 frame */
782+
rc = uclogic_params_frame_init_v1(&p.frame,
783+
&found, hdev);
786784
if (rc != 0) {
787-
hid_err(hdev, "v1 buttonpad probing failed: %d\n", rc);
785+
hid_err(hdev, "v1 frame probing failed: %d\n", rc);
788786
goto cleanup;
789787
}
790-
hid_dbg(hdev, "buttonpad v1 parameters%s found\n",
788+
hid_dbg(hdev, "frame v1 parameters%s found\n",
791789
(found ? "" : " not"));
792790
if (found) {
793791
/* Link frame button subreports from pen reports */
794792
p.pen.subreport_list[0].value = 0xe0;
795793
p.pen.subreport_list[0].id =
796-
UCLOGIC_RDESC_BUTTONPAD_V1_ID;
794+
UCLOGIC_RDESC_FRAME_V1_ID;
797795
}
798796
goto output;
799797
}
@@ -1067,7 +1065,7 @@ int uclogic_params_init(struct uclogic_params *params,
10671065
UCLOGIC_RDESC_UGEE_G5_FRAME_ID);
10681066
if (rc != 0) {
10691067
hid_err(hdev,
1070-
"failed creating buttonpad parameters: %d\n",
1068+
"failed creating frame parameters: %d\n",
10711069
rc);
10721070
goto cleanup;
10731071
}
@@ -1096,12 +1094,12 @@ int uclogic_params_init(struct uclogic_params *params,
10961094
} else if (found) {
10971095
rc = uclogic_params_frame_init_with_desc(
10981096
&p.frame,
1099-
uclogic_rdesc_ugee_ex07_buttonpad_arr,
1100-
uclogic_rdesc_ugee_ex07_buttonpad_size,
1097+
uclogic_rdesc_ugee_ex07_frame_arr,
1098+
uclogic_rdesc_ugee_ex07_frame_size,
11011099
0);
11021100
if (rc != 0) {
11031101
hid_err(hdev,
1104-
"failed creating buttonpad parameters: %d\n",
1102+
"failed creating frame parameters: %d\n",
11051103
rc);
11061104
goto cleanup;
11071105
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,12 @@ const size_t uclogic_rdesc_pen_v2_template_size =
652652
sizeof(uclogic_rdesc_pen_v2_template_arr);
653653

654654
/*
655-
* Expand to the contents of a generic buttonpad report descriptor.
655+
* Expand to the contents of a generic frame report descriptor.
656656
*
657657
* @_id: The report ID to use.
658658
* @_size: Size of the report to pad to, including report ID, bytes.
659659
*/
660-
#define UCLOGIC_RDESC_BUTTONPAD_BYTES(_id, _size) \
660+
#define UCLOGIC_RDESC_FRAME_BYTES(_id, _size) \
661661
0x05, 0x01, /* Usage Page (Desktop), */ \
662662
0x09, 0x07, /* Usage (Keypad), */ \
663663
0xA1, 0x01, /* Collection (Application), */ \
@@ -698,22 +698,22 @@ const size_t uclogic_rdesc_pen_v2_template_size =
698698
0xC0, /* End Collection, */ \
699699
0xC0 /* End Collection */
700700

701-
/* Fixed report descriptor for (tweaked) v1 buttonpad reports */
702-
const __u8 uclogic_rdesc_buttonpad_v1_arr[] = {
703-
UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V1_ID, 8)
701+
/* 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)
704704
};
705-
const size_t uclogic_rdesc_buttonpad_v1_size =
706-
sizeof(uclogic_rdesc_buttonpad_v1_arr);
705+
const size_t uclogic_rdesc_frame_v1_size =
706+
sizeof(uclogic_rdesc_frame_v1_arr);
707707

708-
/* Fixed report descriptor for (tweaked) v2 buttonpad reports */
709-
const __u8 uclogic_rdesc_buttonpad_v2_arr[] = {
710-
UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V2_ID, 12)
708+
/* 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)
711711
};
712-
const size_t uclogic_rdesc_buttonpad_v2_size =
713-
sizeof(uclogic_rdesc_buttonpad_v2_arr);
712+
const size_t uclogic_rdesc_frame_v2_size =
713+
sizeof(uclogic_rdesc_frame_v2_arr);
714714

715-
/* Fixed report descriptor for Ugee EX07 buttonpad */
716-
const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = {
715+
/* Fixed report descriptor for Ugee EX07 frame */
716+
const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {
717717
0x05, 0x01, /* Usage Page (Desktop), */
718718
0x09, 0x07, /* Usage (Keypad), */
719719
0xA1, 0x01, /* Collection (Application), */
@@ -736,8 +736,8 @@ const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = {
736736
0xC0, /* End Collection, */
737737
0xC0 /* End Collection */
738738
};
739-
const size_t uclogic_rdesc_ugee_ex07_buttonpad_size =
740-
sizeof(uclogic_rdesc_ugee_ex07_buttonpad_arr);
739+
const size_t uclogic_rdesc_ugee_ex07_frame_size =
740+
sizeof(uclogic_rdesc_ugee_ex07_frame_arr);
741741

742742
/* Fixed report descriptor for Ugee G5 frame controls */
743743
const __u8 uclogic_rdesc_ugee_g5_frame_arr[] = {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,23 +117,23 @@ extern const size_t uclogic_rdesc_pen_v1_template_size;
117117
extern const __u8 uclogic_rdesc_pen_v2_template_arr[];
118118
extern const size_t uclogic_rdesc_pen_v2_template_size;
119119

120-
/* Fixed report descriptor for (tweaked) v1 buttonpad reports */
121-
extern const __u8 uclogic_rdesc_buttonpad_v1_arr[];
122-
extern const size_t uclogic_rdesc_buttonpad_v1_size;
120+
/* 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;
123123

124-
/* Report ID for tweaked v1 buttonpad reports */
125-
#define UCLOGIC_RDESC_BUTTONPAD_V1_ID 0xf7
124+
/* Report ID for tweaked v1 frame reports */
125+
#define UCLOGIC_RDESC_FRAME_V1_ID 0xf7
126126

127-
/* Fixed report descriptor for (tweaked) v2 buttonpad reports */
128-
extern const __u8 uclogic_rdesc_buttonpad_v2_arr[];
129-
extern const size_t uclogic_rdesc_buttonpad_v2_size;
127+
/* 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;
130130

131-
/* Report ID for tweaked v2 buttonpad reports */
132-
#define UCLOGIC_RDESC_BUTTONPAD_V2_ID 0xf7
131+
/* Report ID for tweaked v2 frame reports */
132+
#define UCLOGIC_RDESC_FRAME_V2_ID 0xf7
133133

134-
/* Fixed report descriptor for Ugee EX07 buttonpad */
135-
extern const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[];
136-
extern const size_t uclogic_rdesc_ugee_ex07_buttonpad_size;
134+
/* Fixed report descriptor for Ugee EX07 frame */
135+
extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];
136+
extern const size_t uclogic_rdesc_ugee_ex07_frame_size;
137137

138138
/* Fixed report descriptor for XP-Pen Deco 01 frame controls */
139139
extern const __u8 uclogic_rdesc_xppen_deco01_frame_arr[];

0 commit comments

Comments
 (0)