Input: psmouse - add support for eGalax PS/2 touchscreen controller
Based on the touchkit USB and lifebook PS/2 touchscreen driver. The egalax touchsreen controller (PS/2 or USB version) is used in this 7" device: http://www.cartft.com/catalog/il/449 Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Stefan Lucke
Dmitry Torokhov
parent
62b529a7b9
commit
24bf10ab2d
|
|
@ -14,4 +14,5 @@ obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o
|
|||
obj-$(CONFIG_MOUSE_HIL) += hil_ptr.o
|
||||
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
|
||||
|
||||
psmouse-objs := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o trackpoint.o
|
||||
psmouse-objs := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o \
|
||||
trackpoint.o touchkit_ps2.o
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "alps.h"
|
||||
#include "lifebook.h"
|
||||
#include "trackpoint.h"
|
||||
#include "touchkit_ps2.h"
|
||||
|
||||
#define DRIVER_DESC "PS/2 mouse driver"
|
||||
|
||||
|
|
@ -605,14 +606,20 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|||
}
|
||||
}
|
||||
|
||||
if (max_proto > PSMOUSE_IMEX && genius_detect(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_GENPS;
|
||||
if (max_proto > PSMOUSE_IMEX) {
|
||||
|
||||
if (max_proto > PSMOUSE_IMEX && ps2pp_init(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_PS2PP;
|
||||
if (genius_detect(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_GENPS;
|
||||
|
||||
if (max_proto > PSMOUSE_IMEX && trackpoint_detect(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_TRACKPOINT;
|
||||
if (ps2pp_init(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_PS2PP;
|
||||
|
||||
if (trackpoint_detect(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_TRACKPOINT;
|
||||
|
||||
if (touchkit_ps2_detect(psmouse, set_properties) == 0)
|
||||
return PSMOUSE_TOUCHKIT_PS2;
|
||||
}
|
||||
|
||||
/*
|
||||
* Reset to defaults in case the device got confused by extended
|
||||
|
|
@ -712,6 +719,12 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
|||
.alias = "trackpoint",
|
||||
.detect = trackpoint_detect,
|
||||
},
|
||||
{
|
||||
.type = PSMOUSE_TOUCHKIT_PS2,
|
||||
.name = "touchkitPS/2",
|
||||
.alias = "touchkit",
|
||||
.detect = touchkit_ps2_detect,
|
||||
},
|
||||
{
|
||||
.type = PSMOUSE_AUTO,
|
||||
.name = "auto",
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ enum psmouse_type {
|
|||
PSMOUSE_ALPS,
|
||||
PSMOUSE_LIFEBOOK,
|
||||
PSMOUSE_TRACKPOINT,
|
||||
PSMOUSE_TOUCHKIT_PS2,
|
||||
PSMOUSE_AUTO /* This one should always be last */
|
||||
};
|
||||
|
||||
|
|
|
|||
100
drivers/input/mouse/touchkit_ps2.c
Normal file
100
drivers/input/mouse/touchkit_ps2.c
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
/* ----------------------------------------------------------------------------
|
||||
* touchkit_ps2.c -- Driver for eGalax TouchKit PS/2 Touchscreens
|
||||
*
|
||||
* Copyright (C) 2005 by Stefan Lucke
|
||||
* Copyright (C) 2004 by Daniel Ritz
|
||||
* 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.
|
||||
*
|
||||
* Based upon touchkitusb.c
|
||||
*
|
||||
* Vendor documentation is available in support section of:
|
||||
* http://www.egalax.com.tw/
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <linux/input.h>
|
||||
#include <linux/serio.h>
|
||||
#include <linux/libps2.h>
|
||||
|
||||
#include "psmouse.h"
|
||||
#include "touchkit_ps2.h"
|
||||
|
||||
#define TOUCHKIT_MAX_XC 0x07ff
|
||||
#define TOUCHKIT_MAX_YC 0x07ff
|
||||
|
||||
#define TOUCHKIT_CMD 0x0a
|
||||
#define TOUCHKIT_CMD_LENGTH 1
|
||||
|
||||
#define TOUCHKIT_CMD_ACTIVE 'A'
|
||||
#define TOUCHKIT_CMD_FIRMWARE_VERSION 'D'
|
||||
#define TOUCHKIT_CMD_CONTROLLER_TYPE 'E'
|
||||
|
||||
#define TOUCHKIT_SEND_PARMS(s, r, c) ((s) << 12 | (r) << 8 | (c))
|
||||
|
||||
#define TOUCHKIT_GET_TOUCHED(packet) (((packet)[0]) & 0x01)
|
||||
#define TOUCHKIT_GET_X(packet) (((packet)[1] << 7) | (packet)[2])
|
||||
#define TOUCHKIT_GET_Y(packet) (((packet)[3] << 7) | (packet)[4])
|
||||
|
||||
static psmouse_ret_t touchkit_ps2_process_byte(struct psmouse *psmouse)
|
||||
{
|
||||
unsigned char *packet = psmouse->packet;
|
||||
struct input_dev *dev = psmouse->dev;
|
||||
|
||||
if (psmouse->pktcnt != 5)
|
||||
return PSMOUSE_GOOD_DATA;
|
||||
|
||||
input_report_abs(dev, ABS_X, TOUCHKIT_GET_X(packet));
|
||||
input_report_abs(dev, ABS_Y, TOUCHKIT_GET_Y(packet));
|
||||
input_report_key(dev, BTN_TOUCH, TOUCHKIT_GET_TOUCHED(packet));
|
||||
input_sync(dev);
|
||||
|
||||
return PSMOUSE_FULL_PACKET;
|
||||
}
|
||||
|
||||
int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)
|
||||
{
|
||||
struct input_dev *dev = psmouse->dev;
|
||||
unsigned char param[3];
|
||||
int command;
|
||||
|
||||
param[0] = TOUCHKIT_CMD_LENGTH;
|
||||
param[1] = TOUCHKIT_CMD_ACTIVE;
|
||||
command = TOUCHKIT_SEND_PARMS(2, 3, TOUCHKIT_CMD);
|
||||
|
||||
if (ps2_command(&psmouse->ps2dev, param, command))
|
||||
return -ENODEV;
|
||||
|
||||
if (param[0] != TOUCHKIT_CMD || param[1] != 0x01 ||
|
||||
param[2] != TOUCHKIT_CMD_ACTIVE)
|
||||
return -ENODEV;
|
||||
|
||||
if (set_properties) {
|
||||
dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
|
||||
set_bit(BTN_TOUCH, dev->keybit);
|
||||
input_set_abs_params(dev, ABS_X, 0, TOUCHKIT_MAX_XC, 0, 0);
|
||||
input_set_abs_params(dev, ABS_Y, 0, TOUCHKIT_MAX_YC, 0, 0);
|
||||
|
||||
psmouse->vendor = "eGalax";
|
||||
psmouse->name = "Touchscreen";
|
||||
psmouse->protocol_handler = touchkit_ps2_process_byte;
|
||||
psmouse->pktsize = 5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
17
drivers/input/mouse/touchkit_ps2.h
Normal file
17
drivers/input/mouse/touchkit_ps2.h
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
/* ----------------------------------------------------------------------------
|
||||
* touchkit_ps2.h -- Driver for eGalax TouchKit PS/2 Touchscreens
|
||||
*
|
||||
* Copyright (C) 2005 by Stefan Lucke
|
||||
* Copyright (c) 2005 Vojtech Pavlik
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef _TOUCHKIT_PS2_H
|
||||
#define _TOUCHKIT_PS2_H
|
||||
|
||||
int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue