diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2012-01-31 03:07:33 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-31 03:14:13 -0500 |
| commit | 8b4a0c1fe3b03c0cfe829413481d69c2e6fd844c (patch) | |
| tree | d1383fdc459d6acaa555cc087126a15aab6153f7 /drivers/input/tablet/wacom_sys.c | |
| parent | 393f9ffb7956c0ab8edb971d2c98d94aad9eeef8 (diff) | |
Input: wacom - use BTN_TOOL_FINGER to indicate touch device type
Tested-by: Chris Bagwell <chris@cnpbagwell.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom_sys.c')
| -rw-r--r-- | drivers/input/tablet/wacom_sys.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 7e63183a6c68..c9588eececfb 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, | |||
| 176 | 176 | ||
| 177 | /* Logical collection is only used by 3rd gen Bamboo Touch */ | 177 | /* Logical collection is only used by 3rd gen Bamboo Touch */ |
| 178 | features->pktlen = WACOM_PKGLEN_BBTOUCH3; | 178 | features->pktlen = WACOM_PKGLEN_BBTOUCH3; |
| 179 | features->device_type = BTN_TOOL_DOUBLETAP; | 179 | features->device_type = BTN_TOOL_FINGER; |
| 180 | 180 | ||
| 181 | /* | 181 | /* |
| 182 | * Stylus and Touch have same active area | 182 | * Stylus and Touch have same active area |
| @@ -286,12 +286,10 @@ static int wacom_parse_hid(struct usb_interface *intf, | |||
| 286 | if (features->type == TABLETPC2FG) { | 286 | if (features->type == TABLETPC2FG) { |
| 287 | /* need to reset back */ | 287 | /* need to reset back */ |
| 288 | features->pktlen = WACOM_PKGLEN_TPC2FG; | 288 | features->pktlen = WACOM_PKGLEN_TPC2FG; |
| 289 | features->device_type = BTN_TOOL_DOUBLETAP; | ||
| 290 | } | 289 | } |
| 291 | if (features->type == BAMBOO_PT) { | 290 | if (features->type == BAMBOO_PT) { |
| 292 | /* need to reset back */ | 291 | /* need to reset back */ |
| 293 | features->pktlen = WACOM_PKGLEN_BBTOUCH; | 292 | features->pktlen = WACOM_PKGLEN_BBTOUCH; |
| 294 | features->device_type = BTN_TOOL_DOUBLETAP; | ||
| 295 | features->x_phy = | 293 | features->x_phy = |
| 296 | get_unaligned_le16(&report[i + 5]); | 294 | get_unaligned_le16(&report[i + 5]); |
| 297 | features->x_max = | 295 | features->x_max = |
| @@ -325,7 +323,6 @@ static int wacom_parse_hid(struct usb_interface *intf, | |||
| 325 | if (features->type == TABLETPC2FG) { | 323 | if (features->type == TABLETPC2FG) { |
| 326 | /* need to reset back */ | 324 | /* need to reset back */ |
| 327 | features->pktlen = WACOM_PKGLEN_TPC2FG; | 325 | features->pktlen = WACOM_PKGLEN_TPC2FG; |
| 328 | features->device_type = BTN_TOOL_DOUBLETAP; | ||
| 329 | features->y_max = | 326 | features->y_max = |
| 330 | get_unaligned_le16(&report[i + 3]); | 327 | get_unaligned_le16(&report[i + 3]); |
| 331 | features->y_phy = | 328 | features->y_phy = |
| @@ -334,7 +331,6 @@ static int wacom_parse_hid(struct usb_interface *intf, | |||
| 334 | } else if (features->type == BAMBOO_PT) { | 331 | } else if (features->type == BAMBOO_PT) { |
| 335 | /* need to reset back */ | 332 | /* need to reset back */ |
| 336 | features->pktlen = WACOM_PKGLEN_BBTOUCH; | 333 | features->pktlen = WACOM_PKGLEN_BBTOUCH; |
| 337 | features->device_type = BTN_TOOL_DOUBLETAP; | ||
| 338 | features->y_phy = | 334 | features->y_phy = |
| 339 | get_unaligned_le16(&report[i + 3]); | 335 | get_unaligned_le16(&report[i + 3]); |
| 340 | features->y_max = | 336 | features->y_max = |