diff mbox

INPUT: wacom: Added definition for Wacom CTH680 The Wacom Creative Pen & Touch Tablet M (CTH680, 056A:0303) is a newer revision of the Bamboo series. This patch adds product 0303 to wacom.ko.

Message ID 1383419089-31248-1-git-send-email-matthew@incomplete.io
State New, archived
Headers show

Commit Message

matthew@incomplete.io Nov. 2, 2013, 7:04 p.m. UTC
From: Matthew Geddes <matthew@incomplete.io>

Signed-off-by: Matthew Geddes <matthew@incomplete.io>
---
 drivers/input/tablet/wacom_wac.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

chris@cnpbagwell.com Nov. 7, 2013, 4:03 p.m. UTC | #1
On Sat, Nov 2, 2013 at 2:04 PM,  <matthew@incomplete.io> wrote:
> From: Matthew Geddes <matthew@incomplete.io>
>

Your whole commit message appears to be crammed into first summary
line.  Could you please align with git conventions: put a line break
after "CTH680", a blank line, and then the remaining description
afterwards.

> Signed-off-by: Matthew Geddes <matthew@incomplete.io>
> ---
>  drivers/input/tablet/wacom_wac.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index c59b797..5015269 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -2128,6 +2128,9 @@ static const struct wacom_features wacom_features_0x300 =
>  static const struct wacom_features wacom_features_0x301 =
>         { "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
>           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> +static const struct wacom_features wacom_features_0x303 =
> +       { "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530,

A search for model CTH680 shows this device is the newly released
"Intuos Pen & Touch Medium"; which is also the new name for Bamboo's
and with new form factor.  I do see occasional site that added
Creative in there: "Intuos Creative Pen & Touch Medium".  Can you
confirm if this is the model you have?

I'd suggest using Wacom's terms closer (add in Intuos and swap Pen &
Touch to their order; maybe drop phrase Creative).

Also, the 21648/13530 values look copy&pasted from previous line.  Can
you use "evtest" or similar to find real maximum values.  Previous
"Bamboo Touch" models had 13700 as second number.  Since your tablet
has different shape from previous Bamboo and the "Bamboo One" then
there is good change you need unique values to get full usable area of
tablet.

> +         1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };

Can you update patch to exactly follow form of structures surrounding
it?  Namely, put the "1023" value on first line like rest of lines do.

Thanks!
Chris


>  static const struct wacom_features wacom_features_0x6004 =
>         { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
>           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
> @@ -2258,6 +2261,7 @@ const struct usb_device_id wacom_ids[] = {
>         { USB_DEVICE_WACOM(0x10F) },
>         { USB_DEVICE_WACOM(0x300) },
>         { USB_DEVICE_WACOM(0x301) },
> +       { USB_DEVICE_WACOM(0x303) },
>         { USB_DEVICE_WACOM(0x304) },
>         { USB_DEVICE_WACOM(0x4001) },
>         { USB_DEVICE_WACOM(0x47) },
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ping Cheng Nov. 7, 2013, 10:11 p.m. UTC | #2
On Thu, Nov 7, 2013 at 8:03 AM, Chris Bagwell <chris@cnpbagwell.com> wrote:
> On Sat, Nov 2, 2013 at 2:04 PM,  <matthew@incomplete.io> wrote:
>> From: Matthew Geddes <matthew@incomplete.io>
>>
>
> Your whole commit message appears to be crammed into first summary
> line.  Could you please align with git conventions: put a line break
> after "CTH680", a blank line, and then the remaining description
> afterwards.
>
>> Signed-off-by: Matthew Geddes <matthew@incomplete.io>

Nacked-by: Ping Cheng <pingc@wacom.com>

Patch [1] that supports this device (and its friends) was posted early
last month. It was updated on Oct. 10 in version 2. Users at
linuxwacom.sf.net have tested the patch since then.

Dmitry,

We has 4 patches waiting to be merged. Do you have questions for any of them?

Ping

[1] http://www.spinics.net/lists/linux-input/msg27789.html

>> ---
>>  drivers/input/tablet/wacom_wac.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
>> index c59b797..5015269 100644
>> --- a/drivers/input/tablet/wacom_wac.c
>> +++ b/drivers/input/tablet/wacom_wac.c
>> @@ -2128,6 +2128,9 @@ static const struct wacom_features wacom_features_0x300 =
>>  static const struct wacom_features wacom_features_0x301 =
>>         { "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
>>           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>> +static const struct wacom_features wacom_features_0x303 =
>> +       { "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530,
>
> A search for model CTH680 shows this device is the newly released
> "Intuos Pen & Touch Medium"; which is also the new name for Bamboo's
> and with new form factor.  I do see occasional site that added
> Creative in there: "Intuos Creative Pen & Touch Medium".  Can you
> confirm if this is the model you have?
>
> I'd suggest using Wacom's terms closer (add in Intuos and swap Pen &
> Touch to their order; maybe drop phrase Creative).
>
> Also, the 21648/13530 values look copy&pasted from previous line.  Can
> you use "evtest" or similar to find real maximum values.  Previous
> "Bamboo Touch" models had 13700 as second number.  Since your tablet
> has different shape from previous Bamboo and the "Bamboo One" then
> there is good change you need unique values to get full usable area of
> tablet.
>
>> +         1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>
> Can you update patch to exactly follow form of structures surrounding
> it?  Namely, put the "1023" value on first line like rest of lines do.
>
> Thanks!
> Chris
>
>
>>  static const struct wacom_features wacom_features_0x6004 =
>>         { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
>>           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>> @@ -2258,6 +2261,7 @@ const struct usb_device_id wacom_ids[] = {
>>         { USB_DEVICE_WACOM(0x10F) },
>>         { USB_DEVICE_WACOM(0x300) },
>>         { USB_DEVICE_WACOM(0x301) },
>> +       { USB_DEVICE_WACOM(0x303) },
>>         { USB_DEVICE_WACOM(0x304) },
>>         { USB_DEVICE_WACOM(0x4001) },
>>         { USB_DEVICE_WACOM(0x47) },
>> --
>> 1.8.3.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
chris@cnpbagwell.com Nov. 8, 2013, 2:04 a.m. UTC | #3
On Thu, Nov 7, 2013 at 4:11 PM, Ping Cheng <pinglinux@gmail.com> wrote:
> On Thu, Nov 7, 2013 at 8:03 AM, Chris Bagwell <chris@cnpbagwell.com> wrote:
>> On Sat, Nov 2, 2013 at 2:04 PM,  <matthew@incomplete.io> wrote:
>>> From: Matthew Geddes <matthew@incomplete.io>
>>>
>>
>> Your whole commit message appears to be crammed into first summary
>> line.  Could you please align with git conventions: put a line break
>> after "CTH680", a blank line, and then the remaining description
>> afterwards.
>>
>>> Signed-off-by: Matthew Geddes <matthew@incomplete.io>
>
> Nacked-by: Ping Cheng <pingc@wacom.com>
>
> Patch [1] that supports this device (and its friends) was posted early
> last month. It was updated on Oct. 10 in version 2. Users at
> linuxwacom.sf.net have tested the patch since then.

Thanks Ping.  Those slipped past me and when I googled to see if you'd
submitted anything yet I only found the Intuos Pro patches.

>
> Dmitry,
>
> We has 4 patches waiting to be merged. Do you have questions for any of them?

Looking at mail archive, I found 2/2 patches related to the "new
Intuos"/Bamboos.  I also see Dmitry applied the 1/2 patch to his next
branch but not the 2/2...  I suspect he was waiting an ack from Peter
after a question he had.

I'll review that remaining 2/2 and see if I can help move it along.

Chris

>
> Ping
>
> [1] http://www.spinics.net/lists/linux-input/msg27789.html
>
>>> ---
>>>  drivers/input/tablet/wacom_wac.c | 4 ++++
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
>>> index c59b797..5015269 100644
>>> --- a/drivers/input/tablet/wacom_wac.c
>>> +++ b/drivers/input/tablet/wacom_wac.c
>>> @@ -2128,6 +2128,9 @@ static const struct wacom_features wacom_features_0x300 =
>>>  static const struct wacom_features wacom_features_0x301 =
>>>         { "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
>>>           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>> +static const struct wacom_features wacom_features_0x303 =
>>> +       { "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530,
>>
>> A search for model CTH680 shows this device is the newly released
>> "Intuos Pen & Touch Medium"; which is also the new name for Bamboo's
>> and with new form factor.  I do see occasional site that added
>> Creative in there: "Intuos Creative Pen & Touch Medium".  Can you
>> confirm if this is the model you have?
>>
>> I'd suggest using Wacom's terms closer (add in Intuos and swap Pen &
>> Touch to their order; maybe drop phrase Creative).
>>
>> Also, the 21648/13530 values look copy&pasted from previous line.  Can
>> you use "evtest" or similar to find real maximum values.  Previous
>> "Bamboo Touch" models had 13700 as second number.  Since your tablet
>> has different shape from previous Bamboo and the "Bamboo One" then
>> there is good change you need unique values to get full usable area of
>> tablet.
>>
>>> +         1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>
>> Can you update patch to exactly follow form of structures surrounding
>> it?  Namely, put the "1023" value on first line like rest of lines do.
>>
>> Thanks!
>> Chris
>>
>>
>>>  static const struct wacom_features wacom_features_0x6004 =
>>>         { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
>>>           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>> @@ -2258,6 +2261,7 @@ const struct usb_device_id wacom_ids[] = {
>>>         { USB_DEVICE_WACOM(0x10F) },
>>>         { USB_DEVICE_WACOM(0x300) },
>>>         { USB_DEVICE_WACOM(0x301) },
>>> +       { USB_DEVICE_WACOM(0x303) },
>>>         { USB_DEVICE_WACOM(0x304) },
>>>         { USB_DEVICE_WACOM(0x4001) },
>>>         { USB_DEVICE_WACOM(0x47) },
>>> --
>>> 1.8.3.2
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ping Cheng Nov. 8, 2013, 2:18 a.m. UTC | #4
On Thu, Nov 7, 2013 at 6:04 PM, Chris Bagwell <chris@cnpbagwell.com> wrote:
> On Thu, Nov 7, 2013 at 4:11 PM, Ping Cheng <pinglinux@gmail.com> wrote:
>> On Thu, Nov 7, 2013 at 8:03 AM, Chris Bagwell <chris@cnpbagwell.com> wrote:
>>> On Sat, Nov 2, 2013 at 2:04 PM,  <matthew@incomplete.io> wrote:
>>>> From: Matthew Geddes <matthew@incomplete.io>
>>>>
>>>
>>> Your whole commit message appears to be crammed into first summary
>>> line.  Could you please align with git conventions: put a line break
>>> after "CTH680", a blank line, and then the remaining description
>>> afterwards.
>>>
>>>> Signed-off-by: Matthew Geddes <matthew@incomplete.io>
>>
>> Nacked-by: Ping Cheng <pingc@wacom.com>
>>
>> Patch [1] that supports this device (and its friends) was posted early
>> last month. It was updated on Oct. 10 in version 2. Users at
>> linuxwacom.sf.net have tested the patch since then.
>
> Thanks Ping.  Those slipped past me and when I googled to see if you'd
> submitted anything yet I only found the Intuos Pro patches.
>
>>
>> Dmitry,
>>
>> We has 4 patches waiting to be merged. Do you have questions for any of them?
>
> Looking at mail archive, I found 2/2 patches related to the "new
> Intuos"/Bamboos.  I also see Dmitry applied the 1/2 patch to his next
> branch but not the 2/2...  I suspect he was waiting an ack from Peter
> after a question he had.
>
> I'll review that remaining 2/2 and see if I can help move it along.

Thank you Chris for helping us out. It is easy to miss patches when
they stayed outstanding in the mailing list for too long

Peter, do you have more questions about the patch [1]?

>> [1] http://www.spinics.net/lists/linux-input/msg27789.html
>>
>>>> ---
>>>>  drivers/input/tablet/wacom_wac.c | 4 ++++
>>>>  1 file changed, 4 insertions(+)
>>>>
>>>> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
>>>> index c59b797..5015269 100644
>>>> --- a/drivers/input/tablet/wacom_wac.c
>>>> +++ b/drivers/input/tablet/wacom_wac.c
>>>> @@ -2128,6 +2128,9 @@ static const struct wacom_features wacom_features_0x300 =
>>>>  static const struct wacom_features wacom_features_0x301 =
>>>>         { "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
>>>>           31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>>> +static const struct wacom_features wacom_features_0x303 =
>>>> +       { "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530,
>>>
>>> A search for model CTH680 shows this device is the newly released
>>> "Intuos Pen & Touch Medium"; which is also the new name for Bamboo's
>>> and with new form factor.  I do see occasional site that added
>>> Creative in there: "Intuos Creative Pen & Touch Medium".  Can you
>>> confirm if this is the model you have?
>>>
>>> I'd suggest using Wacom's terms closer (add in Intuos and swap Pen &
>>> Touch to their order; maybe drop phrase Creative).
>>>
>>> Also, the 21648/13530 values look copy&pasted from previous line.  Can
>>> you use "evtest" or similar to find real maximum values.  Previous
>>> "Bamboo Touch" models had 13700 as second number.  Since your tablet
>>> has different shape from previous Bamboo and the "Bamboo One" then
>>> there is good change you need unique values to get full usable area of
>>> tablet.
>>>
>>>> +         1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>>
>>> Can you update patch to exactly follow form of structures surrounding
>>> it?  Namely, put the "1023" value on first line like rest of lines do.
>>>
>>> Thanks!
>>> Chris
>>>
>>>
>>>>  static const struct wacom_features wacom_features_0x6004 =
>>>>         { "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
>>>>           0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
>>>> @@ -2258,6 +2261,7 @@ const struct usb_device_id wacom_ids[] = {
>>>>         { USB_DEVICE_WACOM(0x10F) },
>>>>         { USB_DEVICE_WACOM(0x300) },
>>>>         { USB_DEVICE_WACOM(0x301) },
>>>> +       { USB_DEVICE_WACOM(0x303) },
>>>>         { USB_DEVICE_WACOM(0x304) },
>>>>         { USB_DEVICE_WACOM(0x4001) },
>>>>         { USB_DEVICE_WACOM(0x47) },
>>>> --
>>>> 1.8.3.2
>>>>
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-input" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index c59b797..5015269 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -2128,6 +2128,9 @@  static const struct wacom_features wacom_features_0x300 =
 static const struct wacom_features wacom_features_0x301 =
 	{ "Wacom Bamboo One M",    WACOM_PKGLEN_BBPEN,    21648, 13530, 1023,
 	  31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+static const struct wacom_features wacom_features_0x303 =
+	{ "Wacom Creative Touch & Pen M", WACOM_PKGLEN_BBPEN, 21648, 13530,
+	  1023, 31, BAMBOO_PT, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x6004 =
 	{ "ISD-V4",               WACOM_PKGLEN_GRAPHIRE,  12800,  8000,  255,
 	  0, TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2258,6 +2261,7 @@  const struct usb_device_id wacom_ids[] = {
 	{ USB_DEVICE_WACOM(0x10F) },
 	{ USB_DEVICE_WACOM(0x300) },
 	{ USB_DEVICE_WACOM(0x301) },
+	{ USB_DEVICE_WACOM(0x303) },
 	{ USB_DEVICE_WACOM(0x304) },
 	{ USB_DEVICE_WACOM(0x4001) },
 	{ USB_DEVICE_WACOM(0x47) },