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
86766756
Commit
86766756
authored
Jul 10, 2019
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-5.3/uclogic' into for-linus
parents
74acee30
88bb346d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
0 deletions
+5
-0
drivers/hid/hid-ids.h
drivers/hid/hid-ids.h
+1
-0
drivers/hid/hid-uclogic-core.c
drivers/hid/hid-uclogic-core.c
+2
-0
drivers/hid/hid-uclogic-params.c
drivers/hid/hid-uclogic-params.c
+2
-0
No files found.
drivers/hid/hid-ids.h
View file @
86766756
...
@@ -1157,6 +1157,7 @@
...
@@ -1157,6 +1157,7 @@
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
#define USB_DEVICE_ID_UGEE_TABLET_G5 0x0074
#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071
#define USB_DEVICE_ID_UGEE_TABLET_EX07S 0x0071
#define USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720 0x0055
#define USB_VENDOR_ID_UNITEC 0x227d
#define USB_VENDOR_ID_UNITEC 0x227d
#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
#define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
...
...
drivers/hid/hid-uclogic-core.c
View file @
86766756
...
@@ -389,6 +389,8 @@ static const struct hid_device_id uclogic_devices[] = {
...
@@ -389,6 +389,8 @@ static const struct hid_device_id uclogic_devices[] = {
USB_DEVICE_ID_UGEE_TABLET_G5
)
},
USB_DEVICE_ID_UGEE_TABLET_G5
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
USB_DEVICE_ID_UGEE_TABLET_EX07S
)
},
USB_DEVICE_ID_UGEE_TABLET_EX07S
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540
)
},
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540
)
},
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
{
HID_USB_DEVICE
(
USB_VENDOR_ID_UGEE
,
...
...
drivers/hid/hid-uclogic-params.c
View file @
86766756
...
@@ -1001,6 +1001,8 @@ int uclogic_params_init(struct uclogic_params *params,
...
@@ -1001,6 +1001,8 @@ int uclogic_params_init(struct uclogic_params *params,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540
):
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540
):
case
VID_PID
(
USB_VENDOR_ID_UGEE
,
case
VID_PID
(
USB_VENDOR_ID_UGEE
,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640
):
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640
):
case
VID_PID
(
USB_VENDOR_ID_UGEE
,
USB_DEVICE_ID_UGEE_TABLET_RAINBOW_CV720
):
/* If this is the pen interface */
/* If this is the pen interface */
if
(
bInterfaceNumber
==
1
)
{
if
(
bInterfaceNumber
==
1
)
{
/* Probe v1 pen parameters */
/* Probe v1 pen parameters */
...
...
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