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
7ff6dae4
Commit
7ff6dae4
authored
Mar 05, 2019
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-5.1/hid-topseed' into for-linus
Toshiba WT10A tablet bluetooth keyboard support from Hans de Goede
parents
97809a31
aa2d495f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
drivers/hid/hid-ids.h
drivers/hid/hid-ids.h
+1
-0
drivers/hid/hid-topseed.c
drivers/hid/hid-topseed.c
+3
-0
No files found.
drivers/hid/hid-ids.h
View file @
7ff6dae4
...
@@ -274,6 +274,7 @@
...
@@ -274,6 +274,7 @@
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053
#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
#define USB_DEVICE_ID_ASUS_AK1D 0x1125
#define USB_DEVICE_ID_ASUS_AK1D 0x1125
#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A 0x1408
#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421
#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421
#define USB_VENDOR_ID_CHUNGHWAT 0x2247
#define USB_VENDOR_ID_CHUNGHWAT 0x2247
...
...
drivers/hid/hid-topseed.c
View file @
7ff6dae4
...
@@ -34,7 +34,9 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
...
@@ -34,7 +34,9 @@ static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi,
return
0
;
return
0
;
switch
(
usage
->
hid
&
HID_USAGE
)
{
switch
(
usage
->
hid
&
HID_USAGE
)
{
case
0x00c
:
ts_map_key_clear
(
KEY_WLAN
);
break
;
case
0x00d
:
ts_map_key_clear
(
KEY_MEDIA
);
break
;
case
0x00d
:
ts_map_key_clear
(
KEY_MEDIA
);
break
;
case
0x010
:
ts_map_key_clear
(
KEY_ZOOM
);
break
;
case
0x024
:
ts_map_key_clear
(
KEY_MENU
);
break
;
case
0x024
:
ts_map_key_clear
(
KEY_MENU
);
break
;
case
0x025
:
ts_map_key_clear
(
KEY_TV
);
break
;
case
0x025
:
ts_map_key_clear
(
KEY_TV
);
break
;
case
0x027
:
ts_map_key_clear
(
KEY_MODE
);
break
;
case
0x027
:
ts_map_key_clear
(
KEY_MODE
);
break
;
...
@@ -67,6 +69,7 @@ static const struct hid_device_id ts_devices[] = {
...
@@ -67,6 +69,7 @@ static const struct hid_device_id ts_devices[] = {
{
HID_USB_DEVICE
(
USB_VENDOR_ID_BTC
,
USB_DEVICE_ID_BTC_EMPREX_REMOTE_2
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_BTC
,
USB_DEVICE_ID_BTC_EMPREX_REMOTE_2
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_TOPSEED2
,
USB_DEVICE_ID_TOPSEED2_RF_COMBO
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_TOPSEED2
,
USB_DEVICE_ID_TOPSEED2_RF_COMBO
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_CHICONY
,
USB_DEVICE_ID_CHICONY_WIRELESS
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_CHICONY
,
USB_DEVICE_ID_CHICONY_WIRELESS
)
},
{
HID_BLUETOOTH_DEVICE
(
USB_VENDOR_ID_CHICONY
,
USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A
)
},
{
}
{
}
};
};
MODULE_DEVICE_TABLE
(
hid
,
ts_devices
);
MODULE_DEVICE_TABLE
(
hid
,
ts_devices
);
...
...
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