70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From: Ping Cheng <pinglinux@gmail.com>
|
|
Date: Tue, 31 Jan 2012 00:07:33 -0800
|
|
Subject: Input: wacom - use switch statement for wacom_tpc_irq()
|
|
|
|
commit 31175a8348af76aea2f557857c90467d13632dc3 upstream.
|
|
|
|
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>
|
|
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
|
|
---
|
|
drivers/input/tablet/wacom_wac.c | 24 ++++++++++++++++++------
|
|
drivers/input/tablet/wacom_wac.h | 2 ++
|
|
2 files changed, 20 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
|
|
index 3c9f4b8cfe8f..07a1f218b5c1 100644
|
|
--- a/drivers/input/tablet/wacom_wac.c
|
|
+++ b/drivers/input/tablet/wacom_wac.c
|
|
@@ -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]);
|
|
|
|
- if (len == WACOM_PKGLEN_TPC1FG || data[0] == WACOM_REPORT_TPC1FG)
|
|
- return wacom_tpc_single_touch(wacom, len);
|
|
- else if (data[0] == WACOM_REPORT_TPC2FG)
|
|
- return wacom_tpc_mt_touch(wacom);
|
|
- else if (data[0] == WACOM_REPORT_PENABLED)
|
|
- return wacom_tpc_pen(wacom);
|
|
+ switch (len) {
|
|
+ case WACOM_PKGLEN_TPC1FG:
|
|
+ return wacom_tpc_single_touch(wacom, len);
|
|
+
|
|
+ case WACOM_PKGLEN_TPC2FG:
|
|
+ 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;
|
|
}
|
|
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
|
|
index 050acaefee7d..4f0ba21b0196 100644
|
|
--- a/drivers/input/tablet/wacom_wac.h
|
|
+++ b/drivers/input/tablet/wacom_wac.h
|
|
@@ -39,6 +39,8 @@
|
|
#define WACOM_REPORT_INTUOSPAD 12
|
|
#define WACOM_REPORT_TPC1FG 6
|
|
#define WACOM_REPORT_TPC2FG 13
|
|
+#define WACOM_REPORT_TPCHID 15
|
|
+#define WACOM_REPORT_TPCST 16
|
|
|
|
/* device quirks */
|
|
#define WACOM_QUIRK_MULTI_INPUT 0x0001
|
|
--
|
|
1.7.10.1
|
|
|