Backport the PTU and PENPARTNER cases of wacom_setup_input_capabilities
from later trees back to 2.6.30 and 2.6.30. This fixes a bug which was
fixed in the 2.6.38 tree by commit 23d098043e. It also gets the trees
closer in sync with each other.
Fixes: b62fb3f6cc ("Initial revision")
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.30/wacom_wac.c | 8 +++++++-
2.6.36/wacom_wac.c | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 9bc9564..6d63780 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2197,19 +2197,25 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
case DTUS:
case DTUSX:
case PL:
- case PTU:
case DTU:
case DTH1152:
if (features->type == DTUS) {
input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
}
__set_bit(BTN_TOOL_PEN, input_dev->keybit);
+ __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
__set_bit(BTN_STYLUS, input_dev->keybit);
+ __set_bit(BTN_STYLUS2, input_dev->keybit);
+ break;
+
+ case PTU:
__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 INTUOSHT:
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 4d4f9dd..4f7cede 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1984,19 +1984,25 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
case DTUS:
case DTUSX:
case PL:
- case PTU:
case DTU:
case DTH1152:
if (features->type == DTUS) {
input_set_capability(input_dev, EV_MSC, MSC_SERIAL);
}
__set_bit(BTN_TOOL_PEN, input_dev->keybit);
+ __set_bit(BTN_TOOL_RUBBER, input_dev->keybit);
__set_bit(BTN_STYLUS, input_dev->keybit);
+ __set_bit(BTN_STYLUS2, input_dev->keybit);
+ break;
+
+ case PTU:
__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:
--
2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
