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
66bc5ba5
Commit
66bc5ba5
authored
May 17, 2016
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-4.7/wacom' into for-linus
parents
3390e579
bef7e200
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
7 deletions
+10
-7
drivers/hid/wacom_sys.c
drivers/hid/wacom_sys.c
+2
-1
drivers/hid/wacom_wac.c
drivers/hid/wacom_wac.c
+7
-6
drivers/hid/wacom_wac.h
drivers/hid/wacom_wac.h
+1
-0
No files found.
drivers/hid/wacom_sys.c
View file @
66bc5ba5
...
...
@@ -493,7 +493,8 @@ static void wacom_retrieve_hid_descriptor(struct hid_device *hdev,
features
->
x_fuzz
=
4
;
features
->
y_fuzz
=
4
;
features
->
pressure_fuzz
=
0
;
features
->
distance_fuzz
=
0
;
features
->
distance_fuzz
=
1
;
features
->
tilt_fuzz
=
1
;
/*
* The wireless device HID is basic and layout conflicts with
...
...
drivers/hid/wacom_wac.c
View file @
66bc5ba5
...
...
@@ -2344,12 +2344,13 @@ static void wacom_setup_basic_pro_pen(struct wacom_wac *wacom_wac)
__set_bit
(
BTN_STYLUS2
,
input_dev
->
keybit
);
input_set_abs_params
(
input_dev
,
ABS_DISTANCE
,
0
,
wacom_wac
->
features
.
distance_max
,
0
,
0
);
0
,
wacom_wac
->
features
.
distance_max
,
wacom_wac
->
features
.
distance_fuzz
,
0
);
}
static
void
wacom_setup_cintiq
(
struct
wacom_wac
*
wacom_wac
)
{
struct
input_dev
*
input_dev
=
wacom_wac
->
pen_input
;
struct
wacom_features
*
features
=
&
wacom_wac
->
features
;
wacom_setup_basic_pro_pen
(
wacom_wac
);
...
...
@@ -2359,9 +2360,9 @@ static void wacom_setup_cintiq(struct wacom_wac *wacom_wac)
__set_bit
(
BTN_TOOL_AIRBRUSH
,
input_dev
->
keybit
);
input_set_abs_params
(
input_dev
,
ABS_WHEEL
,
0
,
1023
,
0
,
0
);
input_set_abs_params
(
input_dev
,
ABS_TILT_X
,
-
64
,
63
,
0
,
0
);
input_set_abs_params
(
input_dev
,
ABS_TILT_X
,
-
64
,
63
,
features
->
tilt_fuzz
,
0
);
input_abs_set_res
(
input_dev
,
ABS_TILT_X
,
57
);
input_set_abs_params
(
input_dev
,
ABS_TILT_Y
,
-
64
,
63
,
0
,
0
);
input_set_abs_params
(
input_dev
,
ABS_TILT_Y
,
-
64
,
63
,
features
->
tilt_fuzz
,
0
);
input_abs_set_res
(
input_dev
,
ABS_TILT_Y
,
57
);
}
...
...
@@ -2507,7 +2508,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev,
case
WACOM_G4
:
input_set_abs_params
(
input_dev
,
ABS_DISTANCE
,
0
,
features
->
distance_max
,
0
,
0
);
features
->
distance_fuzz
,
0
);
/* fall through */
case
GRAPHIRE
:
...
...
@@ -2569,7 +2570,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev,
input_set_abs_params
(
input_dev
,
ABS_DISTANCE
,
0
,
features
->
distance_max
,
0
,
0
);
features
->
distance_fuzz
,
0
);
input_set_abs_params
(
input_dev
,
ABS_Z
,
-
900
,
899
,
0
,
0
);
input_abs_set_res
(
input_dev
,
ABS_Z
,
287
);
...
...
@@ -2628,7 +2629,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev,
__set_bit
(
BTN_STYLUS2
,
input_dev
->
keybit
);
input_set_abs_params
(
input_dev
,
ABS_DISTANCE
,
0
,
features
->
distance_max
,
0
,
0
);
features
->
distance_fuzz
,
0
);
}
break
;
case
BAMBOO_PAD
:
...
...
drivers/hid/wacom_wac.h
View file @
66bc5ba5
...
...
@@ -177,6 +177,7 @@ struct wacom_features {
int
y_fuzz
;
int
pressure_fuzz
;
int
distance_fuzz
;
int
tilt_fuzz
;
unsigned
quirks
;
unsigned
touch_max
;
int
oVid
;
...
...
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