[PATCH] Input: wacom - Advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE5483d

3 messages, 3 authors, 2011-08-27 · open the first message on its own page

[PATCH] Input: wacom - Advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner

From: Jason Gerecke <hidden>
Date: 2011-08-26 21:31:36

The Wacom PenPartner should advertise its stylus tip and button
in addition to the eraser tool. These are both physically
present on the hardware, and emitted from 'wacom_penpartner_irq'.

Signed-off-by: Jason Gerecke <redacted>
---
 drivers/input/tablet/wacom_wac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index c1c2f7b..87b0e0d 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1191,13 +1191,13 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
 	case PL:
 	case PTU:
 	case DTU:
-		__set_bit(BTN_TOOL_PEN, input_dev->keybit);
-		__set_bit(BTN_STYLUS, input_dev->keybit);
 		__set_bit(BTN_STYLUS2, input_dev->keybit);
 		/* fall through */
 
 	case PENPARTNER:
+		__set_bit(BTN_TOOL_PEN, input_dev->keybit);
 		__set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+		__set_bit(BTN_STYLUS, input_dev->keybit);
 		break;
 
 	case BAMBOO_PT:
-- 
1.7.6

Re: [PATCH] Input: wacom - Advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner

From: Ping Cheng <hidden>
Date: 2011-08-26 21:48:43

On Fri, Aug 26, 2011 at 2:31 PM, Jason Gerecke [off-list ref] wrote:
The Wacom PenPartner should advertise its stylus tip and button
in addition to the eraser tool. These are both physically
present on the hardware, and emitted from 'wacom_penpartner_irq'.

Signed-off-by: Jason Gerecke <redacted>
Reviewed-by: Ping Cheng <redacted>

Ping
quoted hunk
---
 drivers/input/tablet/wacom_wac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index c1c2f7b..87b0e0d 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1191,13 +1191,13 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
       case PL:
       case PTU:
       case DTU:
-               __set_bit(BTN_TOOL_PEN, input_dev->keybit);
-               __set_bit(BTN_STYLUS, input_dev->keybit);
               __set_bit(BTN_STYLUS2, input_dev->keybit);
               /* fall through */

       case PENPARTNER:
+               __set_bit(BTN_TOOL_PEN, input_dev->keybit);
               __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
+               __set_bit(BTN_STYLUS, input_dev->keybit);
               break;

       case BAMBOO_PT:
--
1.7.6
--
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

Re: [PATCH] Input: wacom - Advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2011-08-27 06:30:17

On Fri, Aug 26, 2011 at 02:48:43PM -0700, Ping Cheng wrote:
On Fri, Aug 26, 2011 at 2:31 PM, Jason Gerecke [off-list ref] wrote:
quoted
The Wacom PenPartner should advertise its stylus tip and button
in addition to the eraser tool. These are both physically
present on the hardware, and emitted from 'wacom_penpartner_irq'.

Signed-off-by: Jason Gerecke <redacted>
Reviewed-by: Ping Cheng <redacted>
Applied, thanks Jason.

-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help