Skip to content

Commit 5ba13c6

Browse files
jigpuJiri Kosina
authored andcommitted
HID: wacom: Move WAC_CMD_* into wacom_wac.h
Centralize our definition of report IDs by moving those for device commands into wacom_wac.h alongside those for input reports. Signed-off-by: Jason Gerecke <[email protected]> Reviewed-by: Ping Cheng <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent b9e0625 commit 5ba13c6

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

drivers/hid/wacom_sys.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616
#include <linux/input/mt.h>
1717

1818
#define WAC_MSG_RETRIES 5
19-
20-
#define WAC_CMD_WL_LED_CONTROL 0x03
21-
#define WAC_CMD_LED_CONTROL 0x20
22-
#define WAC_CMD_ICON_START 0x21
23-
#define WAC_CMD_ICON_XFER 0x23
24-
#define WAC_CMD_ICON_BT_XFER 0x26
2519
#define WAC_CMD_RETRIES 10
26-
#define WAC_CMD_DELETE_PAIRING 0x20
27-
#define WAC_CMD_UNPAIR_ALL 0xFF
2820

2921
#define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP)
3022
#define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP)

drivers/hid/wacom_wac.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@
7272
#define WACOM_REPORT_REMOTE 17
7373
#define WACOM_REPORT_INTUOSHT2_ID 8
7474

75+
/* wacom command report ids */
76+
#define WAC_CMD_WL_LED_CONTROL 0x03
77+
#define WAC_CMD_LED_CONTROL 0x20
78+
#define WAC_CMD_ICON_START 0x21
79+
#define WAC_CMD_ICON_XFER 0x23
80+
#define WAC_CMD_ICON_BT_XFER 0x26
81+
#define WAC_CMD_DELETE_PAIRING 0x20
82+
#define WAC_CMD_UNPAIR_ALL 0xFF
83+
7584
/* device quirks */
7685
#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001
7786
#define WACOM_QUIRK_SENSE 0x0002

0 commit comments

Comments
 (0)