This series had some touches to Bamboo paths so I tested it with a 1st
gen and 3rd gen. So you can put my:
Tested-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
For this patch:
Reviewed-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
On Fri, Dec 16, 2011 at 6:36 PM, Ping Cheng <pinglinux@xxxxxxxxx> wrote:
> Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
> ---
> drivers/input/tablet/wacom_sys.c | 6 +-----
> drivers/input/tablet/wacom_wac.c | 4 ++--
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
> index 7e63183..c9588ee 100644
> --- a/drivers/input/tablet/wacom_sys.c
> +++ b/drivers/input/tablet/wacom_sys.c
> @@ -176,7 +176,7 @@ static int wacom_parse_logical_collection(unsigned char *report,
>
> /* Logical collection is only used by 3rd gen Bamboo Touch */
> features->pktlen = WACOM_PKGLEN_BBTOUCH3;
> - features->device_type = BTN_TOOL_DOUBLETAP;
> + features->device_type = BTN_TOOL_FINGER;
>
> /*
> * Stylus and Touch have same active area
> @@ -286,12 +286,10 @@ static int wacom_parse_hid(struct usb_interface *intf,
> if (features->type == TABLETPC2FG) {
> /* need to reset back */
> features->pktlen = WACOM_PKGLEN_TPC2FG;
> - features->device_type = BTN_TOOL_DOUBLETAP;
> }
> if (features->type == BAMBOO_PT) {
> /* need to reset back */
> features->pktlen = WACOM_PKGLEN_BBTOUCH;
> - features->device_type = BTN_TOOL_DOUBLETAP;
> features->x_phy =
> get_unaligned_le16(&report[i + 5]);
> features->x_max =
> @@ -325,7 +323,6 @@ static int wacom_parse_hid(struct usb_interface *intf,
> if (features->type == TABLETPC2FG) {
> /* need to reset back */
> features->pktlen = WACOM_PKGLEN_TPC2FG;
> - features->device_type = BTN_TOOL_DOUBLETAP;
> features->y_max =
> get_unaligned_le16(&report[i + 3]);
> features->y_phy =
> @@ -334,7 +331,6 @@ static int wacom_parse_hid(struct usb_interface *intf,
> } else if (features->type == BAMBOO_PT) {
> /* need to reset back */
> features->pktlen = WACOM_PKGLEN_BBTOUCH;
> - features->device_type = BTN_TOOL_DOUBLETAP;
> features->y_phy =
> get_unaligned_le16(&report[i + 3]);
> features->y_max =
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index a22e778..e18f362 100644
> --- a/drivers/input/tablet/wacom_wac.c
> +++ b/drivers/input/tablet/wacom_wac.c
> @@ -1317,7 +1317,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
> break;
>
> case TABLETPC2FG:
> - if (features->device_type == BTN_TOOL_DOUBLETAP) {
> + if (features->device_type == BTN_TOOL_FINGER) {
>
> input_mt_init_slots(input_dev, 2);
> input_set_abs_params(input_dev, ABS_MT_TOOL_TYPE,
> @@ -1366,7 +1366,7 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,
>
> __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
>
> - if (features->device_type == BTN_TOOL_DOUBLETAP) {
> + if (features->device_type == BTN_TOOL_FINGER) {
> __set_bit(BTN_LEFT, input_dev->keybit);
> __set_bit(BTN_FORWARD, input_dev->keybit);
> __set_bit(BTN_BACK, input_dev->keybit);
> --
> 1.7.6.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
