drivers: Adding driver support for "One by Wacom CTL472/672" (parameters transferred from CTL471/671 since only difference is the force resolution)
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): SG2PR03MB1519A67D9FD33585E560743DD9770@SG2PR03MB1519.apcprd03.prod.outlook.com
Jiri Kosina
maintainerQuoted 1 line · ? ??
Signed-off-by Mx Jing <[email protected]>
Changelog is missing, please provide one.
Adding Jason and Ping to CC.
Quoted 33 lines
--- drivers/hid/wacom_wac.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/hid/wacom_wac.c +8
-0@@ -4376,6 +4376,12 @@ static const struct wacom_features wacom_features_0x360 =static const struct wacom_features wacom_features_0x361 = {"Wacom Intuos Pro L" ,62200 ,43200 ,8191 ,63 ,INTUOSP2_BT ,WACOM_INTUOS3_RES ,WACOM_INTUOS3_RES ,9 , .touch_max =10 }; +static const struct wacom_features wacom_features_0x37A = + {"One by Wacom CTL472" ,14720 ,9225 ,2047 ,63 , +BAMBOO_PEN ,WACOM_INTUOS_RES ,WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x37B = + {"One by Wacom CTL672" ,21648 ,13530 ,2047 ,63 , +BAMBOO_PEN ,WACOM_INTUOS_RES ,WACOM_INTUOS_RES };static const struct wacom_features wacom_features_HID_ANY_ID = {"Wacom HID" , .type =HID_GENERIC , .oVid =HID_ANY_ID , .oPid =HID_ANY_ID };@@ -4544,6 +4550,8 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x343) }, { BT_DEVICE_WACOM(0x360) }, { BT_DEVICE_WACOM(0x361) }, + { USB_DEVICE_WACOM(0x37A) }, + { USB_DEVICE_WACOM(0x37B) }, { USB_DEVICE_WACOM(0x4001) }, { USB_DEVICE_WACOM(0x4004) }, { USB_DEVICE_WACOM(0x5000) },Signature · 1 line
2.11.0
Signature · 2 lines
Jiri Kosina SUSE Labs
Jason Gerecke
Acked-byQuoted 8 lines · Jiri Kosina
Quoted 1 line · ? ??
Signed-off-by Mx Jing <[email protected]>Changelog is missing, please provide one.
Adding Jason and Ping to CC.
A few inline nits:
Quoted 4 lines
Quoted 4 lines
--- drivers/hid/wacom_wac.c | 8 ++++++++ 1 file changed, 8 insertions(+)
Quoted 10 lines
drivers/hid/wacom_wac.c static const struct wacom_features wacom_features_0x360 = · line 4380
Quoted 10 lines
drivers/hid/wacom_wac.c +2
-0@@ -4376,6 +4376,12 @@ static const struct wacom_features wacom_features_0x360 =static const struct wacom_features wacom_features_0x361 = {"Wacom Intuos Pro L" ,62200 ,43200 ,8191 ,63 ,INTUOSP2_BT ,WACOM_INTUOS3_RES ,WACOM_INTUOS3_RES ,9 , .touch_max =10 }; +static const struct wacom_features wacom_features_0x37A = + {"One by Wacom CTL472" ,14720 ,9225 ,2047 ,63 ,
Replace "CTL472" in name with "S". Resolution should be 15200 x 9500, not 14720 x 9225.
Quoted 3 lines
drivers/hid/wacom_wac.c static const struct wacom_features wacom_features_0x360 = · line 4383
Quoted 3 lines
drivers/hid/wacom_wac.c +3
-0+ BAMBOO_PEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x37B = + {"One by Wacom CTL672" ,21648 ,13530 ,2047 ,63 ,
Replace "CTL672" in name with "M". Resolution should be 21600 x 13500, not 21648 x 13530.
Quoted 2 lines
drivers/hid/wacom_wac.c static const struct wacom_features wacom_features_0x360 = · line 4385
Quoted 2 lines
drivers/hid/wacom_wac.c +1
-0+ BAMBOO_PEN, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
Nits aside, this seems reasonable:
Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three, /
So you look at the sixty-fours....
Quoted 23 lines
Quoted 12 lines
drivers/hid/wacom_wac.c +2
-1static const struct wacom_features wacom_features_HID_ANY_ID = {"Wacom HID" , .type =HID_GENERIC , .oVid =HID_ANY_ID , .oPid =HID_ANY_ID };@@ -4544,6 +4550,8 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x343) }, { BT_DEVICE_WACOM(0x360) }, { BT_DEVICE_WACOM(0x361) }, + { USB_DEVICE_WACOM(0x37A) }, + { USB_DEVICE_WACOM(0x37B) }, { USB_DEVICE_WACOM(0x4001) }, { USB_DEVICE_WACOM(0x4004) }, { USB_DEVICE_WACOM(0x5000) }, --Quoted 2 lines
2.11.0
--
Jiri Kosina
SUSE Labs--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/1 Add support for One by Wacom (CTL-472 / CTL-672)
In reply to Jiri KosinaAdds support for the second-generation "One by Wacom" tablets. These devices are similar to the last generation, but a slightly different size and reporting a higher number of pressure levels.
--- drivers/hid/wacom_wac.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/wacom_wac.c +8 -0
@@ -4376,6 +4376,12 @@ static const struct wacom_features wacom_features_0x360 =static const struct wacom_features wacom_features_0x361 = {"Wacom Intuos Pro L" ,62200 ,43200 ,8191 ,63 ,INTUOSP2_BT ,WACOM_INTUOS3_RES ,WACOM_INTUOS3_RES ,9 , .touch_max =10 }; +static const struct wacom_features wacom_features_0x37A = + {"Wacom One by Wacom S" ,15200 ,9500 ,2047 ,63 , +BAMBOO_PEN ,WACOM_INTUOS_RES ,WACOM_INTUOS_RES }; +static const struct wacom_features wacom_features_0x37B = + {"Wacom One by Wacom M" ,21600 ,13500 ,2047 ,63 , +BAMBOO_PEN ,WACOM_INTUOS_RES ,WACOM_INTUOS_RES };static const struct wacom_features wacom_features_HID_ANY_ID = {"Wacom HID" , .type =HID_GENERIC , .oVid =HID_ANY_ID , .oPid =HID_ANY_ID };
@@ -4544,6 +4550,8 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x343) }, { BT_DEVICE_WACOM(0x360) }, { BT_DEVICE_WACOM(0x361) }, + { USB_DEVICE_WACOM(0x37A) }, + { USB_DEVICE_WACOM(0x37B) }, { USB_DEVICE_WACOM(0x4001) }, { USB_DEVICE_WACOM(0x4004) }, { USB_DEVICE_WACOM(0x5000) },
Signature · 1 line
2.15.1
Re: [PATCH] Add support for One by Wacom (CTL-472 / CTL-672)
Quoted 3 lines · Jason Gerecke
Adds support for the second-generation "One by Wacom" tablets. These devices are similar to the last generation, but a slightly different size and reporting a higher number of pressure levels.
Please don't forget to put proper prefixes in the patch title ("HID:
wacom", as usual) next time.
Applied to for-4.16/wacom, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs