Input: wacom_w8001 - add multitouch slot support
[sfrench/cifs-2.6.git] / drivers / input / touchscreen / wacom_w8001.c
index 56dc35c94bb12eb00102a0110044945574edbcf6..9ae4c7b16ba7e36a6a56a4261e9c2373095e4ea9 100644 (file)
@@ -2,6 +2,7 @@
  * Wacom W8001 penabled serial touchscreen driver
  *
  * Copyright (c) 2008 Jaya Kumar
+ * Copyright (c) 2010 Red Hat, Inc.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file COPYING in the main directory of this archive for
@@ -30,11 +31,24 @@ MODULE_LICENSE("GPL");
 #define W8001_LEAD_BYTE                0x80
 #define W8001_TAB_MASK         0x40
 #define W8001_TAB_BYTE         0x40
+/* set in first byte of touch data packets */
+#define W8001_TOUCH_MASK       (0x10 | W8001_LEAD_MASK)
+#define W8001_TOUCH_BYTE       (0x10 | W8001_LEAD_BYTE)
 
 #define W8001_QUERY_PACKET     0x20
 
 #define W8001_CMD_START                '1'
 #define W8001_CMD_QUERY                '*'
+#define W8001_CMD_TOUCHQUERY   '%'
+
+/* length of data packets in bytes, depends on device. */
+#define W8001_PKTLEN_TOUCH93   5
+#define W8001_PKTLEN_TOUCH9A   7
+#define W8001_PKTLEN_TPCPEN    9
+#define W8001_PKTLEN_TPCCTL    11      /* control packet */
+#define W8001_PKTLEN_TOUCH2FG  13
+
+#define MAX_TRACKING_ID                0xFF    /* arbitrarily chosen */
 
 struct w8001_coord {
        u8 rdy;
@@ -48,6 +62,15 @@ struct w8001_coord {
        u8 tilt_y;
 };
 
+/* touch query reply packet */
+struct w8001_touch_query {
+       u8 panel_res;
+       u8 capacity_res;
+       u8 sensor_id;
+       u16 x;
+       u16 y;
+};
+
 /*
  * Per-touchscreen data.
  */
@@ -62,6 +85,9 @@ struct w8001 {
        unsigned char response[W8001_MAX_LENGTH];
        unsigned char data[W8001_MAX_LENGTH];
        char phys[32];
+       int type;
+       unsigned int pktlen;
+       int trkid[2];
 };
 
 static void parse_data(u8 *data, struct w8001_coord *coord)
@@ -88,11 +114,98 @@ static void parse_data(u8 *data, struct w8001_coord *coord)
        coord->tilt_y = data[8] & 0x7F;
 }
 
+static void parse_touch(struct w8001 *w8001)
+{
+       static int trkid;
+       struct input_dev *dev = w8001->dev;
+       unsigned char *data = w8001->data;
+       int i;
+
+       for (i = 0; i < 2; i++) {
+               input_mt_slot(dev, i);
+
+               if (data[0] & (1 << i)) {
+                       int x = (data[6 * i + 1] << 7) | (data[6 * i + 2]);
+                       int y = (data[6 * i + 3] << 7) | (data[6 * i + 4]);
+                       /* data[5,6] and [11,12] is finger capacity */
+
+                       input_report_abs(dev, ABS_MT_POSITION_X, x);
+                       input_report_abs(dev, ABS_MT_POSITION_Y, y);
+                       input_report_abs(dev, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER);
+                       if (w8001->trkid[i] < 0)
+                               w8001->trkid[i] = trkid++ & MAX_TRACKING_ID;
+               } else {
+                       w8001->trkid[i] = -1;
+               }
+               input_report_abs(dev, ABS_MT_TRACKING_ID, w8001->trkid[i]);
+       }
+
+       input_sync(dev);
+}
+
+static void parse_touchquery(u8 *data, struct w8001_touch_query *query)
+{
+       memset(query, 0, sizeof(*query));
+
+       query->panel_res = data[1];
+       query->sensor_id = data[2] & 0x7;
+       query->capacity_res = data[7];
+
+       query->x = data[3] << 9;
+       query->x |= data[4] << 2;
+       query->x |= (data[2] >> 5) & 0x3;
+
+       query->y = data[5] << 9;
+       query->y |= data[6] << 2;
+       query->y |= (data[2] >> 3) & 0x3;
+}
+
+static void report_pen_events(struct w8001 *w8001, struct w8001_coord *coord)
+{
+       struct input_dev *dev = w8001->dev;
+
+       /*
+        * We have 1 bit for proximity (rdy) and 3 bits for tip, side,
+        * side2/eraser. If rdy && f2 are set, this can be either pen + side2,
+        * or eraser. assume
+        * - if dev is already in proximity and f2 is toggled → pen + side2
+        * - if dev comes into proximity with f2 set → eraser
+        * If f2 disappears after assuming eraser, fake proximity out for
+        * eraser and in for pen.
+        */
+
+       if (!w8001->type) {
+               w8001->type = coord->f2 ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+       } else if (w8001->type == BTN_TOOL_RUBBER) {
+               if (!coord->f2) {
+                       input_report_abs(dev, ABS_PRESSURE, 0);
+                       input_report_key(dev, BTN_TOUCH, 0);
+                       input_report_key(dev, BTN_STYLUS, 0);
+                       input_report_key(dev, BTN_STYLUS2, 0);
+                       input_report_key(dev, BTN_TOOL_RUBBER, 0);
+                       input_sync(dev);
+                       w8001->type = BTN_TOOL_PEN;
+               }
+       } else {
+               input_report_key(dev, BTN_STYLUS2, coord->f2);
+       }
+
+       input_report_abs(dev, ABS_X, coord->x);
+       input_report_abs(dev, ABS_Y, coord->y);
+       input_report_abs(dev, ABS_PRESSURE, coord->pen_pressure);
+       input_report_key(dev, BTN_TOUCH, coord->tsw);
+       input_report_key(dev, BTN_STYLUS, coord->f1);
+       input_report_key(dev, w8001->type, coord->rdy);
+       input_sync(dev);
+
+       if (!coord->rdy)
+               w8001->type = 0;
+}
+
 static irqreturn_t w8001_interrupt(struct serio *serio,
                                   unsigned char data, unsigned int flags)
 {
        struct w8001 *w8001 = serio_get_drvdata(serio);
-       struct input_dev *dev = w8001->dev;
        struct w8001_coord coord;
        unsigned char tmp;
 
@@ -105,26 +218,45 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
                }
                break;
 
