Align with 2.6.37

This patch aligns wacom support with kernel 2.6.37. The tablet
buttons have been remapped and the code has been prepared for
adding the rest of the Bamboo family.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

1 files changed, 11 insertions, 1 deletions

diff --git a/usr/src/dkms_source_tree/wacom_wac.h b/usr/src/dkms_source_tree/wacom_wac.h
index 0c5a35d..00ca015 100644
--- a/usr/src/dkms_source_tree/wacom_wac.h
+++ b/usr/src/dkms_source_tree/wacom_wac.h
@@ -38,6 +38,10 @@
 #define WACOM_REPORT_TPC1FG             6
 #define WACOM_REPORT_TPC2FG             13
 
+/* device quirks */
+#define WACOM_QUIRK_MULTI_INPUT         0x0001
+#define WACOM_QUIRK_BBTOUCH_LOWRES      0x0002
+
 /* largest reported tracking id */
 #define MAX_TRACKING_ID                 0xfff
 
@@ -48,6 +52,7 @@ enum {
         PTU,
         PL,
         DTU,
+        BAMBOO_PT,
         INTUOS,
         INTUOS3S,
         INTUOS3,
@@ -61,7 +66,6 @@ enum {
         WACOM_MO,
         TABLETPC,
         TABLETPC2FG,
-        BAMBOO_TOUCH,
         MAX_TYPE
 };
 
@@ -78,6 +82,11 @@ struct wacom_features {
         int y_phy;
         unsigned char unit;
         unsigned char unitExpo;
+        int x_fuzz;
+        int y_fuzz;
+        int pressure_fuzz;
+        int distance_fuzz;
+        unsigned quirks;
 };
 
 struct wacom_shared {
@@ -91,6 +100,7 @@ struct wacom_wac {
         int id[3];
         __u32 serial[2];
         int last_finger;
+        int trk_id;
         struct wacom_features features;
         struct wacom_shared *shared;
         struct input_dev *input;