usbtouchscreen: convert from usb_device to usb_interface
PATCH RESEND 1/3 usbtouchscreen: convert from usb_device to usb_interface
Convert usbtouchscreen from storing usb_device to usb_interface. This is needed for multi-interface touchscreen devices such as iNexio.
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.c.orig +10 -9
@@ -93,7 +93,7 @@ struct usbtouch_usb {unsigned char *buffer;int buf_len;struct urb *irq; -struct usb_device *udev; +struct usb_interface *interface;struct input_dev *input;struct usbtouch_device_info *type;char name[128 ];
@@ -280,8 +280,9 @@ static int mtouch_read_data(struct usbtostatic int mtouch_init (struct usbtouch_usb *usbtouch) {int ret, i; +struct usb_device *udev =interface_to_usbdev (usbtouch->interface); - ret =usb_control_msg (usbtouch->udev,usb_rcvctrlpipe (usbtouch->udev,0 ), + ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),MTOUCHUSB_RESET ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -292,7 +293,7 @@ static int mtouch_init(struct usbtouch_umsleep (150 );for (i =0 ; i <3 ; i++) { - ret =usb_control_msg (usbtouch->udev,usb_rcvctrlpipe (usbtouch->udev,0 ), + ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),MTOUCHUSB_ASYNC_REPORT ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,1 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -425,7 +426,7 @@ static int gunze_read_data(struct usbtoustatic int dmc_tsc10_init (struct usbtouch_usb *usbtouch) { -struct usb_device *dev = usbtouch->udev; +struct usb_device *dev =interface_to_usbdev (usbtouch->interface);int ret = -ENOMEM ;unsigned char *buf;
@@ -850,7 +851,7 @@ static int usbtouch_open(struct input_de {struct usbtouch_usb *usbtouch =input_get_drvdata (input); - usbtouch->irq->dev = usbtouch->udev; + usbtouch->irq->dev =interface_to_usbdev (usbtouch->interface);if (usb_submit_urb (usbtouch->irq,GFP_KERNEL ))return -EIO ;
@@ -920,7 +921,7 @@ static int usbtouch_probe(struct usb_int goto out_free_buffers; } - usbtouch->udev = udev; + usbtouch->interface = intf; usbtouch->input = input_dev;if (udev->manufacturer)
@@ -959,12 +960,12 @@ static int usbtouch_probe(struct usb_intinput_set_abs_params (input_dev,ABS_PRESSURE , type->min_press, type->max_press,0 ,0 ); -usb_fill_int_urb (usbtouch->irq, usbtouch->udev, -usb_rcvintpipe (usbtouch->udev, endpoint->bEndpointAddress), +usb_fill_int_urb (usbtouch->irq, udev, +usb_rcvintpipe (udev, endpoint->bEndpointAddress), usbtouch->data, type->rept_size, usbtouch_irq, usbtouch, endpoint->bInterval); - usbtouch->irq->dev = usbtouch->udev; + usbtouch->irq->dev = udev; usbtouch->irq->transfer_dma = usbtouch->data_dma; usbtouch->irq->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
Signature · 1 line
Ondrej Zary
Quoted 2 lines · On Mon, 30 Nov 2009 13:06:41 +0100 Ondrej Zary <[email protected]> wrote:
Convert usbtouchscreen from storing
usb_devicetousb_interface. This is needed for multi-interface touchscreen devices such as iNexio.
There are some pretty large changes to drivers/input/touchscreen/usbtouchscreen.c in linux-next which cause these patches to not apply. And possibly to not work correctly.
PATCH 1/3 usbtouchscreen: convert from usb_device to usb_interface
Convert usbtouchscreen from storing usb_device to usb_interface. This is needed for multi-interface touchscreen devices such as iNexio.
drivers/input/touchscreen/usbtouchscreen.c +12 -10
@@ -104,7 +104,7 @@ struct usbtouch_usb {unsigned char *buffer;int buf_len;struct urb *irq; -struct usb_device *udev; +struct usb_interface *interface;struct input_dev *input;struct usbtouch_device_info *type;char name[128 ];
@@ -234,8 +234,9 @@ static struct usb_device_id usbtouch_devstatic int e2i_init (struct usbtouch_usb *usbtouch) {int ret; +struct usb_device *udev =interface_to_usbdev (usbtouch->interface); - ret =usb_control_msg (usbtouch->udev,usb_rcvctrlpipe (usbtouch->udev,0 ), + ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),0x01 ,0x02 ,0x0000 ,0x0081 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -344,8 +345,9 @@ static int mtouch_read_data(struct usbtostatic int mtouch_init (struct usbtouch_usb *usbtouch) {int ret, i; +struct usb_device *udev =interface_to_usbdev (usbtouch->interface); - ret =usb_control_msg (usbtouch->udev,usb_rcvctrlpipe (usbtouch->udev,0 ), + ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),MTOUCHUSB_RESET ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -356,7 +358,7 @@ static int mtouch_init(struct usbtouch_umsleep (150 );for (i =0 ; i <3 ; i++) { - ret =usb_control_msg (usbtouch->udev,usb_rcvctrlpipe (usbtouch->udev,0 ), + ret =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ),MTOUCHUSB_ASYNC_REPORT ,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE ,1 ,1 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );
@@ -489,7 +491,7 @@ static int gunze_read_data(struct usbtoustatic int dmc_tsc10_init (struct usbtouch_usb *usbtouch) { -struct usb_device *dev = usbtouch->udev; +struct usb_device *dev =interface_to_usbdev (usbtouch->interface);int ret = -ENOMEM ;unsigned char *buf;
@@ -1021,7 +1023,7 @@ static int usbtouch_open(struct input_de {struct usbtouch_usb *usbtouch =input_get_drvdata (input); - usbtouch->irq->dev = usbtouch->udev; + usbtouch->irq->dev =interface_to_usbdev (usbtouch->interface);if (!usbtouch->type->irq_always) {if (usb_submit_urb (usbtouch->irq,GFP_KERNEL ))
@@ -1094,7 +1096,7 @@ static int usbtouch_probe(struct usb_int goto out_free_buffers; } - usbtouch->udev = udev; + usbtouch->interface = intf; usbtouch->input = input_dev;if (udev->manufacturer)
@@ -1133,12 +1135,12 @@ static int usbtouch_probe(struct usb_intinput_set_abs_params (input_dev,ABS_PRESSURE , type->min_press, type->max_press,0 ,0 ); -usb_fill_int_urb (usbtouch->irq, usbtouch->udev, -usb_rcvintpipe (usbtouch->udev, endpoint->bEndpointAddress), +usb_fill_int_urb (usbtouch->irq, udev, +usb_rcvintpipe (udev, endpoint->bEndpointAddress), usbtouch->data, type->rept_size, usbtouch_irq, usbtouch, endpoint->bInterval); - usbtouch->irq->dev = usbtouch->udev; + usbtouch->irq->dev = udev; usbtouch->irq->transfer_dma = usbtouch->data_dma; usbtouch->irq->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
Signature · 1 line
Ondrej Zary
PATCH 2/3 usbtouchscreen: find input endpoint automatically
In reply to Andrew MortonFind input enpoint automatically instead of assuming that the first one is OK. This is needed for devices with multiple endpoints such as iNexio where the first endpoint might be output.
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.1 +10 -2
@@ -1057,17 +1057,25 @@ static int usbtouch_probe(struct usb_intstruct usbtouch_usb *usbtouch;struct input_dev *input_dev;struct usb_host_interface *interface; -struct usb_endpoint_descriptor *endpoint; +struct usb_endpoint_descriptor *endpoint =NULL ;struct usb_device *udev =interface_to_usbdev (intf);struct usbtouch_device_info *type;int err = -ENOMEM ; +int i;/* some devices are ignored */ if (id->driver_info ==DEVTYPE_IGNORE )return -ENODEV ; interface = intf->cur_altsetting; - endpoint = &interface->endpoint[0 ].desc; +/* find first input endpoint */ +for (i =0 ; i < interface->desc.bNumEndpoints; i++) +if (usb_endpoint_dir_in (&interface->endpoint[i].desc)) { + endpoint = &interface->endpoint[i].desc; +break ; + } +if (!endpoint) +return -ENXIO ; usbtouch =kzalloc (sizeof (struct usbtouch_usb ),GFP_KERNEL ); input_dev =input_allocate_device ();
Signature · 1 line
Ondrej Zary
PATCH 3/3 usbtouchscreen: add NEXIO (or iNexio) support
In reply to Andrew MortonAdd support for NEXIO (or iNexio) USB touchscreens to usbtouchscreen driver. Tested with NEX170MRT 17" LCD monitor with integrated touchscreen (with xserver-xorg-input-evtouch 0.8.8-1):
T: Bus=02 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 54 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
P: Vendor=1870 ProdID=0001 Rev= 1.00
S: Manufacturer=iNexio
S: Product=iNexio USB
C:* #Ifs= 2 Cfg#= 1 Atr=c0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=00 Driver=(none)
E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=255ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=(none)
E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
No datasheet is available, this was written by capturing some data with SniffUSB in Windows:
http://www.rainbow-software.org/linux_files/nexio/
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.2 +229 -0
@@ -15,6 +15,7 @@* - GoTop Super_Q2/GogoPen/PenPower tablets * - JASTEC USB touch controller/DigiTech DTR-02U * - Zytronic capacitive touchscreen +* - NEXIO/iNexio * * Copyright (C) 2004-2007 by Daniel Ritz <[email protected]> * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -95,6 +96,7 @@ struct usbtouch_device_info {int (*read_data) (struct usbtouch_usb *usbtouch,unsigned char *pkt);int (*init) (struct usbtouch_usb *usbtouch); +void (*exit) (struct usbtouch_usb *usbtouch); };/* a usbtouch device */
@@ -109,6 +111,7 @@ struct usbtouch_usb {struct usbtouch_device_info *type;char name[128 ];char phys[64 ]; +void *priv;int x, y;int touch, press;
@@ -133,6 +136,7 @@ enum {DEVTYPE_E2I ,DEVTYPE_ZYTRONIC ,DEVTYPE_TC5UH , + DEVTYPE_NEXIO, };#define USB_DEVICE_HID_CLASS (vend, prod) \
@@ -222,6 +226,14 @@ static struct usb_device_id usbtouch_dev {USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC5UH}, #endif +#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO + /* data interface only */ + {USB_DEVICE_AND_INTERFACE_INFO(0x10f0, 0x2002, 0x0a, 0x00, 0x00), + .driver_info = DEVTYPE_NEXIO}, + {USB_DEVICE_AND_INTERFACE_INFO(0x1870, 0x0001, 0x0a, 0x00, 0x00), + .driver_info = DEVTYPE_NEXIO}, +#endif + {} };
@@ -692,6 +704,211 @@ static int zytronic_read_data(struct usb#endif /***************************************************************************** +* NEXIO Part +*/ +#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO + +#define NEXIO_TIMEOUT 5000 +#define NEXIO_BUFSIZE 1024 +#define NEXIO_THRESHOLD 50 + +struct nexio_priv { +struct urb *ack; +unsigned char *ack_buf; +}; + +struct nexio_touch_packet { +u8 flags;/* 0xe1 = touch, 0xe1 = release */ +__be16 data_len;/* total bytes of touch data */ +__be16 x_len;/* bytes for X axis */ +__be16 y_len;/* bytes for Y axis */ +u8 data[]; +} __attribute__ ((packed)); + +static unsigned char nexio_ack_pkt[2 ] = {0xaa ,0x02 }; +static unsigned char nexio_init_pkt[4 ] = {0x82 ,0x04 ,0x0a ,0x0f }; + +static int nexio_init (struct usbtouch_usb *usbtouch) +{ +struct usb_device *dev =interface_to_usbdev (usbtouch->interface); +struct usb_host_interface *interface = usbtouch->interface->cur_altsetting; +struct nexio_priv *priv; +int ret = -ENOMEM ; +int actual_len, i; +unsigned char *buf; +char *firmware_ver =NULL , *device_name =NULL ; +int input_ep =0 , output_ep =0 ; + +/* find first input and output endpoint */ +for (i =0 ; i < interface->desc.bNumEndpoints; i++) { +if (!input_ep && +usb_endpoint_dir_in (&interface->endpoint[i].desc)) + input_ep = interface->endpoint[i].desc.bEndpointAddress; +if (!output_ep && +usb_endpoint_dir_out (&interface->endpoint[i].desc)) + output_ep = interface->endpoint[i].desc.bEndpointAddress; + } +if (!input_ep || !output_ep) +return -ENXIO ; + + buf =kmalloc (NEXIO_BUFSIZE ,GFP_KERNEL ); +if (!buf) + goto out_buf; +/* two empty reads */ +for (i =0 ; i <2 ; i++) { + ret =usb_bulk_msg (dev,usb_rcvbulkpipe (dev, input_ep), + buf,NEXIO_BUFSIZE , &actual_len, +NEXIO_TIMEOUT ); +if (ret <0 ) + goto out_buf; + } +/* send init command */ +memcpy (buf, nexio_init_pkt,sizeof (nexio_init_pkt)); + ret =usb_bulk_msg (dev,usb_sndbulkpipe (dev, output_ep), + buf,sizeof (nexio_init_pkt), &actual_len, +NEXIO_TIMEOUT ); +if (ret <0 ) + goto out_buf; +/* read replies */ +for (i =0 ; i <3 ; i++) { +memset (buf,0 ,NEXIO_BUFSIZE ); + ret =usb_bulk_msg (dev,usb_rcvbulkpipe (dev, input_ep), + buf,NEXIO_BUFSIZE , &actual_len, +NEXIO_TIMEOUT ); +if (ret <0 || actual_len <1 || buf[1 ] != actual_len) +continue ; +switch (buf[0 ]) { +case 0x83 :/* firmware version */ +if (!firmware_ver) + firmware_ver =kstrdup (&buf[2 ], +GFP_KERNEL ); +break ; +case 0x84 :/* device name */ +if (!device_name) + device_name =kstrdup (&buf[2 ], +GFP_KERNEL ); +break ; + } + } +printk (KERN_INFO "Nexio device: %s, firmware version: %s\n" , + device_name, firmware_ver); +kfree (firmware_ver); +kfree (device_name); + +/* prepare ACK URB */ + ret = -ENOMEM ; + usbtouch->priv =kmalloc (sizeof (struct nexio_priv ),GFP_KERNEL ); +if (!usbtouch->priv) + goto out_buf; + priv = usbtouch->priv; + priv->ack_buf =kmalloc (sizeof (nexio_ack_pkt),GFP_KERNEL ); +if (!priv->ack_buf) + goto err_priv; +memcpy (priv->ack_buf, nexio_ack_pkt,sizeof (nexio_ack_pkt)); + priv->ack =usb_alloc_urb (0 ,GFP_KERNEL ); +if (!priv->ack) { +dbg ("%s - usb_alloc_urb failed: usbtouch->ack" , __func__); + goto err_ack_buf; + } +usb_fill_bulk_urb (priv->ack, dev,usb_sndbulkpipe (dev, output_ep), + priv->ack_buf,sizeof (priv->ack_buf),NULL , + usbtouch); + ret =0 ; + goto out_buf; +err_ack_buf: +kfree (priv->ack_buf); +err_priv: +kfree (priv); +out_buf: +kfree (buf); +return ret; +} + +static void nexio_exit (struct usbtouch_usb *usbtouch) +{ +struct nexio_priv *priv = usbtouch->priv; + +usb_kill_urb (priv->ack); +usb_free_urb (priv->ack); +kfree (priv); +} + +static int nexio_read_data (struct usbtouch_usb *usbtouch,unsigned char *pkt) +{ +int x, y, begin_x, begin_y, end_x, end_y, w, h, ret; +struct nexio_touch_packet *packet = (void *) pkt; +struct nexio_priv *priv = usbtouch->priv; + +/* got touch data? */ +if ((pkt[0 ] &0xe0 ) !=0xe0 ) +return 0 ; + +/* send ACK */ + ret =usb_submit_urb (priv->ack,GFP_ATOMIC ); + +if (!usbtouch->type->max_xc) { + usbtouch->type->max_xc =2 *be16_to_cpu (packet->x_len); +input_set_abs_params (usbtouch->input,ABS_X ,0 , +2 *be16_to_cpu (packet->x_len),0 ,0 ); + usbtouch->type->max_yc =2 *be16_to_cpu (packet->y_len); +input_set_abs_params (usbtouch->input,ABS_Y ,0 , +2 *be16_to_cpu (packet->y_len),0 ,0 ); + } +/* The device reports state of IR sensors on X and Y axes. +* Each byte represents "darkness" percentage (0-100) of one element. +* 17" touchscreen reports only 64 x 52 bytes so the resolution is low. +* This also means that there's a limited multi-touch capability but +* it's disabled (and untested) here as there's no X driver for that. +*/ + begin_x = end_x = begin_y = end_y =-1 ; +for (x =0 ; x <be16_to_cpu (packet->x_len); x++) { +if (begin_x ==-1 && packet->data[x] >NEXIO_THRESHOLD ) { + begin_x = x; +continue ; + } +if (end_x ==-1 && begin_x !=-1 && packet->data[x] <NEXIO_THRESHOLD ) { + end_x = x -1 ; +for (y =be16_to_cpu (packet->x_len); + y <be16_to_cpu (packet->data_len); y++) { +if (begin_y ==-1 && packet->data[y] >NEXIO_THRESHOLD ) { + begin_y = y -be16_to_cpu (packet->x_len); +continue ; + } +if (end_y ==-1 && + begin_y !=-1 && packet->data[y] <NEXIO_THRESHOLD ) { + end_y = y -1 -be16_to_cpu (packet->x_len); + w = end_x - begin_x; + h = end_y - begin_y; +/* multi-touch */ +/* input_report_abs(usbtouch->input, +ABS_MT_TOUCH_MAJOR, max(w,h)); +input_report_abs(usbtouch->input, +ABS_MT_TOUCH_MINOR, min(x,h)); +input_report_abs(usbtouch->input, +ABS_MT_POSITION_X, 2*begin_x+w); +input_report_abs(usbtouch->input, +ABS_MT_POSITION_Y, 2*begin_y+h); +input_report_abs(usbtouch->input, +ABS_MT_ORIENTATION, w > h); +input_mt_sync(usbtouch->input);*/ +/* single touch */ + usbtouch->x =2 * begin_x + w; + usbtouch->y =2 * begin_y + h; + usbtouch->touch = packet->flags &0x01 ; + begin_y = end_y =-1 ; +return 1 ; + } + } + begin_x = end_x =-1 ; + } + + } +return 0 ; +} +#endif + + +/***************************************************************************** * the different device descriptors */ #ifdef MULTI_PACKET
@@ -875,6 +1092,16 @@ static struct usbtouch_device_info usbto .read_data = tc5uh_read_data, },#endif + +#ifdef CONFIG_TOUCHSCREEN_USB_NEXIO + [DEVTYPE_NEXIO] = { + .rept_size = 128, + .irq_always = true, + .read_data = nexio_read_data, + .init = nexio_init, + .exit = nexio_exit, + }, +#endif };
@@ -1196,6 +1423,8 @@ static void usbtouch_disconnect(struct u/* this will stop IO via close */ input_unregister_device (usbtouch->input);usb_free_urb (usbtouch->irq); +if (usbtouch->type->exit) + usbtouch->type->exit (usbtouch);usbtouch_free_buffers (interface_to_usbdev (intf), usbtouch);kfree (usbtouch); }
drivers/input/touchscreen/Kconfig +5 -0
@@ -525,6 +525,11 @@ config TOUCHSCREEN_USB_ETT_TC5UH bool "ET&T TC5UH touchscreen controler support" if EMBEDDED depends on TOUCHSCREEN_USB_COMPOSITE +config TOUCHSCREEN_USB_NEXIO + default y + bool "NEXIO/iNexio device support" if EMBEDDED + depends on TOUCHSCREEN_USB_COMPOSITE + config TOUCHSCREEN_TOUCHIT213 tristate "Sahara TouchIT-213 touchscreen" select SERIO
Signature · 1 line
Ondrej Zary