Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df561fcd authored by Ondrej Zary's avatar Ondrej Zary Committed by Dmitry Torokhov
Browse files

Input: usbtouchscreen - add support for IRTOUCHSYSTEMS touchscreens 



This patch adds support for IRTOUCHSYSTEMS (or UNITOP) infrared touchscreens.

The touchscreen sends data in 8-byte packets.
BYTE 0 - unknown meaning, seen only one value: 0x54
BYTE 1 - unknown meaning, 3 lowest bits indicate touch state
        values seen: 0x81, 0x82 or 0x83
        bit 0 = set if the screen is touched and was not touched before (touch
        bit 1 = set if the screen is touched and was touched (dragging)
        bit 2 = set if the touch was ended (release)
BYTES 2 and 3 - X position, high-order-byte first, range = 0 to 0x0FFF
BYTES 4 and 5 - Y position, high-order-byte first, range = 0 to 0x0FFF
BYTE 6 - unknown meaning, seen only one value: 0xFF
BYTE 7 - unknown meaning, seen only one value: 0x00

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarDaniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 1e2831db

drivers/input/touchscreen/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ config TOUCHSCREEN_USB_COMPOSITE 
	  - some other eTurboTouch

	  - Gunze AHL61

	  - DMC TSC-10/25

	  - IRTOUCHSYSTEMS/UNITOP



	  Have a look at <http://linux.chapter7.ch/touchkit/> for

	  a usage description and the required user-space stuff.
@@ -219,4 +220,9 @@ config TOUCHSCREEN_USB_DMC_TSC10 
	bool "DMC TSC-10/25 device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_IRTOUCH

	default y

	bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



endif

drivers/input/touchscreen/usbtouchscreen.c

+33 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 *  - eTurboTouch

 *  - Gunze AHL61

 *  - DMC TSC-10/25

 *  - IRTOUCHSYSTEMS/UNITOP

 *

 * Copyright (C) 2004-2006 by Daniel Ritz <daniel.ritz@gmx.ch>

 * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -110,6 +111,7 @@ enum { 
	DEVTYPE_ETURBO,

	DEVTYPE_GUNZE,

	DEVTYPE_DMC_TSC10,

	DEVTYPE_IRTOUCH,

};



static struct usb_device_id usbtouch_devices[] = {
@@ -150,6 +152,11 @@ static struct usb_device_id usbtouch_devices[] = { 
	{USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10},

#endif



#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH

	{USB_DEVICE(0x595a, 0x0001), .driver_info = DEVTYPE_IRTOUCH},

	{USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH},

#endif



	{}

};
@@ -415,6 +422,21 @@ static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt) 
#endif





/*****************************************************************************

 * IRTOUCH Part

 */

#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH

static int irtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	dev->x = (pkt[3] << 8) | pkt[2];

	dev->y = (pkt[5] << 8) | pkt[4];

	dev->touch = (pkt[1] & 0x03) ? 1 : 0;



	return 1;

}

#endif





/*****************************************************************************

 * the different device descriptors

 */
@@ -504,6 +526,17 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { 
		.read_data	= dmc_tsc10_read_data,

	},

#endif



#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH

	[DEVTYPE_IRTOUCH] = {

		.min_xc		= 0x0,

		.max_xc		= 0x0fff,

		.min_yc		= 0x0,

		.max_yc		= 0x0fff,

		.rept_size	= 8,

		.read_data	= irtouch_read_data,

	},

#endif

};