lkml.org 
[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for Feb 27 (usbtouchscreen)
On 2012-02-27 19:10 , Randy Dunlap wrote:
> On 02/26/2012 11:20 PM, Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20120224:
>
>
>
> on x86_64:
>
> drivers/input/touchscreen/usbtouchscreen.c:1232:18: error: 'usbtouch_process_multi' undeclared here (not in a function)
>
>
> Full randconfig file is attached.
>

Hi

I had a quick look with gitweb. The following change causes the problem, comments inline:

> From: Armando Visconti <armando.visconti@st.com>
> Date: Fri, 24 Feb 2012 08:51:37 +0000 (-0800)
> Subject: Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
> X-Git-Tag: next-20120227~55^2~4
> X-Git-Url:
http://git.kernel.org/gitweb.cgi?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=e6307aa07c5a11022f0ccee19a8ff0ba033eeb93
>
> Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
>
> The Data Modul TP 72037 EasyTouch controller is derived from EGALAX
> controller and is capable of detecting dual contacts. Packets can be 5
> bytes or 10 bytes long, depending whether one or two contacts are
> detected. Format is same as EGALAX touch controller, but with x and y
> coordinates inverted.
>
> Signed-off-by: Armando Visconti <armando.visconti@st.com>
> Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
> ---
>
> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> index 2b21a70..2acf16f 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -607,6 +607,7 @@ config TOUCHSCREEN_USB_COMPOSITE
> - JASTEC USB Touch Controller/DigiTech DTR-02U
> - Zytronic controllers
> - Elo TouchSystems 2700 IntelliTouch
> + - EasyTouch USB Touch Controller from Data Modul
>
> Have a look at <http://linux.chapter7.ch/touchkit/> for
> a usage description and the required user-space stuff.
> @@ -711,6 +712,14 @@ config TOUCHSCREEN_USB_NEXIO
> bool "NEXIO/iNexio device support" if EXPERT
> depends on TOUCHSCREEN_USB_COMPOSITE
>
> +config TOUCHSCREEN_USB_EASYTOUCH
> + default y
> + bool "EasyTouch USB Touch controller device support" if EMBEDDED
> + depends on TOUCHSCREEN_USB_COMPOSITE
> + help
> + Say Y here if you have a EasyTouch USB Touch controller device support.
> + If unsure, say N.
> +
> config TOUCHSCREEN_TOUCHIT213
> tristate "Sahara TouchIT-213 touchscreen"
> select SERIO
> diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
> index 9dbd8b4..5813089 100644
> --- a/drivers/input/touchscreen/usbtouchscreen.c
> +++ b/drivers/input/touchscreen/usbtouchscreen.c
> @@ -17,6 +17,7 @@
> * - Zytronic capacitive touchscreen
> * - NEXIO/iNexio
> * - Elo TouchSystems 2700 IntelliTouch
> + * - EasyTouch USB Dual/Multi touch controller from Data Modul
> *
> * Copyright (C) 2004-2007 by Daniel Ritz <daniel.ritz@gmx.ch>
> * Copyright (C) by Todd E. Johnson (mtouchusb.c)
> @@ -140,6 +141,7 @@ enum {
> DEVTYPE_TC45USB,
> DEVTYPE_NEXIO,
> DEVTYPE_ELO,
> + DEVTYPE_ETOUCH,
> };
>
> #define USB_DEVICE_HID_CLASS(vend, prod) \
> @@ -245,6 +247,10 @@ static const struct usb_device_id usbtouch_devices[] = {
> {USB_DEVICE(0x04e7, 0x0020), .driver_info = DEVTYPE_ELO},
> #endif
>
> +#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH
> + {USB_DEVICE(0x7374, 0x0001), .driver_info = DEVTYPE_ETOUCH},
> +#endif
> +
> {}
> };
>
> @@ -326,6 +332,47 @@ static int egalax_get_pkt_len(unsigned char *buf, int len)
> }
> #endif
>
> +/*****************************************************************************
> + * EasyTouch part
> + */
> +
> +#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH

here, some lines are missing:
#ifndef MULTI_PACKET
#define MULTI_PACKET
#endif
adding these will fix the compile error.

> +
> +#define EGALAX_PKT_TYPE_MASK 0xFE
> +#define EGALAX_PKT_TYPE_REPT 0x80
> +#define EGALAX_PKT_TYPE_REPT2 0xB0
> +#define EGALAX_PKT_TYPE_DIAG 0x0A

The names here are wrong. The prefix EGALAX_ is only for eGalax controllers and some
of them are already defined in the eGalax part of the driver. This will re-define them
which is not good. Please use ETOUCH_... instead.

> +
> +static int etouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
> +{
> + if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT &&
> + (pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT2)
> + return 0;
> +
> + dev->x = ((pkt[1] & 0x1F) << 7) | (pkt[2] & 0x7F);
> + dev->y = ((pkt[3] & 0x1F) << 7) | (pkt[4] & 0x7F);
> + dev->touch = pkt[0] & 0x01;
> +
> + return 1;
> +}
> +
> +static int etouch_get_pkt_len(unsigned char *buf, int len)
> +{
> + switch (buf[0] & EGALAX_PKT_TYPE_MASK) {
> + case EGALAX_PKT_TYPE_REPT:
> + case EGALAX_PKT_TYPE_REPT2:
> + return 5;

The description states that packets can be 10 bytes long, but this case is not
handled here. How does the 10 byte packet look like? Is it two five byte packets?
How is the format? What is contained in the other 5 bytes?

Anyway: if it's two 5 byte packets, shouldn't the data from both packets be used
for _one_ input event for increased accuracy or something?
If it's not two 5 byte packets, the function must return 10 for a 10 byte packet.
Otherwise the driver will have to sync for each packet (which works fine but is slower).

> +
> + case EGALAX_PKT_TYPE_DIAG:
> + if (len < 2)
> + return -1;
> +
> + return buf[1] + 2;
> + }
> +
> + return 0;
> +}
> +#endif
>
> /*****************************************************************************
> * PanJit Part
> @@ -1175,6 +1222,18 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
> .exit = nexio_exit,
> },
> #endif
> +#ifdef CONFIG_TOUCHSCREEN_USB_EASYTOUCH
> + [DEVTYPE_ETOUCH] = {
> + .min_xc = 0x0,
> + .max_xc = 0x07ff,
> + .min_yc = 0x0,
> + .max_yc = 0x07ff,
> + .rept_size = 16,
> + .process_pkt = usbtouch_process_multi,
> + .get_pkt_len = etouch_get_pkt_len,
> + .read_data = etouch_read_data,
> + },
> +#endif
> };
>
>

Cheers
-daniel


\
 
 \ /
  Last update: 2012-02-27 22:41    [W:0.064 / U:38.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site