input: wacom - use switch statement for wacom_tpc_irq()

PATCH In review Ping Cheng 1 participant 1 message Jan 4, 2012

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Ping Cheng

author

2012-01-04 22:42 UTC #0 lore raw

PATCH v2 3/4 input: wacom - use switch statement for wacom_tpc_irq()

And add two new data formats.

Tested-by Chris Bagwell <[email protected]>

Reviewed-by Chris Bagwell <[email protected]>

Signed-off-by Ping Cheng <[email protected]>

---

v2: updated with Chris' comments.

 drivers/input/tablet/wacom_wac.c |   24 ++++++++++++++++++------
 drivers/input/tablet/wacom_wac.h |    2 ++
 2 files changed, 20 insertions(+), 6 deletions(-)

drivers/input/tablet/wacom_wac.c +18 -6

index 33a4359..8dc185d 100644
@@ -833,12 +833,24 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
 	dbg("wacom_tpc_irq: received report #%d with %d contacts",
 	     data[0], wacom->features.touch_max);
 
-	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;
 }

drivers/input/tablet/wacom_wac.h +2 -0

index 6ddd2e4..1c9dc3e 100644
@@ -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

Signature · 1 line

1.7.6.4