1 files changed, 91 insertions, 2 deletions

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 741f6c6f1e50..9fb3d5c30999 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
@@ -10,6 +10,7 @@
  *  - Gunze AHL61
  *  - DMC TSC-10/25
  *  - IRTOUCHSYSTEMS/UNITOP
+ *  - IdealTEK URTC1000
  *
  * Copyright (C) 2004-2006 by Daniel Ritz <daniel.ritz@gmx.ch>
  * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -92,7 +93,7 @@ struct usbtouch_usb {
 };
 
 
-#if defined(CONFIG_TOUCHSCREEN_USB_EGALAX) || defined(CONFIG_TOUCHSCREEN_USB_ETURBO)
+#if defined(CONFIG_TOUCHSCREEN_USB_EGALAX) || defined(CONFIG_TOUCHSCREEN_USB_ETURBO) || defined(CONFIG_TOUCHSCREEN_USB_IDEALTEK)
 #define MULTI_PACKET
 #endif
 
@@ -112,6 +113,8 @@ enum {
         DEVTYPE_GUNZE,
         DEVTYPE_DMC_TSC10,
         DEVTYPE_IRTOUCH,
+        DEVTYPE_IDEALTEK,
+        DEVTYPE_GENERAL_TOUCH,
 };
 
 static struct usb_device_id usbtouch_devices[] = {
@@ -157,6 +160,14 @@ static struct usb_device_id usbtouch_devices[] = {
         {USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH},
 #endif
 
+#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
+        {USB_DEVICE(0x1391, 0x1000), .driver_info = DEVTYPE_IDEALTEK},
+#endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH
+        {USB_DEVICE(0x0dfc, 0x0001), .driver_info = DEVTYPE_GENERAL_TOUCH},
+#endif
+
         {}
 };
 
@@ -396,7 +407,8 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
                               TSC10_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
         if (ret < 0)
                 return ret;
-        if (buf[0] != 0x06 || buf[1] != 0x00)
+        if ((buf[0] != 0x06 || buf[1] != 0x00) &&
+            (buf[0] != 0x15 || buf[1] != 0x01))
                 return -ENODEV;
 
         /* start sending data */
@@ -438,6 +450,57 @@ static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 
 
 /*****************************************************************************
+ * IdealTEK URTC1000 Part
+ */
+#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
+static int idealtek_get_pkt_len(unsigned char *buf, int len)
+{
+        if (buf[0] & 0x80)
+                return 5;
+        if (buf[0] == 0x01)
+                return len;
+        return 0;
+}
+
+static int idealtek_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+{
+        switch (pkt[0] & 0x98) {
+        case 0x88:
+                /* touch data in IdealTEK mode */
+                dev->x = (pkt[1] << 5) | (pkt[2] >> 2);
+                dev->y = (pkt[3] << 5) | (pkt[4] >> 2);
+                dev->touch = (pkt[0] & 0x40) ? 1 : 0;
+                return 1;
+
+        case 0x98:
+                /* touch data in MT emulation mode */
+                dev->x = (pkt[2] << 5) | (pkt[1] >> 2);
+                dev->y = (pkt[4] << 5) | (pkt[3] >> 2);
+                dev->touch = (pkt[0] & 0x40) ? 1 : 0;
+                return 1;
+
+        default:
+                return 0;
+        }
+}
+#endif
+
+/*****************************************************************************
+ * General Touch Part
+ */
+#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH
+static int general_touch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
+{
+        dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1] ;
+        dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3] ;
+        dev->press = pkt[5] & 0xff;
+        dev->touch = pkt[0] & 0x01;
+
+        return 1;
+}
+#endif
+
+/*****************************************************************************
  * the different device descriptors
  */
 static struct usbtouch_device_info usbtouch_dev_info[] = {
@@ -537,6 +600,32 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                 .read_data      = irtouch_read_data,
         },
 #endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
+        [DEVTYPE_IDEALTEK] = {
+                .min_xc         = 0x0,
+                .max_xc         = 0x0fff,
+                .min_yc         = 0x0,
+                .max_yc         = 0x0fff,
+                .rept_size      = 8,
+                .flags          = USBTOUCH_FLG_BUFFER,
+                .process_pkt    = usbtouch_process_multi,
+                .get_pkt_len    = idealtek_get_pkt_len,
+                .read_data      = idealtek_read_data,
+        },
+#endif
+
+#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH
+        [DEVTYPE_GENERAL_TOUCH] = {
+                .min_xc         = 0x0,
+                .max_xc         = 0x0500,
+                .min_yc         = 0x0,
+                .max_yc         = 0x0500,
+                .rept_size      = 7,
+                .read_data      = general_touch_read_data,
+        }
+#endif
+
 };