2006-03-30 04:41:07 +08:00
|
|
|
/******************************************************************************
|
|
|
|
|
* usbtouchscreen.c
|
|
|
|
|
* Driver for USB Touchscreens, supporting those devices:
|
|
|
|
|
* - eGalax Touchkit
|
2006-08-01 03:43:24 +08:00
|
|
|
* includes eTurboTouch CT-410/510/700
|
|
|
|
|
* - 3M/Microtouch EX II series
|
2006-03-30 04:41:07 +08:00
|
|
|
* - ITM
|
|
|
|
|
* - PanJit TouchSet
|
2006-08-01 03:43:24 +08:00
|
|
|
* - eTurboTouch
|
|
|
|
|
* - Gunze AHL61
|
2006-11-18 05:50:15 +08:00
|
|
|
* - DMC TSC-10/25
|
2007-07-03 13:55:03 +08:00
|
|
|
* - IRTOUCHSYSTEMS/UNITOP
|
2007-09-05 11:45:01 +08:00
|
|
|
* - IdealTEK URTC1000
|
2008-01-18 01:01:18 +08:00
|
|
|
* - General Touch
|
2007-10-22 12:59:47 +08:00
|
|
|
* - GoTop Super_Q2/GogoPen/PenPower tablets
|
2009-07-08 13:07:59 +08:00
|
|
|
* - JASTEC USB touch controller/DigiTech DTR-02U
|
2009-11-24 00:38:16 +08:00
|
|
|
* - Zytronic capacitive touchscreen
|
2006-03-30 04:41:07 +08:00
|
|
|
*
|
2007-10-22 12:59:47 +08:00
|
|
|
* Copyright (C) 2004-2007 by Daniel Ritz <daniel.ritz@gmx.ch>
|
2006-03-30 04:41:07 +08:00
|
|
|
* Copyright (C) by Todd E. Johnson (mtouchusb.c)
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
* General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*
|
|
|
|
|
* Driver is based on touchkitusb.c
|
|
|
|
|
* - ITM parts are from itmtouch.c
|
|
|
|
|
* - 3M parts are from mtouchusb.c
|
|
|
|
|
* - PanJit parts are from an unmerged driver by Lanslott Gish
|
2006-11-18 05:50:15 +08:00
|
|
|
* - DMC TSC 10/25 are from Holger Schurig, with ideas from an unmerged
|
|
|
|
|
* driver from Marius Vollmer
|
2006-03-30 04:41:07 +08:00
|
|
|
*
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
//#define DEBUG
|
|
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
#include <linux/input.h>
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
#include <linux/usb.h>
|
2006-06-14 01:04:34 +08:00
|
|
|
#include <linux/usb/input.h>
|
2008-07-03 22:45:37 +08:00
|
|
|
#include <linux/hid.h>
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
|
2008-01-18 01:01:18 +08:00
|
|
|
#define DRIVER_VERSION "v0.6"
|
2006-03-30 04:41:07 +08:00
|
|
|
#define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@gmx.ch>"
|
|
|
|
|
#define DRIVER_DESC "USB Touchscreen Driver"
|
|
|
|
|
|
|
|
|
|
static int swap_xy;
|
|
|
|
|
module_param(swap_xy, bool, 0644);
|
|
|
|
|
MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped.");
|
|
|
|
|
|
2009-01-11 15:44:22 +08:00
|
|
|
static int hwcalib_xy;
|
|
|
|
|
module_param(hwcalib_xy, bool, 0644);
|
|
|
|
|
MODULE_PARM_DESC(hwcalib_xy, "If set hw-calibrated X/Y are used if available");
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
/* device specifc data/functions */
|
|
|
|
|
struct usbtouch_usb;
|
|
|
|
|
struct usbtouch_device_info {
|
|
|
|
|
int min_xc, max_xc;
|
|
|
|
|
int min_yc, max_yc;
|
|
|
|
|
int min_press, max_press;
|
|
|
|
|
int rept_size;
|
|
|
|
|
|
2009-11-24 00:38:16 +08:00
|
|
|
/*
|
|
|
|
|
* Always service the USB devices irq not just when the input device is
|
|
|
|
|
* open. This is useful when devices have a watchdog which prevents us
|
|
|
|
|
* from periodically polling the device. Leave this unset unless your
|
|
|
|
|
* touchscreen device requires it, as it does consume more of the USB
|
|
|
|
|
* bandwidth.
|
|
|
|
|
*/
|
|
|
|
|
bool irq_always;
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
void (*process_pkt) (struct usbtouch_usb *usbtouch, unsigned char *pkt, int len);
|
2008-01-18 01:01:18 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* used to get the packet len. possible return values:
|
|
|
|
|
* > 0: packet len
|
|
|
|
|
* = 0: skip one byte
|
|
|
|
|
* < 0: -return value more bytes needed
|
|
|
|
|
*/
|
2006-08-01 03:43:24 +08:00
|
|
|
int (*get_pkt_len) (unsigned char *pkt, int len);
|
2008-01-18 01:01:18 +08:00
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
int (*read_data) (struct usbtouch_usb *usbtouch, unsigned char *pkt);
|
2006-03-30 04:41:07 +08:00
|
|
|
int (*init) (struct usbtouch_usb *usbtouch);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* a usbtouch device */
|
|
|
|
|
struct usbtouch_usb {
|
|
|
|
|
unsigned char *data;
|
|
|
|
|
dma_addr_t data_dma;
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
int buf_len;
|
|
|
|
|
struct urb *irq;
|
|
|
|
|
struct usb_device *udev;
|
|
|
|
|
struct input_dev *input;
|
|
|
|
|
struct usbtouch_device_info *type;
|
|
|
|
|
char name[128];
|
|
|
|
|
char phys[64];
|
2006-12-12 01:17:45 +08:00
|
|
|
|
|
|
|
|
int x, y;
|
|
|
|
|
int touch, press;
|
2006-03-30 04:41:07 +08:00
|
|
|
};
|
|
|
|
|
|
2006-08-01 03:43:24 +08:00
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
/* device types */
|
|
|
|
|
enum {
|
2008-07-03 22:45:37 +08:00
|
|
|
DEVTYPE_IGNORE = -1,
|
2006-03-30 04:41:07 +08:00
|
|
|
DEVTYPE_EGALAX,
|
|
|
|
|
DEVTYPE_PANJIT,
|
|
|
|
|
DEVTYPE_3M,
|
|
|
|
|
DEVTYPE_ITM,
|
2006-08-01 03:43:24 +08:00
|
|
|
DEVTYPE_ETURBO,
|
|
|
|
|
DEVTYPE_GUNZE,
|
2006-11-18 05:50:15 +08:00
|
|
|
DEVTYPE_DMC_TSC10,
|
2007-07-03 13:55:03 +08:00
|
|
|
DEVTYPE_IRTOUCH,
|
2007-09-05 11:45:01 +08:00
|
|
|
DEVTYPE_IDEALTEK,
|
2007-10-13 02:19:40 +08:00
|
|
|
DEVTYPE_GENERAL_TOUCH,
|
2007-10-22 12:59:47 +08:00
|
|
|
DEVTYPE_GOTOP,
|
2009-07-08 13:07:59 +08:00
|
|
|
DEVTYPE_JASTEC,
|
2009-07-28 08:35:39 +08:00
|
|
|
DEVTYPE_E2I,
|
2009-11-24 00:38:16 +08:00
|
|
|
DEVTYPE_ZYTRONIC,
|
2009-11-30 15:37:07 +08:00
|
|
|
DEVTYPE_TC5UH,
|
2006-03-30 04:41:07 +08:00
|
|
|
};
|
|
|
|
|
|
2008-07-03 22:45:37 +08:00
|
|
|
#define USB_DEVICE_HID_CLASS(vend, prod) \
|
|
|
|
|
.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS \
|
2009-03-01 04:50:54 +08:00
|
|
|
| USB_DEVICE_ID_MATCH_INT_PROTOCOL \
|
2008-07-03 22:45:37 +08:00
|
|
|
| USB_DEVICE_ID_MATCH_DEVICE, \
|
|
|
|
|
.idVendor = (vend), \
|
|
|
|
|
.idProduct = (prod), \
|
|
|
|
|
.bInterfaceClass = USB_INTERFACE_CLASS_HID, \
|
|
|
|
|
.bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
static struct usb_device_id usbtouch_devices[] = {
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
|
2008-07-03 22:45:37 +08:00
|
|
|
/* ignore the HID capable devices, handled by usbhid */
|
|
|
|
|
{USB_DEVICE_HID_CLASS(0x0eef, 0x0001), .driver_info = DEVTYPE_IGNORE},
|
|
|
|
|
{USB_DEVICE_HID_CLASS(0x0eef, 0x0002), .driver_info = DEVTYPE_IGNORE},
|
|
|
|
|
|
|
|
|
|
/* normal device IDs */
|
2006-03-30 04:41:07 +08:00
|
|
|
{USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX},
|
2006-08-01 03:43:24 +08:00
|
|
|
{USB_DEVICE(0x3823, 0x0002), .driver_info = DEVTYPE_EGALAX},
|
2006-03-30 04:41:07 +08:00
|
|
|
{USB_DEVICE(0x0123, 0x0001), .driver_info = DEVTYPE_EGALAX},
|
|
|
|
|
{USB_DEVICE(0x0eef, 0x0001), .driver_info = DEVTYPE_EGALAX},
|
|
|
|
|
{USB_DEVICE(0x0eef, 0x0002), .driver_info = DEVTYPE_EGALAX},
|
2006-08-01 03:43:24 +08:00
|
|
|
{USB_DEVICE(0x1234, 0x0001), .driver_info = DEVTYPE_EGALAX},
|
|
|
|
|
{USB_DEVICE(0x1234, 0x0002), .driver_info = DEVTYPE_EGALAX},
|
2006-03-30 04:41:07 +08:00
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
|
2006-03-30 04:41:07 +08:00
|
|
|
{USB_DEVICE(0x134c, 0x0001), .driver_info = DEVTYPE_PANJIT},
|
|
|
|
|
{USB_DEVICE(0x134c, 0x0002), .driver_info = DEVTYPE_PANJIT},
|
|
|
|
|
{USB_DEVICE(0x134c, 0x0003), .driver_info = DEVTYPE_PANJIT},
|
|
|
|
|
{USB_DEVICE(0x134c, 0x0004), .driver_info = DEVTYPE_PANJIT},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_3M
|
2006-03-30 04:41:07 +08:00
|
|
|
{USB_DEVICE(0x0596, 0x0001), .driver_info = DEVTYPE_3M},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ITM
|
2006-03-30 04:41:07 +08:00
|
|
|
{USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
|
2006-08-01 03:43:24 +08:00
|
|
|
{USB_DEVICE(0x1234, 0x5678), .driver_info = DEVTYPE_ETURBO},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
|
2006-08-01 03:43:24 +08:00
|
|
|
{USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
|
2006-11-18 05:50:15 +08:00
|
|
|
{USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-07-03 13:55:03 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH
|
|
|
|
|
{USB_DEVICE(0x595a, 0x0001), .driver_info = DEVTYPE_IRTOUCH},
|
|
|
|
|
{USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-09-05 11:45:01 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
|
|
|
|
|
{USB_DEVICE(0x1391, 0x1000), .driver_info = DEVTYPE_IDEALTEK},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-10-13 02:19:40 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH
|
|
|
|
|
{USB_DEVICE(0x0dfc, 0x0001), .driver_info = DEVTYPE_GENERAL_TOUCH},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-10-22 12:59:47 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP
|
|
|
|
|
{USB_DEVICE(0x08f2, 0x007f), .driver_info = DEVTYPE_GOTOP},
|
|
|
|
|
{USB_DEVICE(0x08f2, 0x00ce), .driver_info = DEVTYPE_GOTOP},
|
|
|
|
|
{USB_DEVICE(0x08f2, 0x00f4), .driver_info = DEVTYPE_GOTOP},
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-07-08 13:07:59 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
|
|
|
|
|
{USB_DEVICE(0x0f92, 0x0001), .driver_info = DEVTYPE_JASTEC},
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-07-28 08:35:39 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_E2I
|
|
|
|
|
{USB_DEVICE(0x1ac7, 0x0001), .driver_info = DEVTYPE_E2I},
|
|
|
|
|
#endif
|
2009-11-24 00:38:16 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC
|
|
|
|
|
{USB_DEVICE(0x14c8, 0x0003), .driver_info = DEVTYPE_ZYTRONIC},
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-11-30 15:37:07 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
|
|
|
|
|
{USB_DEVICE(0x0664, 0x0309), .driver_info = DEVTYPE_TC5UH},
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
{}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2009-07-28 08:35:39 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* e2i Part
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_E2I
|
|
|
|
|
static int e2i_init(struct usbtouch_usb *usbtouch)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
|
|
|
|
|
0x01, 0x02, 0x0000, 0x0081,
|
|
|
|
|
NULL, 0, USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
|
|
|
|
|
dbg("%s - usb_control_msg - E2I_RESET - bytes|err: %d",
|
|
|
|
|
__func__, ret);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
|
|
|
|
{
|
|
|
|
|
int tmp = (pkt[0] << 8) | pkt[1];
|
|
|
|
|
dev->x = (pkt[2] << 8) | pkt[3];
|
|
|
|
|
dev->y = (pkt[4] << 8) | pkt[5];
|
|
|
|
|
|
|
|
|
|
tmp = tmp - 0xA000;
|
|
|
|
|
dev->touch = (tmp > 0);
|
|
|
|
|
dev->press = (tmp > 0 ? tmp : 0);
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* eGalax part
|
|
|
|
|
*/
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
|
2006-03-30 04:41:07 +08:00
|
|
|
|
2008-01-18 01:01:18 +08:00
|
|
|
#ifndef MULTI_PACKET
|
|
|
|
|
#define MULTI_PACKET
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
#define EGALAX_PKT_TYPE_MASK 0xFE
|
|
|
|
|
#define EGALAX_PKT_TYPE_REPT 0x80
|
|
|
|
|
#define EGALAX_PKT_TYPE_DIAG 0x0A
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
static int egalax_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
|
|
|
|
if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->x = ((pkt[3] & 0x0F) << 7) | (pkt[4] & 0x7F);
|
|
|
|
|
dev->y = ((pkt[1] & 0x0F) << 7) | (pkt[2] & 0x7F);
|
|
|
|
|
dev->touch = pkt[0] & 0x01;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-01 03:43:24 +08:00
|
|
|
static int egalax_get_pkt_len(unsigned char *buf, int len)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
|
|
|
|
switch (buf[0] & EGALAX_PKT_TYPE_MASK) {
|
|
|
|
|
case EGALAX_PKT_TYPE_REPT:
|
|
|
|
|
return 5;
|
|
|
|
|
|
|
|
|
|
case EGALAX_PKT_TYPE_DIAG:
|
2006-08-01 03:43:24 +08:00
|
|
|
if (len < 2)
|
|
|
|
|
return -1;
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
return buf[1] + 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* PanJit Part
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
|
2006-12-12 01:17:45 +08:00
|
|
|
static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
|
|
|
|
|
dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3];
|
|
|
|
|
dev->touch = pkt[0] & 0x01;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* 3M/Microtouch Part
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_3M
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
#define MTOUCHUSB_ASYNC_REPORT 1
|
|
|
|
|
#define MTOUCHUSB_RESET 7
|
|
|
|
|
#define MTOUCHUSB_REQ_CTRLLR_ID 10
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
static int mtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
2009-01-11 15:44:22 +08:00
|
|
|
if (hwcalib_xy) {
|
|
|
|
|
dev->x = (pkt[4] << 8) | pkt[3];
|
|
|
|
|
dev->y = 0xffff - ((pkt[6] << 8) | pkt[5]);
|
|
|
|
|
} else {
|
|
|
|
|
dev->x = (pkt[8] << 8) | pkt[7];
|
|
|
|
|
dev->y = (pkt[10] << 8) | pkt[9];
|
|
|
|
|
}
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->touch = (pkt[2] & 0x40) ? 1 : 0;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int mtouch_init(struct usbtouch_usb *usbtouch)
|
|
|
|
|
{
|
2006-08-01 03:43:24 +08:00
|
|
|
int ret, i;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
|
|
|
|
|
MTOUCHUSB_RESET,
|
|
|
|
|
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
dbg("%s - usb_control_msg - MTOUCHUSB_RESET - bytes|err: %d",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__, ret);
|
2006-03-30 04:41:07 +08:00
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
2006-08-01 03:43:24 +08:00
|
|
|
msleep(150);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
|
ret = usb_control_msg(usbtouch->udev, usb_rcvctrlpipe(usbtouch->udev, 0),
|
|
|
|
|
MTOUCHUSB_ASYNC_REPORT,
|
|
|
|
|
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
dbg("%s - usb_control_msg - MTOUCHUSB_ASYNC_REPORT - bytes|err: %d",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__, ret);
|
2006-08-01 03:43:24 +08:00
|
|
|
if (ret >= 0)
|
|
|
|
|
break;
|
|
|
|
|
if (ret != -EPIPE)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
2006-03-30 04:41:07 +08:00
|
|
|
|
2009-01-11 15:44:22 +08:00
|
|
|
/* Default min/max xy are the raw values, override if using hw-calib */
|
|
|
|
|
if (hwcalib_xy) {
|
|
|
|
|
input_set_abs_params(usbtouch->input, ABS_X, 0, 0xffff, 0, 0);
|
|
|
|
|
input_set_abs_params(usbtouch->input, ABS_Y, 0, 0xffff, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* ITM Part
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ITM
|
2006-12-12 01:17:45 +08:00
|
|
|
static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
2006-12-12 01:17:45 +08:00
|
|
|
int touch;
|
|
|
|
|
/*
|
|
|
|
|
* ITM devices report invalid x/y data if not touched.
|
|
|
|
|
* if the screen was touched before but is not touched any more
|
|
|
|
|
* report touch as 0 with the last valid x/y data once. then stop
|
|
|
|
|
* reporting data until touched again.
|
|
|
|
|
*/
|
|
|
|
|
dev->press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);
|
|
|
|
|
|
|
|
|
|
touch = ~pkt[7] & 0x20;
|
|
|
|
|
if (!touch) {
|
|
|
|
|
if (dev->touch) {
|
|
|
|
|
dev->touch = 0;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);
|
|
|
|
|
dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
|
|
|
|
|
dev->touch = touch;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
return 1;
|
2006-03-30 04:41:07 +08:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2006-08-01 03:43:24 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* eTurboTouch part
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
|
2008-01-18 01:01:18 +08:00
|
|
|
#ifndef MULTI_PACKET
|
|
|
|
|
#define MULTI_PACKET
|
|
|
|
|
#endif
|
2006-12-12 01:17:45 +08:00
|
|
|
static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-08-01 03:43:24 +08:00
|
|
|
{
|
|
|
|
|
unsigned int shift;
|
|
|
|
|
|
|
|
|
|
/* packets should start with sync */
|
|
|
|
|
if (!(pkt[0] & 0x80))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
shift = (6 - (pkt[0] & 0x03));
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->x = ((pkt[3] << 7) | pkt[4]) >> shift;
|
|
|
|
|
dev->y = ((pkt[1] << 7) | pkt[2]) >> shift;
|
|
|
|
|
dev->touch = (pkt[0] & 0x10) ? 1 : 0;
|
2006-08-01 03:43:24 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int eturbo_get_pkt_len(unsigned char *buf, int len)
|
|
|
|
|
{
|
|
|
|
|
if (buf[0] & 0x80)
|
|
|
|
|
return 5;
|
|
|
|
|
if (buf[0] == 0x01)
|
|
|
|
|
return 3;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Gunze part
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
|
2006-12-12 01:17:45 +08:00
|
|
|
static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-08-01 03:43:24 +08:00
|
|
|
{
|
|
|
|
|
if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80))
|
|
|
|
|
return 0;
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[2] & 0x7F);
|
|
|
|
|
dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[3] & 0x7F);
|
|
|
|
|
dev->touch = pkt[0] & 0x20;
|
2006-08-01 03:43:24 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-11-18 05:50:15 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* DMC TSC-10/25 Part
|
|
|
|
|
*
|
|
|
|
|
* Documentation about the controller and it's protocol can be found at
|
|
|
|
|
* http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf
|
|
|
|
|
* http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf
|
|
|
|
|
*/
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
|
2006-11-18 05:50:15 +08:00
|
|
|
|
|
|
|
|
/* supported data rates. currently using 130 */
|
|
|
|
|
#define TSC10_RATE_POINT 0x50
|
|
|
|
|
#define TSC10_RATE_30 0x40
|
|
|
|
|
#define TSC10_RATE_50 0x41
|
|
|
|
|
#define TSC10_RATE_80 0x42
|
|
|
|
|
#define TSC10_RATE_100 0x43
|
|
|
|
|
#define TSC10_RATE_130 0x44
|
|
|
|
|
#define TSC10_RATE_150 0x45
|
|
|
|
|
|
|
|
|
|
/* commands */
|
|
|
|
|
#define TSC10_CMD_RESET 0x55
|
|
|
|
|
#define TSC10_CMD_RATE 0x05
|
|
|
|
|
#define TSC10_CMD_DATA1 0x01
|
|
|
|
|
|
|
|
|
|
static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
|
|
|
|
|
{
|
|
|
|
|
struct usb_device *dev = usbtouch->udev;
|
2008-04-05 03:31:47 +08:00
|
|
|
int ret = -ENOMEM;
|
|
|
|
|
unsigned char *buf;
|
2006-11-18 05:50:15 +08:00
|
|
|
|
2008-04-05 03:31:47 +08:00
|
|
|
buf = kmalloc(2, GFP_KERNEL);
|
|
|
|
|
if (!buf)
|
|
|
|
|
goto err_nobuf;
|
2006-11-18 05:50:15 +08:00
|
|
|
/* reset */
|
|
|
|
|
buf[0] = buf[1] = 0xFF;
|
|
|
|
|
ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
|
|
|
|
|
TSC10_CMD_RESET,
|
|
|
|
|
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
0, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
if (ret < 0)
|
2008-04-05 03:31:47 +08:00
|
|
|
goto err_out;
|
Input: usbtouchscreen - fix TSC-10 DM USB controllers without EEPROM
The usbtouchscreen module implements a driver for the TSC-10 DM USB
touchscreen controllers, but assumes a 2-byte response for the
CMD_RESET and CMD_RATE commands, when they can be only a single byte
when no EEPROM is connected.
The driver worked with an earlier controller revision, but new
revisions of the controller fail.
It seems the problem is that the early controller had the
SEL4/EEPROM-CS pin high, but the new controller has it down, making
the response different.
Without the fix, the controller would answer the single byte 0x06
(ACK), making the init fail with -ENODEV because buf[1] is 0xFF (as
initialized before).
As the single byte is the only thing we need to check it was ok, there
is no need to verify the second byte.
The [0x15 0x01] case is the NAK [0x15] response for when there is no
data in the EEPROM [bit-0 of second byte set], so I let that be, as I
don't have any controller with an EEPROM.
With this patch, both the earlier and latest controller work the same.
Note: This was previously submited as BUG #11961 [1] on the bugzilla
tracker, but rebased to version 2.6.27.4 and with unnecessary comments
and printk's removed.
[1] http://bugzilla.kernel.org/show_bug.cgi?id=11961
Signed-off-by: Nuno Lucas <ntlucas@gmail.com>
Acked-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2008-11-12 05:48:04 +08:00
|
|
|
if (buf[0] != 0x06) {
|
2008-04-05 03:31:47 +08:00
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto err_out;
|
|
|
|
|
}
|
2006-11-18 05:50:15 +08:00
|
|
|
|
|
|
|
|
/* set coordinate output rate */
|
|
|
|
|
buf[0] = buf[1] = 0xFF;
|
|
|
|
|
ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
|
|
|
|
|
TSC10_CMD_RATE,
|
|
|
|
|
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
TSC10_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
if (ret < 0)
|
2008-04-05 03:31:47 +08:00
|
|
|
goto err_out;
|
Input: usbtouchscreen - fix TSC-10 DM USB controllers without EEPROM
The usbtouchscreen module implements a driver for the TSC-10 DM USB
touchscreen controllers, but assumes a 2-byte response for the
CMD_RESET and CMD_RATE commands, when they can be only a single byte
when no EEPROM is connected.
The driver worked with an earlier controller revision, but new
revisions of the controller fail.
It seems the problem is that the early controller had the
SEL4/EEPROM-CS pin high, but the new controller has it down, making
the response different.
Without the fix, the controller would answer the single byte 0x06
(ACK), making the init fail with -ENODEV because buf[1] is 0xFF (as
initialized before).
As the single byte is the only thing we need to check it was ok, there
is no need to verify the second byte.
The [0x15 0x01] case is the NAK [0x15] response for when there is no
data in the EEPROM [bit-0 of second byte set], so I let that be, as I
don't have any controller with an EEPROM.
With this patch, both the earlier and latest controller work the same.
Note: This was previously submited as BUG #11961 [1] on the bugzilla
tracker, but rebased to version 2.6.27.4 and with unnecessary comments
and printk's removed.
[1] http://bugzilla.kernel.org/show_bug.cgi?id=11961
Signed-off-by: Nuno Lucas <ntlucas@gmail.com>
Acked-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2008-11-12 05:48:04 +08:00
|
|
|
if ((buf[0] != 0x06) && (buf[0] != 0x15 || buf[1] != 0x01)) {
|
2008-04-05 03:31:47 +08:00
|
|
|
ret = -ENODEV;
|
|
|
|
|
goto err_out;
|
|
|
|
|
}
|
2006-11-18 05:50:15 +08:00
|
|
|
|
|
|
|
|
/* start sending data */
|
|
|
|
|
ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
|
|
|
|
|
TSC10_CMD_DATA1,
|
|
|
|
|
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
|
|
|
|
|
0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
|
2008-04-05 03:31:47 +08:00
|
|
|
err_out:
|
|
|
|
|
kfree(buf);
|
|
|
|
|
err_nobuf:
|
|
|
|
|
return ret;
|
2006-11-18 05:50:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
2006-11-18 05:50:15 +08:00
|
|
|
{
|
2006-12-12 01:17:45 +08:00
|
|
|
dev->x = ((pkt[2] & 0x03) << 8) | pkt[1];
|
|
|
|
|
dev->y = ((pkt[4] & 0x03) << 8) | pkt[3];
|
|
|
|
|
dev->touch = pkt[0] & 0x01;
|
2006-11-18 05:50:15 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2007-07-03 13:55:03 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* 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
|
|
|
|
|
|
2009-11-30 15:37:07 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* ET&T TC5UH part
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
|
|
|
|
|
static int tc5uh_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->touch = pkt[0] & 0x01;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2007-07-03 13:55:03 +08:00
|
|
|
|
2007-09-05 11:45:01 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* IdealTEK URTC1000 Part
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
|
2008-01-18 01:01:18 +08:00
|
|
|
#ifndef MULTI_PACKET
|
|
|
|
|
#define MULTI_PACKET
|
|
|
|
|
#endif
|
2007-09-05 11:45:01 +08:00
|
|
|
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
|
|
|
|
|
|
2007-10-13 02:19:40 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* 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
|
2007-09-05 11:45:01 +08:00
|
|
|
|
2007-10-22 12:59:47 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* GoTop Part
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP
|
|
|
|
|
static int gotop_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
|
|
|
|
{
|
|
|
|
|
dev->x = ((pkt[1] & 0x38) << 4) | pkt[2];
|
|
|
|
|
dev->y = ((pkt[1] & 0x07) << 7) | pkt[3];
|
|
|
|
|
dev->touch = pkt[0] & 0x01;
|
2009-07-08 13:07:59 +08:00
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* JASTEC Part
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
|
|
|
|
|
static int jastec_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
|
|
|
|
{
|
|
|
|
|
dev->x = ((pkt[0] & 0x3f) << 6) | (pkt[2] & 0x3f);
|
|
|
|
|
dev->y = ((pkt[1] & 0x3f) << 6) | (pkt[3] & 0x3f);
|
|
|
|
|
dev->touch = (pkt[0] & 0x40) >> 6;
|
|
|
|
|
|
2007-10-22 12:59:47 +08:00
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-11-24 00:38:16 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* Zytronic Part
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC
|
|
|
|
|
static int zytronic_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
|
|
|
|
|
{
|
|
|
|
|
switch (pkt[0]) {
|
|
|
|
|
case 0x3A: /* command response */
|
|
|
|
|
dbg("%s: Command response %d", __func__, pkt[1]);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 0xC0: /* down */
|
|
|
|
|
dev->x = (pkt[1] & 0x7f) | ((pkt[2] & 0x07) << 7);
|
|
|
|
|
dev->y = (pkt[3] & 0x7f) | ((pkt[4] & 0x07) << 7);
|
|
|
|
|
dev->touch = 1;
|
|
|
|
|
dbg("%s: down %d,%d", __func__, dev->x, dev->y);
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
case 0x80: /* up */
|
|
|
|
|
dev->x = (pkt[1] & 0x7f) | ((pkt[2] & 0x07) << 7);
|
|
|
|
|
dev->y = (pkt[3] & 0x7f) | ((pkt[4] & 0x07) << 7);
|
|
|
|
|
dev->touch = 0;
|
|
|
|
|
dbg("%s: up %d,%d", __func__, dev->x, dev->y);
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
dbg("%s: Unknown return %d", __func__, pkt[0]);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2007-10-22 12:59:47 +08:00
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* the different device descriptors
|
|
|
|
|
*/
|
2008-01-18 01:01:18 +08:00
|
|
|
#ifdef MULTI_PACKET
|
|
|
|
|
static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,
|
|
|
|
|
unsigned char *pkt, int len);
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
static struct usbtouch_device_info usbtouch_dev_info[] = {
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
|
2006-03-30 04:41:07 +08:00
|
|
|
[DEVTYPE_EGALAX] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x07ff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x07ff,
|
|
|
|
|
.rept_size = 16,
|
2006-08-01 03:43:24 +08:00
|
|
|
.process_pkt = usbtouch_process_multi,
|
|
|
|
|
.get_pkt_len = egalax_get_pkt_len,
|
2006-03-30 04:41:07 +08:00
|
|
|
.read_data = egalax_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
|
2006-03-30 04:41:07 +08:00
|
|
|
[DEVTYPE_PANJIT] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.rept_size = 8,
|
|
|
|
|
.read_data = panjit_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_3M
|
2006-03-30 04:41:07 +08:00
|
|
|
[DEVTYPE_3M] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x4000,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x4000,
|
|
|
|
|
.rept_size = 11,
|
|
|
|
|
.read_data = mtouch_read_data,
|
|
|
|
|
.init = mtouch_init,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ITM
|
2006-03-30 04:41:07 +08:00
|
|
|
[DEVTYPE_ITM] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.max_press = 0xff,
|
|
|
|
|
.rept_size = 8,
|
|
|
|
|
.read_data = itm_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2006-08-01 03:43:24 +08:00
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
|
2006-08-01 03:43:24 +08:00
|
|
|
[DEVTYPE_ETURBO] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x07ff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x07ff,
|
|
|
|
|
.rept_size = 8,
|
|
|
|
|
.process_pkt = usbtouch_process_multi,
|
|
|
|
|
.get_pkt_len = eturbo_get_pkt_len,
|
|
|
|
|
.read_data = eturbo_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
|
2006-08-01 03:43:24 +08:00
|
|
|
[DEVTYPE_GUNZE] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.rept_size = 4,
|
|
|
|
|
.read_data = gunze_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2006-11-18 05:50:15 +08:00
|
|
|
|
2007-06-12 12:33:13 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
|
2006-11-18 05:50:15 +08:00
|
|
|
[DEVTYPE_DMC_TSC10] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x03ff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x03ff,
|
|
|
|
|
.rept_size = 5,
|
|
|
|
|
.init = dmc_tsc10_init,
|
|
|
|
|
.read_data = dmc_tsc10_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2007-07-03 13:55:03 +08:00
|
|
|
|
|
|
|
|
#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
|
2007-09-05 11:45:01 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_IDEALTEK
|
|
|
|
|
[DEVTYPE_IDEALTEK] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.rept_size = 8,
|
|
|
|
|
.process_pkt = usbtouch_process_multi,
|
|
|
|
|
.get_pkt_len = idealtek_get_pkt_len,
|
|
|
|
|
.read_data = idealtek_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2007-10-13 02:19:40 +08:00
|
|
|
|
|
|
|
|
#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,
|
2007-10-22 12:59:47 +08:00
|
|
|
},
|
2007-10-13 02:19:40 +08:00
|
|
|
#endif
|
|
|
|
|
|
2007-10-22 12:59:47 +08:00
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_GOTOP
|
|
|
|
|
[DEVTYPE_GOTOP] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x03ff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x03ff,
|
|
|
|
|
.rept_size = 4,
|
|
|
|
|
.read_data = gotop_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2009-07-08 13:07:59 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_JASTEC
|
|
|
|
|
[DEVTYPE_JASTEC] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.rept_size = 4,
|
|
|
|
|
.read_data = jastec_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2009-07-28 08:35:39 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_E2I
|
|
|
|
|
[DEVTYPE_E2I] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x7fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x7fff,
|
|
|
|
|
.rept_size = 6,
|
|
|
|
|
.init = e2i_init,
|
|
|
|
|
.read_data = e2i_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2009-11-24 00:38:16 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ZYTRONIC
|
|
|
|
|
[DEVTYPE_ZYTRONIC] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x03ff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x03ff,
|
|
|
|
|
.rept_size = 5,
|
|
|
|
|
.read_data = zytronic_read_data,
|
|
|
|
|
.irq_always = true,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2009-11-30 15:37:07 +08:00
|
|
|
|
|
|
|
|
#ifdef CONFIG_TOUCHSCREEN_USB_ETT_TC5UH
|
|
|
|
|
[DEVTYPE_TC5UH] = {
|
|
|
|
|
.min_xc = 0x0,
|
|
|
|
|
.max_xc = 0x0fff,
|
|
|
|
|
.min_yc = 0x0,
|
|
|
|
|
.max_yc = 0x0fff,
|
|
|
|
|
.rept_size = 5,
|
|
|
|
|
.read_data = tc5uh_read_data,
|
|
|
|
|
},
|
|
|
|
|
#endif
|
2006-03-30 04:41:07 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Generic Part
|
|
|
|
|
*/
|
|
|
|
|
static void usbtouch_process_pkt(struct usbtouch_usb *usbtouch,
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
unsigned char *pkt, int len)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
|
|
|
|
struct usbtouch_device_info *type = usbtouch->type;
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
if (!type->read_data(usbtouch, pkt))
|
2006-03-30 04:41:07 +08:00
|
|
|
return;
|
|
|
|
|
|
2006-12-12 01:17:45 +08:00
|
|
|
input_report_key(usbtouch->input, BTN_TOUCH, usbtouch->touch);
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
if (swap_xy) {
|
2006-12-12 01:17:45 +08:00
|
|
|
input_report_abs(usbtouch->input, ABS_X, usbtouch->y);
|
|
|
|
|
input_report_abs(usbtouch->input, ABS_Y, usbtouch->x);
|
2006-03-30 04:41:07 +08:00
|
|
|
} else {
|
2006-12-12 01:17:45 +08:00
|
|
|
input_report_abs(usbtouch->input, ABS_X, usbtouch->x);
|
|
|
|
|
input_report_abs(usbtouch->input, ABS_Y, usbtouch->y);
|
2006-03-30 04:41:07 +08:00
|
|
|
}
|
|
|
|
|
if (type->max_press)
|
2006-12-12 01:17:45 +08:00
|
|
|
input_report_abs(usbtouch->input, ABS_PRESSURE, usbtouch->press);
|
2006-03-30 04:41:07 +08:00
|
|
|
input_sync(usbtouch->input);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-08-01 03:43:24 +08:00
|
|
|
#ifdef MULTI_PACKET
|
|
|
|
|
static void usbtouch_process_multi(struct usbtouch_usb *usbtouch,
|
|
|
|
|
unsigned char *pkt, int len)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *buffer;
|
|
|
|
|
int pkt_len, pos, buf_len, tmp;
|
|
|
|
|
|
|
|
|
|
/* process buffer */
|
|
|
|
|
if (unlikely(usbtouch->buf_len)) {
|
|
|
|
|
/* try to get size */
|
|
|
|
|
pkt_len = usbtouch->type->get_pkt_len(
|
|
|
|
|
usbtouch->buffer, usbtouch->buf_len);
|
|
|
|
|
|
|
|
|
|
/* drop? */
|
|
|
|
|
if (unlikely(!pkt_len))
|
|
|
|
|
goto out_flush_buf;
|
|
|
|
|
|
|
|
|
|
/* need to append -pkt_len bytes before able to get size */
|
|
|
|
|
if (unlikely(pkt_len < 0)) {
|
|
|
|
|
int append = -pkt_len;
|
|
|
|
|
if (unlikely(append > len))
|
|
|
|
|
append = len;
|
|
|
|
|
if (usbtouch->buf_len + append >= usbtouch->type->rept_size)
|
|
|
|
|
goto out_flush_buf;
|
|
|
|
|
memcpy(usbtouch->buffer + usbtouch->buf_len, pkt, append);
|
|
|
|
|
usbtouch->buf_len += append;
|
|
|
|
|
|
|
|
|
|
pkt_len = usbtouch->type->get_pkt_len(
|
|
|
|
|
usbtouch->buffer, usbtouch->buf_len);
|
|
|
|
|
if (pkt_len < 0)
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* append */
|
|
|
|
|
tmp = pkt_len - usbtouch->buf_len;
|
|
|
|
|
if (usbtouch->buf_len + tmp >= usbtouch->type->rept_size)
|
|
|
|
|
goto out_flush_buf;
|
|
|
|
|
memcpy(usbtouch->buffer + usbtouch->buf_len, pkt, tmp);
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
usbtouch_process_pkt(usbtouch, usbtouch->buffer, pkt_len);
|
2006-08-01 03:43:24 +08:00
|
|
|
|
|
|
|
|
buffer = pkt + tmp;
|
|
|
|
|
buf_len = len - tmp;
|
|
|
|
|
} else {
|
|
|
|
|
buffer = pkt;
|
|
|
|
|
buf_len = len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* loop over the received packet, process */
|
|
|
|
|
pos = 0;
|
|
|
|
|
while (pos < buf_len) {
|
|
|
|
|
/* get packet len */
|
2008-01-18 01:01:18 +08:00
|
|
|
pkt_len = usbtouch->type->get_pkt_len(buffer + pos,
|
|
|
|
|
buf_len - pos);
|
2006-08-01 03:43:24 +08:00
|
|
|
|
2008-01-18 01:01:18 +08:00
|
|
|
/* unknown packet: skip one byte */
|
|
|
|
|
if (unlikely(!pkt_len)) {
|
|
|
|
|
pos++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-08-01 03:43:24 +08:00
|
|
|
|
|
|
|
|
/* full packet: process */
|
|
|
|
|
if (likely((pkt_len > 0) && (pkt_len <= buf_len - pos))) {
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
usbtouch_process_pkt(usbtouch, buffer + pos, pkt_len);
|
2006-08-01 03:43:24 +08:00
|
|
|
} else {
|
|
|
|
|
/* incomplete packet: save in buffer */
|
|
|
|
|
memcpy(usbtouch->buffer, buffer + pos, buf_len - pos);
|
|
|
|
|
usbtouch->buf_len = buf_len - pos;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
pos += pkt_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out_flush_buf:
|
|
|
|
|
usbtouch->buf_len = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
static void usbtouch_irq(struct urb *urb)
|
2006-03-30 04:41:07 +08:00
|
|
|
{
|
|
|
|
|
struct usbtouch_usb *usbtouch = urb->context;
|
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
|
|
switch (urb->status) {
|
|
|
|
|
case 0:
|
|
|
|
|
/* success */
|
|
|
|
|
break;
|
2006-09-19 13:49:02 +08:00
|
|
|
case -ETIME:
|
2006-03-30 04:41:07 +08:00
|
|
|
/* this urb is timing out */
|
|
|
|
|
dbg("%s - urb timed out - was the device unplugged?",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__);
|
2006-03-30 04:41:07 +08:00
|
|
|
return;
|
|
|
|
|
case -ECONNRESET:
|
|
|
|
|
case -ENOENT:
|
|
|
|
|
case -ESHUTDOWN:
|
|
|
|
|
/* this urb is terminated, clean up */
|
|
|
|
|
dbg("%s - urb shutting down with status: %d",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__, urb->status);
|
2006-03-30 04:41:07 +08:00
|
|
|
return;
|
|
|
|
|
default:
|
|
|
|
|
dbg("%s - nonzero urb status received: %d",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__, urb->status);
|
2006-03-30 04:41:07 +08:00
|
|
|
goto exit;
|
|
|
|
|
}
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 21:55:46 +08:00
|
|
|
usbtouch->type->process_pkt(usbtouch, usbtouch->data, urb->actual_length);
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
exit:
|
|
|
|
|
retval = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (retval)
|
|
|
|
|
err("%s - usb_submit_urb failed with result: %d",
|
2008-05-05 23:36:18 +08:00
|
|
|
__func__, retval);
|
2006-03-30 04:41:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int usbtouch_open(struct input_dev *input)
|
|
|
|
|
{
|
2007-04-12 13:34:39 +08:00
|
|
|
struct usbtouch_usb *usbtouch = input_get_drvdata(input);
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
usbtouch->irq->dev = usbtouch->udev;
|
|
|
|
|
|
2009-11-24 00:38:16 +08:00
|
|
|
if (!usbtouch->type->irq_always) {
|
|
|
|
|
if (usb_submit_urb(usbtouch->irq, GFP_KERNEL))
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void usbtouch_close(struct input_dev *input)
|
|
|
|
|
{
|
2007-04-12 13:34:39 +08:00
|
|
|
struct usbtouch_usb *usbtouch = input_get_drvdata(input);
|
2006-03-30 04:41:07 +08:00
|
|
|
|
2009-11-24 00:38:16 +08:00
|
|
|
if (!usbtouch->type->irq_always)
|
|
|
|
|
usb_kill_urb(usbtouch->irq);
|
2006-03-30 04:41:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void usbtouch_free_buffers(struct usb_device *udev,
|
|
|
|
|
struct usbtouch_usb *usbtouch)
|
|
|
|
|
{
|
2007-05-03 12:57:29 +08:00
|
|
|
usb_buffer_free(udev, usbtouch->type->rept_size,
|
|
|
|
|
usbtouch->data, usbtouch->data_dma);
|
2006-03-30 04:41:07 +08:00
|
|
|
kfree(usbtouch->buffer);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int usbtouch_probe(struct usb_interface *intf,
|
|
|
|
|
const struct usb_device_id *id)
|
|
|
|
|
{
|
|
|
|
|
struct usbtouch_usb *usbtouch;
|
|
|
|
|
struct input_dev *input_dev;
|
|
|
|
|
struct usb_host_interface *interface;
|
|
|
|
|
struct usb_endpoint_descriptor *endpoint;
|
|
|
|
|
struct usb_device *udev = interface_to_usbdev(intf);
|
|
|
|
|
struct usbtouch_device_info *type;
|
2006-08-01 03:43:24 +08:00
|
|
|
int err = -ENOMEM;
|
2008-07-03 22:45:37 +08:00
|
|
|
|
|
|
|
|
/* some devices are ignored */
|
|
|
|
|
if (id->driver_info == DEVTYPE_IGNORE)
|
|
|
|
|
return -ENODEV;
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
interface = intf->cur_altsetting;
|
|
|
|
|
endpoint = &interface->endpoint[0].desc;
|
|
|
|
|
|
|
|
|
|
usbtouch = kzalloc(sizeof(struct usbtouch_usb), GFP_KERNEL);
|
|
|
|
|
input_dev = input_allocate_device();
|
|
|
|
|
if (!usbtouch || !input_dev)
|
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
|
|
type = &usbtouch_dev_info[id->driver_info];
|
|
|
|
|
usbtouch->type = type;
|
|
|
|
|
if (!type->process_pkt)
|
|
|
|
|
type->process_pkt = usbtouch_process_pkt;
|
|
|
|
|
|
|
|
|
|
usbtouch->data = usb_buffer_alloc(udev, type->rept_size,
|
2006-12-07 12:33:17 +08:00
|
|
|
GFP_KERNEL, &usbtouch->data_dma);
|
2006-03-30 04:41:07 +08:00
|
|
|
if (!usbtouch->data)
|
|
|
|
|
goto out_free;
|
|
|
|
|
|
2008-01-18 01:01:18 +08:00
|
|
|
if (type->get_pkt_len) {
|
2006-03-30 04:41:07 +08:00
|
|
|
usbtouch->buffer = kmalloc(type->rept_size, GFP_KERNEL);
|
|
|
|
|
if (!usbtouch->buffer)
|
|
|
|
|
goto out_free_buffers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usbtouch->irq = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
|
|
if (!usbtouch->irq) {
|
2008-05-05 23:36:18 +08:00
|
|
|
dbg("%s - usb_alloc_urb failed: usbtouch->irq", __func__);
|
2006-03-30 04:41:07 +08:00
|
|
|
goto out_free_buffers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usbtouch->udev = udev;
|
|
|
|
|
usbtouch->input = input_dev;
|
|
|
|
|
|
|
|
|
|
if (udev->manufacturer)
|
|
|
|
|
strlcpy(usbtouch->name, udev->manufacturer, sizeof(usbtouch->name));
|
|
|
|
|
|
|
|
|
|
if (udev->product) {
|
|
|
|
|
if (udev->manufacturer)
|
|
|
|
|
strlcat(usbtouch->name, " ", sizeof(usbtouch->name));
|
|
|
|
|
strlcat(usbtouch->name, udev->product, sizeof(usbtouch->name));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strlen(usbtouch->name))
|
|
|
|
|
snprintf(usbtouch->name, sizeof(usbtouch->name),
|
|
|
|
|
"USB Touchscreen %04x:%04x",
|
|
|
|
|
le16_to_cpu(udev->descriptor.idVendor),
|
|
|
|
|
le16_to_cpu(udev->descriptor.idProduct));
|
|
|
|
|
|
|
|
|
|
usb_make_path(udev, usbtouch->phys, sizeof(usbtouch->phys));
|
2007-09-07 09:32:16 +08:00
|
|
|
strlcat(usbtouch->phys, "/input0", sizeof(usbtouch->phys));
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
input_dev->name = usbtouch->name;
|
|
|
|
|
input_dev->phys = usbtouch->phys;
|
|
|
|
|
usb_to_input_id(udev, &input_dev->id);
|
2007-04-12 13:35:03 +08:00
|
|
|
input_dev->dev.parent = &intf->dev;
|
2007-04-12 13:34:39 +08:00
|
|
|
|
|
|
|
|
input_set_drvdata(input_dev, usbtouch);
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
input_dev->open = usbtouch_open;
|
|
|
|
|
input_dev->close = usbtouch_close;
|
|
|
|
|
|
2007-10-19 14:40:32 +08:00
|
|
|
input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
|
|
|
|
|
input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
|
2006-03-30 04:41:07 +08:00
|
|
|
input_set_abs_params(input_dev, ABS_X, type->min_xc, type->max_xc, 0, 0);
|
|
|
|
|
input_set_abs_params(input_dev, ABS_Y, type->min_yc, type->max_yc, 0, 0);
|
|
|
|
|
if (type->max_press)
|
|
|
|
|
input_set_abs_params(input_dev, ABS_PRESSURE, type->min_press,
|
|
|
|
|
type->max_press, 0, 0);
|
|
|
|
|
|
|
|
|
|
usb_fill_int_urb(usbtouch->irq, usbtouch->udev,
|
2006-10-28 04:46:03 +08:00
|
|
|
usb_rcvintpipe(usbtouch->udev, endpoint->bEndpointAddress),
|
2006-03-30 04:41:07 +08:00
|
|
|
usbtouch->data, type->rept_size,
|
|
|
|
|
usbtouch_irq, usbtouch, endpoint->bInterval);
|
|
|
|
|
|
2006-08-01 03:43:24 +08:00
|
|
|
usbtouch->irq->dev = usbtouch->udev;
|
2006-03-30 04:41:07 +08:00
|
|
|
usbtouch->irq->transfer_dma = usbtouch->data_dma;
|
|
|
|
|
usbtouch->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
|
|
|
|
|
|
|
|
|
|
/* device specific init */
|
|
|
|
|
if (type->init) {
|
|
|
|
|
err = type->init(usbtouch);
|
|
|
|
|
if (err) {
|
2008-05-05 23:36:18 +08:00
|
|
|
dbg("%s - type->init() failed, err: %d", __func__, err);
|
2006-03-30 04:41:07 +08:00
|
|
|
goto out_free_buffers;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
err = input_register_device(usbtouch->input);
|
|
|
|
|
if (err) {
|
2008-05-05 23:36:18 +08:00
|
|
|
dbg("%s - input_register_device failed, err: %d", __func__, err);
|
2006-03-30 04:41:07 +08:00
|
|
|
goto out_free_buffers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usb_set_intfdata(intf, usbtouch);
|
|
|
|
|
|
2009-11-24 00:38:16 +08:00
|
|
|
if (usbtouch->type->irq_always)
|
|
|
|
|
usb_submit_urb(usbtouch->irq, GFP_KERNEL);
|
|
|
|
|
|
2006-03-30 04:41:07 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
out_free_buffers:
|
|
|
|
|
usbtouch_free_buffers(udev, usbtouch);
|
|
|
|
|
out_free:
|
|
|
|
|
input_free_device(input_dev);
|
|
|
|
|
kfree(usbtouch);
|
2006-08-01 03:43:24 +08:00
|
|
|
return err;
|
2006-03-30 04:41:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void usbtouch_disconnect(struct usb_interface *intf)
|
|
|
|
|
{
|
|
|
|
|
struct usbtouch_usb *usbtouch = usb_get_intfdata(intf);
|
|
|
|
|
|
2008-05-05 23:36:18 +08:00
|
|
|
dbg("%s - called", __func__);
|
2006-03-30 04:41:07 +08:00
|
|
|
|
|
|
|
|
if (!usbtouch)
|
|
|
|
|
return;
|
|
|
|
|
|
2008-05-05 23:36:18 +08:00
|
|
|
dbg("%s - usbtouch is initialized, cleaning up", __func__);
|
2006-03-30 04:41:07 +08:00
|
|
|
usb_set_intfdata(intf, NULL);
|
2009-11-24 00:10:50 +08:00
|
|
|
/* this will stop IO via close */
|
2006-03-30 04:41:07 +08:00
|
|
|
input_unregister_device(usbtouch->input);
|
|
|
|
|
usb_free_urb(usbtouch->irq);
|
|
|
|
|
usbtouch_free_buffers(interface_to_usbdev(intf), usbtouch);
|
|
|
|
|
kfree(usbtouch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
MODULE_DEVICE_TABLE(usb, usbtouch_devices);
|
|
|
|
|
|
|
|
|
|
static struct usb_driver usbtouch_driver = {
|
|
|
|
|
.name = "usbtouchscreen",
|
|
|
|
|
.probe = usbtouch_probe,
|
|
|
|
|
.disconnect = usbtouch_disconnect,
|
|
|
|
|
.id_table = usbtouch_devices,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int __init usbtouch_init(void)
|
|
|
|
|
{
|
|
|
|
|
return usb_register(&usbtouch_driver);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void __exit usbtouch_cleanup(void)
|
|
|
|
|
{
|
|
|
|
|
usb_deregister(&usbtouch_driver);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module_init(usbtouch_init);
|
|
|
|
|
module_exit(usbtouch_cleanup);
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
|
|
MODULE_ALIAS("touchkitusb");
|
|
|
|
|
MODULE_ALIAS("itmtouch");
|
|
|
|
|
MODULE_ALIAS("mtouchusb");
|
