| Message ID | 1346972010-1330-1-git-send-email-killertofu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 6, 2012 at 3:53 PM, Jason Gerecke <killertofu@gmail.com> wrote: > The ability to set the proximity flag should apply to any device > that has both pen and touch input. Rather than listing classes of > devices known to meet this criteria, simply filter on the quirk > defining all such devices. > > Signed-off-by: Jason Gerecke <killertofu@gmail.com> Tested-by: Ping Cheng <pingc@wacom.com> for the whole set. Dmitry, do you have questions about this patchset and "input: wacom: Report correct touch contact size for I5/Bamboo"? We hope they can be merged soon since we have more patches coming. Thank you. Ping > --- > drivers/input/tablet/wacom_wac.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c > index 532d067..a8bc6c9 100644 > --- a/drivers/input/tablet/wacom_wac.c > +++ b/drivers/input/tablet/wacom_wac.c > @@ -326,7 +326,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) > > /* Enter report */ > if ((data[1] & 0xfc) == 0xc0) { > - if (features->type >= INTUOS5S && features->type <= INTUOS5L) > + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) > wacom->shared->stylus_in_proximity = true; > > /* serial number of the tool */ > @@ -414,7 +414,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) > > /* Exit report */ > if ((data[1] & 0xfe) == 0x80) { > - if (features->type >= INTUOS5S && features->type <= INTUOS5L) > + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) > wacom->shared->stylus_in_proximity = false; > > /* > -- > 1.7.12 > -- 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
On Fri, Sep 28, 2012 at 2:18 PM, Ping Cheng <pinglinux@gmail.com> wrote: > On Thu, Sep 6, 2012 at 3:53 PM, Jason Gerecke <killertofu@gmail.com> wrote: >> The ability to set the proximity flag should apply to any device >> that has both pen and touch input. Rather than listing classes of >> devices known to meet this criteria, simply filter on the quirk >> defining all such devices. >> >> Signed-off-by: Jason Gerecke <killertofu@gmail.com> > > Tested-by: Ping Cheng <pingc@wacom.com> for the whole set. > > Dmitry, do you have questions about this patchset and "input: wacom: > Report correct touch contact size for I5/Bamboo"? We hope they can be > merged soon since we have more patches coming. > > Thank you. > > Ping > The 24HD touch patches from September 6th as well ("Input: wacom - Add touch sensor support for Cintiq 24HD touch"). I was hoping to get them accepted before yesterday's 3.7 merge window opened. Jason --- When you're rife with devastation / There's a simple explanation: You're a toymaker's creation / Trapped inside a crystal ball. And whichever way he tilts it / Know that we must be resilient We won't let them break our spirits / As we sing our silly song. >> --- >> drivers/input/tablet/wacom_wac.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c >> index 532d067..a8bc6c9 100644 >> --- a/drivers/input/tablet/wacom_wac.c >> +++ b/drivers/input/tablet/wacom_wac.c >> @@ -326,7 +326,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) >> >> /* Enter report */ >> if ((data[1] & 0xfc) == 0xc0) { >> - if (features->type >= INTUOS5S && features->type <= INTUOS5L) >> + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) >> wacom->shared->stylus_in_proximity = true; >> >> /* serial number of the tool */ >> @@ -414,7 +414,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) >> >> /* Exit report */ >> if ((data[1] & 0xfe) == 0x80) { >> - if (features->type >= INTUOS5S && features->type <= INTUOS5L) >> + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) >> wacom->shared->stylus_in_proximity = false; >> >> /* >> -- >> 1.7.12 >> -- 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
Hi Jason, On Mon, Oct 01, 2012 at 10:09:24AM -0700, Jason Gerecke wrote: > On Fri, Sep 28, 2012 at 2:18 PM, Ping Cheng <pinglinux@gmail.com> wrote: > > On Thu, Sep 6, 2012 at 3:53 PM, Jason Gerecke <killertofu@gmail.com> wrote: > >> The ability to set the proximity flag should apply to any device > >> that has both pen and touch input. Rather than listing classes of > >> devices known to meet this criteria, simply filter on the quirk > >> defining all such devices. > >> > >> Signed-off-by: Jason Gerecke <killertofu@gmail.com> > > > > Tested-by: Ping Cheng <pingc@wacom.com> for the whole set. > > > > Dmitry, do you have questions about this patchset and "input: wacom: > > Report correct touch contact size for I5/Bamboo"? We hope they can be > > merged soon since we have more patches coming. > > > > Thank you. > > > > Ping > > > The 24HD touch patches from September 6th as well ("Input: wacom - Add > touch sensor support for Cintiq 24HD touch"). I was hoping to get them > accepted before yesterday's 3.7 merge window opened. > Could you please take a peek at my 'next' branch and see if anything wacom-related is missing? Thanks!
On Thu, Oct 4, 2012 at 12:25 AM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Hi Jason, > > On Mon, Oct 01, 2012 at 10:09:24AM -0700, Jason Gerecke wrote: >> On Fri, Sep 28, 2012 at 2:18 PM, Ping Cheng <pinglinux@gmail.com> wrote: >> > On Thu, Sep 6, 2012 at 3:53 PM, Jason Gerecke <killertofu@gmail.com> wrote: >> >> The ability to set the proximity flag should apply to any device >> >> that has both pen and touch input. Rather than listing classes of >> >> devices known to meet this criteria, simply filter on the quirk >> >> defining all such devices. >> >> >> >> Signed-off-by: Jason Gerecke <killertofu@gmail.com> >> > >> > Tested-by: Ping Cheng <pingc@wacom.com> for the whole set. >> > >> > Dmitry, do you have questions about this patchset and "input: wacom: >> > Report correct touch contact size for I5/Bamboo"? We hope they can be >> > merged soon since we have more patches coming. >> > >> > Thank you. >> > >> > Ping >> > >> The 24HD touch patches from September 6th as well ("Input: wacom - Add >> touch sensor support for Cintiq 24HD touch"). I was hoping to get them >> accepted before yesterday's 3.7 merge window opened. >> > > Could you please take a peek at my 'next' branch and see if anything > wacom-related is missing? > > Thanks! > > -- > Dmitry That appears to be everything I had outstanding. I'll rewrite and resubmit the two Cintiq patches you had to drop due to merge issues. Jason --- When you're rife with devastation / There's a simple explanation: You're a toymaker's creation / Trapped inside a crystal ball. And whichever way he tilts it / Know that we must be resilient We won't let them break our spirits / As we sing our silly song. -- 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 --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 532d067..a8bc6c9 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -326,7 +326,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) /* Enter report */ if ((data[1] & 0xfc) == 0xc0) { - if (features->type >= INTUOS5S && features->type <= INTUOS5L) + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) wacom->shared->stylus_in_proximity = true; /* serial number of the tool */ @@ -414,7 +414,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) /* Exit report */ if ((data[1] & 0xfe) == 0x80) { - if (features->type >= INTUOS5S && features->type <= INTUOS5L) + if (features->quirks == WACOM_QUIRK_MULTI_INPUT) wacom->shared->stylus_in_proximity = false; /*
The ability to set the proximity flag should apply to any device that has both pen and touch input. Rather than listing classes of devices known to meet this criteria, simply filter on the quirk defining all such devices. Signed-off-by: Jason Gerecke <killertofu@gmail.com> --- drivers/input/tablet/wacom_wac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)