Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9931753b
Commit
9931753b
authored
Apr 05, 2018
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-4.17/wacom' into for-linus
Pull support for 3rd generation Intuos BT device
parents
e2d39e0f
7ba8fc09
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
179 additions
and
48 deletions
+179
-48
drivers/hid/wacom_wac.c
drivers/hid/wacom_wac.c
+176
-47
drivers/hid/wacom_wac.h
drivers/hid/wacom_wac.h
+3
-1
No files found.
drivers/hid/wacom_wac.c
View file @
9931753b
This diff is collapsed.
Click to expand it.
drivers/hid/wacom_wac.h
View file @
9931753b
...
...
@@ -118,6 +118,7 @@
#define WACOM_HID_WD_TOUCHSTRIP2 (WACOM_HID_UP_WACOMDIGITIZER | 0x0137)
#define WACOM_HID_WD_TOUCHRING (WACOM_HID_UP_WACOMDIGITIZER | 0x0138)
#define WACOM_HID_WD_TOUCHRINGSTATUS (WACOM_HID_UP_WACOMDIGITIZER | 0x0139)
#define WACOM_HID_WD_REPORT_VALID (WACOM_HID_UP_WACOMDIGITIZER | 0x01d0)
#define WACOM_HID_WD_ACCELEROMETER_X (WACOM_HID_UP_WACOMDIGITIZER | 0x0401)
#define WACOM_HID_WD_ACCELEROMETER_Y (WACOM_HID_UP_WACOMDIGITIZER | 0x0402)
#define WACOM_HID_WD_ACCELEROMETER_Z (WACOM_HID_UP_WACOMDIGITIZER | 0x0403)
...
...
@@ -213,6 +214,7 @@ enum {
INTUOSPM
,
INTUOSPL
,
INTUOSP2_BT
,
INTUOSHT3_BT
,
WACOM_21UX2
,
WACOM_22HD
,
DTK
,
...
...
@@ -352,7 +354,7 @@ struct wacom_wac {
bool
has_mute_touch_switch
;
bool
has_mode_change
;
bool
is_direct_mode
;
bool
is_invalid_bt_frame
;
};
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment