Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 2e28f3e0 编写于 作者: N Nikolai Kondrashov 提交者： Jiri Kosina
浏览文件
操作

HID: uclogic: Use "frame" instead of "buttonpad" 

Use the term "frame" instead of "buttonpad" for consistency, in UC-Logic
driver.
Signed-off-by: NNikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: NJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 2f290b39
隐藏空白更改
内联 并排
Showing with 51 addition and 53 deletion
drivers/hid/hid-uclogic-params.c
浏览文件 @ 2e28f3e0
...@@ -431,8 +431,8 @@ static int uclogic_params_frame_init_with_desc( ...@@ -431,8 +431,8 @@ static int uclogic_params_frame_init_with_desc(
} }
/** /**
* uclogic_params_frame_init_v1_buttonpad() - initialize abstract buttonpad * uclogic_params_frame_init_v1() - initialize v1 tablet interface frame
* on a v1 tablet interface. * controls.
* *
* @frame: Pointer to the frame parameters to initialize (to be cleaned * @frame: Pointer to the frame parameters to initialize (to be cleaned
* up with uclogic_params_frame_cleanup()). Not modified in case * up with uclogic_params_frame_cleanup()). Not modified in case
...@@ -446,8 +446,7 @@ static int uclogic_params_frame_init_with_desc( ...@@ -446,8 +446,7 @@ static int uclogic_params_frame_init_with_desc(
* Returns: * Returns:
* Zero, if successful. A negative errno code on error. * Zero, if successful. A negative errno code on error.
*/ */
static int uclogic_params_frame_init_v1_buttonpad( static int uclogic_params_frame_init_v1(struct uclogic_params_frame *frame,
struct uclogic_params_frame *frame,
bool *pfound, bool *pfound,
struct hid_device *hdev) struct hid_device *hdev)
{ {
...@@ -488,9 +487,9 @@ static int uclogic_params_frame_init_v1_buttonpad( ...@@ -488,9 +487,9 @@ static int uclogic_params_frame_init_v1_buttonpad(
hid_dbg(hdev, "generic buttons enabled\n"); hid_dbg(hdev, "generic buttons enabled\n");
rc = uclogic_params_frame_init_with_desc( rc = uclogic_params_frame_init_with_desc(
frame, frame,
uclogic_rdesc_buttonpad_v1_arr, uclogic_rdesc_frame_v1_arr,
uclogic_rdesc_buttonpad_v1_size, uclogic_rdesc_frame_v1_size,
UCLOGIC_RDESC_BUTTONPAD_V1_ID); UCLOGIC_RDESC_FRAME_V1_ID);
if (rc != 0) if (rc != 0)
goto cleanup; goto cleanup;
found = true; found = true;
...@@ -750,22 +749,22 @@ static int uclogic_params_huion_init(struct uclogic_params *params, ...@@ -750,22 +749,22 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
goto cleanup; goto cleanup;
} else if (found) { } else if (found) {
hid_dbg(hdev, "pen v2 parameters found\n"); hid_dbg(hdev, "pen v2 parameters found\n");
/* Create v2 buttonpad parameters */ /* Create v2 frame parameters */
rc = uclogic_params_frame_init_with_desc( rc = uclogic_params_frame_init_with_desc(
&p.frame, &p.frame,
uclogic_rdesc_buttonpad_v2_arr, uclogic_rdesc_frame_v2_arr,
uclogic_rdesc_buttonpad_v2_size, uclogic_rdesc_frame_v2_size,
UCLOGIC_RDESC_BUTTONPAD_V2_ID); UCLOGIC_RDESC_FRAME_V2_ID);
if (rc != 0) { if (rc != 0) {
hid_err(hdev, hid_err(hdev,
"failed creating v2 buttonpad parameters: %d\n", "failed creating v2 frame parameters: %d\n",
rc); rc);
goto cleanup; goto cleanup;
} }
/* Link frame button subreports from pen reports */ /* Link frame button subreports from pen reports */
p.pen.subreport_list[0].value = 0xe0; p.pen.subreport_list[0].value = 0xe0;
p.pen.subreport_list[0].id = p.pen.subreport_list[0].id =
UCLOGIC_RDESC_BUTTONPAD_V2_ID; UCLOGIC_RDESC_FRAME_V2_ID;
goto output; goto output;
} }
hid_dbg(hdev, "pen v2 parameters not found\n"); hid_dbg(hdev, "pen v2 parameters not found\n");
...@@ -779,21 +778,20 @@ static int uclogic_params_huion_init(struct uclogic_params *params, ...@@ -779,21 +778,20 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
goto cleanup; goto cleanup;
} else if (found) { } else if (found) {
hid_dbg(hdev, "pen v1 parameters found\n"); hid_dbg(hdev, "pen v1 parameters found\n");
/* Try to probe v1 buttonpad */ /* Try to probe v1 frame */
rc = uclogic_params_frame_init_v1_buttonpad( rc = uclogic_params_frame_init_v1(&p.frame,
&p.frame, &found, hdev);
&found, hdev);
if (rc != 0) { if (rc != 0) {
hid_err(hdev, "v1 buttonpad probing failed: %d\n", rc); hid_err(hdev, "v1 frame probing failed: %d\n", rc);
goto cleanup; goto cleanup;
} }
hid_dbg(hdev, "buttonpad v1 parameters%s found\n", hid_dbg(hdev, "frame v1 parameters%s found\n",
(found ? "" : " not")); (found ? "" : " not"));
if (found) { if (found) {
/* Link frame button subreports from pen reports */ /* Link frame button subreports from pen reports */
p.pen.subreport_list[0].value = 0xe0; p.pen.subreport_list[0].value = 0xe0;
p.pen.subreport_list[0].id = p.pen.subreport_list[0].id =
UCLOGIC_RDESC_BUTTONPAD_V1_ID; UCLOGIC_RDESC_FRAME_V1_ID;
} }
goto output; goto output;
} }
...@@ -1067,7 +1065,7 @@ int uclogic_params_init(struct uclogic_params *params, ...@@ -1067,7 +1065,7 @@ int uclogic_params_init(struct uclogic_params *params,
UCLOGIC_RDESC_UGEE_G5_FRAME_ID); UCLOGIC_RDESC_UGEE_G5_FRAME_ID);
if (rc != 0) { if (rc != 0) {
hid_err(hdev, hid_err(hdev,
"failed creating buttonpad parameters: %d\n", "failed creating frame parameters: %d\n",
rc); rc);
goto cleanup; goto cleanup;
} }
...@@ -1096,12 +1094,12 @@ int uclogic_params_init(struct uclogic_params *params, ...@@ -1096,12 +1094,12 @@ int uclogic_params_init(struct uclogic_params *params,
} else if (found) { } else if (found) {
rc = uclogic_params_frame_init_with_desc( rc = uclogic_params_frame_init_with_desc(
&p.frame, &p.frame,
uclogic_rdesc_ugee_ex07_buttonpad_arr, uclogic_rdesc_ugee_ex07_frame_arr,
uclogic_rdesc_ugee_ex07_buttonpad_size, uclogic_rdesc_ugee_ex07_frame_size,
0); 0);
if (rc != 0) { if (rc != 0) {
hid_err(hdev, hid_err(hdev,
"failed creating buttonpad parameters: %d\n", "failed creating frame parameters: %d\n",
rc); rc);
goto cleanup; goto cleanup;
} }
......
drivers/hid/hid-uclogic-rdesc.c
浏览文件 @ 2e28f3e0
...@@ -652,12 +652,12 @@ const size_t uclogic_rdesc_pen_v2_template_size = ...@@ -652,12 +652,12 @@ const size_t uclogic_rdesc_pen_v2_template_size =
sizeof(uclogic_rdesc_pen_v2_template_arr); sizeof(uclogic_rdesc_pen_v2_template_arr);
/* /*
* Expand to the contents of a generic buttonpad report descriptor. * Expand to the contents of a generic frame report descriptor.
* *
* @_id: The report ID to use. * @_id: The report ID to use.
* @_size: Size of the report to pad to, including report ID, bytes. * @_size: Size of the report to pad to, including report ID, bytes.
*/ */
#define UCLOGIC_RDESC_BUTTONPAD_BYTES(_id, _size) \ #define UCLOGIC_RDESC_FRAME_BYTES(_id, _size) \
0x05, 0x01, /* Usage Page (Desktop), */ \ 0x05, 0x01, /* Usage Page (Desktop), */ \
0x09, 0x07, /* Usage (Keypad), */ \ 0x09, 0x07, /* Usage (Keypad), */ \
0xA1, 0x01, /* Collection (Application), */ \ 0xA1, 0x01, /* Collection (Application), */ \
...@@ -698,22 +698,22 @@ const size_t uclogic_rdesc_pen_v2_template_size = ...@@ -698,22 +698,22 @@ const size_t uclogic_rdesc_pen_v2_template_size =
0xC0, /* End Collection, */ \ 0xC0, /* End Collection, */ \
0xC0 /* End Collection */ 0xC0 /* End Collection */
/* Fixed report descriptor for (tweaked) v1 buttonpad reports */ /* Fixed report descriptor for (tweaked) v1 frame reports */
const __u8 uclogic_rdesc_buttonpad_v1_arr[] = { const __u8 uclogic_rdesc_frame_v1_arr[] = {
UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V1_ID, 8) UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V1_ID, 8)
}; };
const size_t uclogic_rdesc_buttonpad_v1_size = const size_t uclogic_rdesc_frame_v1_size =
sizeof(uclogic_rdesc_buttonpad_v1_arr); sizeof(uclogic_rdesc_frame_v1_arr);
/* Fixed report descriptor for (tweaked) v2 buttonpad reports */ /* Fixed report descriptor for (tweaked) v2 frame reports */
const __u8 uclogic_rdesc_buttonpad_v2_arr[] = { const __u8 uclogic_rdesc_frame_v2_arr[] = {
UCLOGIC_RDESC_BUTTONPAD_BYTES(UCLOGIC_RDESC_BUTTONPAD_V2_ID, 12) UCLOGIC_RDESC_FRAME_BYTES(UCLOGIC_RDESC_FRAME_V2_ID, 12)
}; };
const size_t uclogic_rdesc_buttonpad_v2_size = const size_t uclogic_rdesc_frame_v2_size =
sizeof(uclogic_rdesc_buttonpad_v2_arr); sizeof(uclogic_rdesc_frame_v2_arr);
/* Fixed report descriptor for Ugee EX07 buttonpad */ /* Fixed report descriptor for Ugee EX07 frame */
const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = { const __u8 uclogic_rdesc_ugee_ex07_frame_arr[] = {
0x05, 0x01, /* Usage Page (Desktop), */ 0x05, 0x01, /* Usage Page (Desktop), */
0x09, 0x07, /* Usage (Keypad), */ 0x09, 0x07, /* Usage (Keypad), */
0xA1, 0x01, /* Collection (Application), */ 0xA1, 0x01, /* Collection (Application), */
...@@ -736,8 +736,8 @@ const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = { ...@@ -736,8 +736,8 @@ const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[] = {
0xC0, /* End Collection, */ 0xC0, /* End Collection, */
0xC0 /* End Collection */ 0xC0 /* End Collection */
}; };
const size_t uclogic_rdesc_ugee_ex07_buttonpad_size = const size_t uclogic_rdesc_ugee_ex07_frame_size =
sizeof(uclogic_rdesc_ugee_ex07_buttonpad_arr); sizeof(uclogic_rdesc_ugee_ex07_frame_arr);
/* Fixed report descriptor for Ugee G5 frame controls */ /* Fixed report descriptor for Ugee G5 frame controls */
const __u8 uclogic_rdesc_ugee_g5_frame_arr[] = { const __u8 uclogic_rdesc_ugee_g5_frame_arr[] = {
......
drivers/hid/hid-uclogic-rdesc.h
浏览文件 @ 2e28f3e0
...@@ -117,23 +117,23 @@ extern const size_t uclogic_rdesc_pen_v1_template_size; ...@@ -117,23 +117,23 @@ extern const size_t uclogic_rdesc_pen_v1_template_size;
extern const __u8 uclogic_rdesc_pen_v2_template_arr[]; extern const __u8 uclogic_rdesc_pen_v2_template_arr[];
extern const size_t uclogic_rdesc_pen_v2_template_size; extern const size_t uclogic_rdesc_pen_v2_template_size;
/* Fixed report descriptor for (tweaked) v1 buttonpad reports */ /* Fixed report descriptor for (tweaked) v1 frame reports */
extern const __u8 uclogic_rdesc_buttonpad_v1_arr[]; extern const __u8 uclogic_rdesc_frame_v1_arr[];
extern const size_t uclogic_rdesc_buttonpad_v1_size; extern const size_t uclogic_rdesc_frame_v1_size;
/* Report ID for tweaked v1 buttonpad reports */ /* Report ID for tweaked v1 frame reports */
#define UCLOGIC_RDESC_BUTTONPAD_V1_ID 0xf7 #define UCLOGIC_RDESC_FRAME_V1_ID 0xf7
/* Fixed report descriptor for (tweaked) v2 buttonpad reports */ /* Fixed report descriptor for (tweaked) v2 frame reports */
extern const __u8 uclogic_rdesc_buttonpad_v2_arr[]; extern const __u8 uclogic_rdesc_frame_v2_arr[];
extern const size_t uclogic_rdesc_buttonpad_v2_size; extern const size_t uclogic_rdesc_frame_v2_size;
/* Report ID for tweaked v2 buttonpad reports */ /* Report ID for tweaked v2 frame reports */
#define UCLOGIC_RDESC_BUTTONPAD_V2_ID 0xf7 #define UCLOGIC_RDESC_FRAME_V2_ID 0xf7
/* Fixed report descriptor for Ugee EX07 buttonpad */ /* Fixed report descriptor for Ugee EX07 frame */
extern const __u8 uclogic_rdesc_ugee_ex07_buttonpad_arr[]; extern const __u8 uclogic_rdesc_ugee_ex07_frame_arr[];
extern const size_t uclogic_rdesc_ugee_ex07_buttonpad_size; extern const size_t uclogic_rdesc_ugee_ex07_frame_size;
/* Fixed report descriptor for XP-Pen Deco 01 frame controls */ /* Fixed report descriptor for XP-Pen Deco 01 frame controls */
extern const __u8 uclogic_rdesc_xppen_deco01_frame_arr[]; extern const __u8 uclogic_rdesc_xppen_deco01_frame_arr[];
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或