Input: Add Fujitsu Lifebook B-series touchscreen driver.
From: Kenan Esau <kenan.esau@conan.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
41e979f822
commit
02d7f58950
6 changed files with 155 additions and 5 deletions
|
@ -1104,7 +1104,7 @@ running once the system is up.
|
|||
See Documentation/ramdisk.txt.
|
||||
|
||||
psmouse.proto= [HW,MOUSE] Highest PS2 mouse protocol extension to
|
||||
probe for (bare|imps|exps).
|
||||
probe for (bare|imps|exps|lifebook|any).
|
||||
psmouse.rate= [HW,MOUSE] Set desired mouse report rate, in reports
|
||||
per second.
|
||||
psmouse.resetafter=
|
||||
|
|
|
@ -15,4 +15,4 @@ 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
|
||||
psmouse-objs := psmouse-base.o alps.o logips2pp.o synaptics.o lifebook.o
|
||||
|
|
126
drivers/input/mouse/lifebook.c
Normal file
126
drivers/input/mouse/lifebook.c
Normal file
|
@ -0,0 +1,126 @@
|
|||
/*
|
||||
* Fujitsu B-series Lifebook PS/2 TouchScreen driver
|
||||
*
|
||||
* Copyright (c) 2005 Vojtech Pavlik <vojtech@suse.cz>
|
||||
* Copyright (c) 2005 Kenan Esau <kenan.esau@conan.de>
|
||||
*
|
||||
* TouchScreen detection, absolute mode setting and packet layout is taken from
|
||||
* Harald Hoyer's description of the device.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <linux/input.h>
|
||||
#include <linux/serio.h>
|
||||
#include <linux/libps2.h>
|
||||
#include <linux/dmi.h>
|
||||
|
||||
#include "psmouse.h"
|
||||
#include "lifebook.h"
|
||||
|
||||
static int max_y = 1024;
|
||||
|
||||
|
||||
static struct dmi_system_id lifebook_dmi_table[] = {
|
||||
{
|
||||
.ident = "Fujitsu Siemens Lifebook B-Sereis",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
|
||||
},
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
||||
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
|
||||
{
|
||||
unsigned char *packet = psmouse->packet;
|
||||
struct input_dev *dev = &psmouse->dev;
|
||||
|
||||
if ( psmouse->pktcnt != 3 )
|
||||
return PSMOUSE_GOOD_DATA;
|
||||
|
||||
input_regs(dev, regs);
|
||||
|
||||
/* calculate X and Y */
|
||||
if ((packet[0] & 0x08) == 0x00) {
|
||||
input_report_abs(dev, ABS_X,
|
||||
(packet[1] | ((packet[0] & 0x30) << 4)));
|
||||
input_report_abs(dev, ABS_Y,
|
||||
max_y - (packet[2] | ((packet[0] & 0xC0) << 2)));
|
||||
} else {
|
||||
input_report_rel(dev, REL_X,
|
||||
((packet[0] & 0x10) ? packet[1]-256 : packet[1]));
|
||||
input_report_rel(dev, REL_Y,
|
||||
(- (int)((packet[0] & 0x20) ? packet[2]-256 : packet[2])));
|
||||
}
|
||||
|
||||
input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
|
||||
input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
|
||||
input_report_key(dev, BTN_TOUCH, packet[0] & 0x04);
|
||||
|
||||
input_sync(dev);
|
||||
|
||||
return PSMOUSE_FULL_PACKET;
|
||||
}
|
||||
|
||||
static int lifebook_initialize(struct psmouse *psmouse)
|
||||
{
|
||||
struct ps2dev *ps2dev = &psmouse->ps2dev;
|
||||
unsigned char param;
|
||||
|
||||
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE))
|
||||
return -1;
|
||||
|
||||
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_BAT))
|
||||
return -1;
|
||||
|
||||
/*
|
||||
Enable absolute output -- ps2_command fails always but if
|
||||
you leave this call out the touchsreen will never send
|
||||
absolute coordinates
|
||||
*/
|
||||
param = 0x07;
|
||||
ps2_command(ps2dev, ¶m, PSMOUSE_CMD_SETRES);
|
||||
|
||||
psmouse->set_rate(psmouse, psmouse->rate);
|
||||
psmouse->set_resolution(psmouse, psmouse->resolution);
|
||||
|
||||
if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE))
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void lifebook_disconnect(struct psmouse *psmouse)
|
||||
{
|
||||
psmouse_reset(psmouse);
|
||||
}
|
||||
|
||||
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
|
||||
int set_properties)
|
||||
{
|
||||
if (!dmi_check_system(lifebook_dmi_table) &&
|
||||
(max_proto != PSMOUSE_LIFEBOOK) )
|
||||
return -1;
|
||||
|
||||
if (set_properties) {
|
||||
psmouse->vendor = "Fujitsu Lifebook";
|
||||
psmouse->name = "TouchScreen";
|
||||
psmouse->dev.evbit[0] = BIT(EV_ABS) | BIT(EV_KEY) | BIT(EV_REL);
|
||||
psmouse->dev.keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
|
||||
psmouse->dev.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
|
||||
psmouse->dev.relbit[0] = BIT(REL_X) | BIT(REL_Y);
|
||||
input_set_abs_params(&psmouse->dev, ABS_X, 0, 1024, 0, 0);
|
||||
input_set_abs_params(&psmouse->dev, ABS_Y, 0, 1024, 0, 0);
|
||||
|
||||
psmouse->protocol_handler = lifebook_process_byte;
|
||||
psmouse->disconnect = lifebook_disconnect;
|
||||
psmouse->reconnect = lifebook_initialize;
|
||||
psmouse->pktsize = 3;
|
||||
}
|
||||
|
||||
return lifebook_initialize(psmouse);
|
||||
}
|
17
drivers/input/mouse/lifebook.h
Normal file
17
drivers/input/mouse/lifebook.h
Normal file
|
@ -0,0 +1,17 @@
|
|||
/*
|
||||
* Fujitsu B-series Lifebook PS/2 TouchScreen driver
|
||||
*
|
||||
* 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 _LIFEBOOK_H
|
||||
#define _LIFEBOOK_H
|
||||
|
||||
int lifebook_detect(struct psmouse *psmouse, unsigned int max_proto,
|
||||
int set_properties);
|
||||
|
||||
#endif
|
|
@ -24,6 +24,7 @@
|
|||
#include "synaptics.h"
|
||||
#include "logips2pp.h"
|
||||
#include "alps.h"
|
||||
#include "lifebook.h"
|
||||
|
||||
#define DRIVER_DESC "PS/2 mouse driver"
|
||||
|
||||
|
@ -34,12 +35,12 @@ MODULE_LICENSE("GPL");
|
|||
static unsigned int psmouse_max_proto = -1U;
|
||||
static int psmouse_set_maxproto(const char *val, struct kernel_param *kp);
|
||||
static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp);
|
||||
static char *psmouse_proto_abbrev[] = { NULL, "bare", NULL, NULL, NULL, "imps", "exps", NULL, NULL, NULL };
|
||||
static char *psmouse_proto_abbrev[] = { NULL, "bare", NULL, NULL, NULL, "imps", "exps", NULL, NULL, "lifebook" };
|
||||
#define param_check_proto_abbrev(name, p) __param_check(name, p, unsigned int)
|
||||
#define param_set_proto_abbrev psmouse_set_maxproto
|
||||
#define param_get_proto_abbrev psmouse_get_maxproto
|
||||
module_param_named(proto, psmouse_max_proto, proto_abbrev, 0644);
|
||||
MODULE_PARM_DESC(proto, "Highest protocol extension to probe (bare, imps, exps, any). Useful for KVM switches.");
|
||||
MODULE_PARM_DESC(proto, "Highest protocol extension to probe (bare, imps, exps, lifebook, any). Useful for KVM switches.");
|
||||
|
||||
static unsigned int psmouse_resolution = 200;
|
||||
module_param_named(resolution, psmouse_resolution, uint, 0644);
|
||||
|
@ -67,7 +68,7 @@ __obsolete_setup("psmouse_smartscroll=");
|
|||
__obsolete_setup("psmouse_resetafter=");
|
||||
__obsolete_setup("psmouse_rate=");
|
||||
|
||||
static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "ThinkPS/2", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2", "AlpsPS/2" };
|
||||
static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "ThinkPS/2", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2", "AlpsPS/2", "LBPS/2" };
|
||||
|
||||
/*
|
||||
* psmouse_process_byte() analyzes the PS/2 data stream and reports
|
||||
|
@ -423,6 +424,9 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|||
{
|
||||
int synaptics_hardware = 0;
|
||||
|
||||
if (lifebook_detect(psmouse, max_proto, set_properties) == 0)
|
||||
return PSMOUSE_LIFEBOOK;
|
||||
|
||||
/*
|
||||
* Try Kensington ThinkingMouse (we try first, because synaptics probe
|
||||
* upsets the thinkingmouse).
|
||||
|
@ -575,6 +579,8 @@ static void psmouse_set_rate(struct psmouse *psmouse, unsigned int rate)
|
|||
|
||||
static void psmouse_initialize(struct psmouse *psmouse)
|
||||
{
|
||||
if (psmouse->type==PSMOUSE_LIFEBOOK)
|
||||
return;
|
||||
/*
|
||||
* We set the mouse into streaming mode.
|
||||
*/
|
||||
|
|
|
@ -77,6 +77,7 @@ enum psmouse_type {
|
|||
PSMOUSE_IMEX,
|
||||
PSMOUSE_SYNAPTICS,
|
||||
PSMOUSE_ALPS,
|
||||
PSMOUSE_LIFEBOOK,
|
||||
};
|
||||
|
||||
int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);
|
||||
|
|
Loading…
Reference in a new issue