-       case 8:
+       case W8001_PKTLEN_TOUCH93 - 1:
+       case W8001_PKTLEN_TOUCH9A - 1:
+               /* ignore one-finger touch packet. */
+               if (w8001->pktlen == w8001->idx)
+                       w8001->idx = 0;
+               break;
+
+       /* Pen coordinates packet */
+       case W8001_PKTLEN_TPCPEN - 1:
                tmp = w8001->data[0] & W8001_TAB_MASK;
                if (unlikely(tmp == W8001_TAB_BYTE))
                        break;
 
+               tmp = (w8001->data[0] & W8001_TOUCH_BYTE);
+               if (tmp == W8001_TOUCH_BYTE)
+                       break;
+
                w8001->idx = 0;
                parse_data(w8001->data, &coord);
-               input_report_abs(dev, ABS_X, coord.x);
-               input_report_abs(dev, ABS_Y, coord.y);
-               input_report_abs(dev, ABS_PRESSURE, coord.pen_pressure);
-               input_report_key(dev, BTN_TOUCH, coord.tsw);
-               input_sync(dev);
+               report_pen_events(w8001, &coord);
                break;
 
-       case 10:
+       /* control packet */
+       case W8001_PKTLEN_TPCCTL - 1:
+               tmp = (w8001->data[0] & W8001_TOUCH_MASK);
+               if (tmp == W8001_TOUCH_BYTE)
+                       break;
+
                w8001->idx = 0;
                memcpy(w8001->response, w8001->data, W8001_MAX_LENGTH);
                w8001->response_type = W8001_QUERY_PACKET;
                complete(&w8001->cmd_done);
                break;
+
+       /* 2 finger touch packet */
+       case W8001_PKTLEN_TOUCH2FG - 1:
+               w8001->idx = 0;
+               parse_touch(w8001);
+               break;
        }
 
        return IRQ_HANDLED;
@@ -167,6 +299,38 @@ static int w8001_setup(struct w8001 *w8001)
        input_set_abs_params(dev, ABS_TILT_X, 0, coord.tilt_x, 0, 0);
        input_set_abs_params(dev, ABS_TILT_Y, 0, coord.tilt_y, 0, 0);
 
+       error = w8001_command(w8001, W8001_CMD_TOUCHQUERY, true);
+       if (!error) {
+               struct w8001_touch_query touch;
+
+               parse_touchquery(w8001->response, &touch);
+
+               switch (touch.sensor_id) {
+               case 0:
+               case 2:
+                       w8001->pktlen = W8001_PKTLEN_TOUCH93;
+                       break;
+               case 1:
+               case 3:
+               case 4:
+                       w8001->pktlen = W8001_PKTLEN_TOUCH9A;
+                       break;
+               case 5:
+                       w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
+
+                       input_mt_create_slots(dev, 2);
+                       input_set_abs_params(dev, ABS_MT_TRACKING_ID,
+                                               0, MAX_TRACKING_ID, 0, 0);
+                       input_set_abs_params(dev, ABS_MT_POSITION_X,
+                                               0, touch.x, 0, 0);
+                       input_set_abs_params(dev, ABS_MT_POSITION_Y,
+                                               0, touch.y, 0, 0);
+                       input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
+                                               0, 0, 0, 0);
+                       break;
+               }
+       }
+
        return w8001_command(w8001, W8001_CMD_START, false);
 }
 
@@ -208,6 +372,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
        w8001->serio = serio;
        w8001->id = serio->id.id;
        w8001->dev = input_dev;
+       w8001->trkid[0] = w8001->trkid[1] = -1;
        init_completion(&w8001->cmd_done);
        snprintf(w8001->phys, sizeof(w8001->phys), "%s/input0", serio->phys);
 
@@ -221,6 +386,10 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
 
        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
        input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+       input_dev->keybit[BIT_WORD(BTN_TOOL_PEN)] |= BIT_MASK(BTN_TOOL_PEN);
+       input_dev->keybit[BIT_WORD(BTN_TOOL_RUBBER)] |= BIT_MASK(BTN_TOOL_RUBBER);
+       input_dev->keybit[BIT_WORD(BTN_STYLUS)] |= BIT_MASK(BTN_STYLUS);
+       input_dev->keybit[BIT_WORD(BTN_STYLUS2)] |= BIT_MASK(BTN_STYLUS2);
 
        serio_set_drvdata(serio, w8001);
        err = serio_open(serio, drv);