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
Kirill Smelkov
linux
Commits
46011e97
Commit
46011e97
authored
Oct 23, 2018
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-4.20/multitouch' into for-linus
hid-multitouch driver cleanup
parents
5099bc83
7ffa13be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
40 deletions
+32
-40
drivers/hid/hid-multitouch.c
drivers/hid/hid-multitouch.c
+32
-40
No files found.
drivers/hid/hid-multitouch.c
View file @
46011e97
...
...
@@ -1319,6 +1319,13 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
return
mt_touch_input_mapping
(
hdev
,
hi
,
field
,
usage
,
bit
,
max
,
application
);
/*
* some egalax touchscreens have "application == DG_TOUCHSCREEN"
* for the stylus. Overwrite the hid_input application
*/
if
(
field
->
physical
==
HID_DG_STYLUS
)
hi
->
application
=
HID_DG_STYLUS
;
/* let hid-core decide for the others */
return
0
;
}
...
...
@@ -1507,14 +1514,12 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
struct
mt_device
*
td
=
hid_get_drvdata
(
hdev
);
char
*
name
;
const
char
*
suffix
=
NULL
;
unsigned
int
application
=
0
;
struct
mt_report_data
*
rdata
;
struct
mt_application
*
mt_application
=
NULL
;
struct
hid_report
*
report
;
int
ret
;
list_for_each_entry
(
report
,
&
hi
->
reports
,
hidinput_list
)
{
application
=
report
->
application
;
rdata
=
mt_find_report_data
(
td
,
report
);
if
(
!
rdata
)
{
hid_err
(
hdev
,
"failed to allocate data for report
\n
"
);
...
...
@@ -1529,46 +1534,33 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
if
(
ret
)
return
ret
;
}
/*
* some egalax touchscreens have "application == DG_TOUCHSCREEN"
* for the stylus. Check this first, and then rely on
* the application field.
*/
if
(
report
->
field
[
0
]
->
physical
==
HID_DG_STYLUS
)
{
suffix
=
"Pen"
;
/* force BTN_STYLUS to allow tablet matching in udev */
__set_bit
(
BTN_STYLUS
,
hi
->
input
->
keybit
);
}
}
if
(
!
suffix
)
{
switch
(
application
)
{
case
HID_GD_KEYBOARD
:
case
HID_GD_KEYPAD
:
case
HID_GD_MOUSE
:
case
HID_DG_TOUCHPAD
:
case
HID_GD_SYSTEM_CONTROL
:
case
HID_CP_CONSUMER_CONTROL
:
case
HID_GD_WIRELESS_RADIO_CTLS
:
case
HID_GD_SYSTEM_MULTIAXIS
:
/* already handled by hid core */
break
;
case
HID_DG_TOUCHSCREEN
:
/* we do not set suffix = "Touchscreen" */
hi
->
input
->
name
=
hdev
->
name
;
break
;
case
HID_DG_STYLUS
:
/* force BTN_STYLUS to allow tablet matching in udev */
__set_bit
(
BTN_STYLUS
,
hi
->
input
->
keybit
);
break
;
case
HID_VD_ASUS_CUSTOM_MEDIA_KEYS
:
suffix
=
"Custom Media Keys"
;
break
;
default:
suffix
=
"UNKNOWN"
;
break
;
}
switch
(
hi
->
application
)
{
case
HID_GD_KEYBOARD
:
case
HID_GD_KEYPAD
:
case
HID_GD_MOUSE
:
case
HID_DG_TOUCHPAD
:
case
HID_GD_SYSTEM_CONTROL
:
case
HID_CP_CONSUMER_CONTROL
:
case
HID_GD_WIRELESS_RADIO_CTLS
:
case
HID_GD_SYSTEM_MULTIAXIS
:
/* already handled by hid core */
break
;
case
HID_DG_TOUCHSCREEN
:
/* we do not set suffix = "Touchscreen" */
hi
->
input
->
name
=
hdev
->
name
;
break
;
case
HID_DG_STYLUS
:
/* force BTN_STYLUS to allow tablet matching in udev */
__set_bit
(
BTN_STYLUS
,
hi
->
input
->
keybit
);
break
;
case
HID_VD_ASUS_CUSTOM_MEDIA_KEYS
:
suffix
=
"Custom Media Keys"
;
break
;
default:
suffix
=
"UNKNOWN"
;
break
;
}
if
(
suffix
)
{
...
...
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