lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: wacom - use switch statement for wacom_tpc_irq()

Browse Source 
And add two new data formats.

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>
This commit is contained in:
Ping Cheng
2012-01-31 00:07:33 -08:00
committed by Dmitry Torokhov
parent 8b4a0c1fe3
commit 31175a8348
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/input/tablet/wacom_wac.c
View File

@@ -832,12 +832,24 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
dbg("wacom_tpc_irq: received report #%d", data[0]); dbg("wacom_tpc_irq: received report #%d", data[0]);
if (len == WACOM_PKGLEN_TPC1FG || data[0] == WACOM_REPORT_TPC1FG) switch (len) {
return wacom_tpc_single_touch(wacom, len); case WACOM_PKGLEN_TPC1FG:
else if (data[0] == WACOM_REPORT_TPC2FG) return wacom_tpc_single_touch(wacom, len);
return wacom_tpc_mt_touch(wacom);
else if (data[0] == WACOM_REPORT_PENABLED) case WACOM_PKGLEN_TPC2FG:
return wacom_tpc_pen(wacom); return wacom_tpc_mt_touch(wacom);
default:
switch (data[0]) {
case WACOM_REPORT_TPC1FG:
case WACOM_REPORT_TPCHID:
case WACOM_REPORT_TPCST:
return wacom_tpc_single_touch(wacom, len);
case WACOM_REPORT_PENABLED:
return wacom_tpc_pen(wacom);
}
}
return 0; return 0;
} }

2
drivers/input/tablet/wacom_wac.h
View File

@@ -39,6 +39,8 @@
#define WACOM_REPORT_INTUOSPAD 12 #define WACOM_REPORT_INTUOSPAD 12
#define WACOM_REPORT_TPC1FG 6 #define WACOM_REPORT_TPC1FG 6
#define WACOM_REPORT_TPC2FG 13 #define WACOM_REPORT_TPC2FG 13
#define WACOM_REPORT_TPCHID 15
#define WACOM_REPORT_TPCST 16
/* device quirks */ /* device quirks */
#define WACOM_QUIRK_MULTI_INPUT 0x0001 #define WACOM_QUIRK_MULTI_INPUT 0x0001