5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
352 lines
8.2 KiB
C
352 lines
8.2 KiB
C
/*
|
|
* 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 <linux/slab.h>
|
|
|
|
#include "psmouse.h"
|
|
#include "lifebook.h"
|
|
|
|
struct lifebook_data {
|
|
struct input_dev *dev2; /* Relative device */
|
|
char phys[32];
|
|
};
|
|
|
|
static bool lifebook_present;
|
|
|
|
static const char *desired_serio_phys;
|
|
|
|
static int lifebook_limit_serio3(const struct dmi_system_id *d)
|
|
{
|
|
desired_serio_phys = "isa0060/serio3";
|
|
return 0;
|
|
}
|
|
|
|
static bool lifebook_use_6byte_proto;
|
|
|
|
static int lifebook_set_6byte_proto(const struct dmi_system_id *d)
|
|
{
|
|
lifebook_use_6byte_proto = true;
|
|
return 0;
|
|
}
|
|
|
|
static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
|
|
{
|
|
/* FLORA-ie 55mi */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"),
|
|
},
|
|
},
|
|
{
|
|
/* LifeBook B */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Lifebook B Series"),
|
|
},
|
|
},
|
|
{
|
|
/* LifeBook B */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),
|
|
},
|
|
},
|
|
{
|
|
/* Lifebook B */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
|
|
},
|
|
},
|
|
{
|
|
/* Lifebook B-2130 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"),
|
|
},
|
|
},
|
|
{
|
|
/* Lifebook B213x/B2150 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"),
|
|
},
|
|
},
|
|
{
|
|
/* Zephyr */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"),
|
|
},
|
|
},
|
|
{
|
|
/* Panasonic CF-18 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
|
|
},
|
|
.callback = lifebook_limit_serio3,
|
|
},
|
|
{
|
|
/* Panasonic CF-28 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
|
|
},
|
|
.callback = lifebook_set_6byte_proto,
|
|
},
|
|
{
|
|
/* Panasonic CF-29 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
|
|
},
|
|
.callback = lifebook_set_6byte_proto,
|
|
},
|
|
{
|
|
/* Panasonic CF-72 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
|
|
},
|
|
.callback = lifebook_set_6byte_proto,
|
|
},
|
|
{
|
|
/* Lifebook B142 */
|
|
.matches = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
|
|
},
|
|
},
|
|
{ }
|
|
};
|
|
|
|
void __init lifebook_module_init(void)
|
|
{
|
|
lifebook_present = dmi_check_system(lifebook_dmi_table);
|
|
}
|
|
|
|
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
|
|
{
|
|
struct lifebook_data *priv = psmouse->private;
|
|
struct input_dev *dev1 = psmouse->dev;
|
|
struct input_dev *dev2 = priv ? priv->dev2 : NULL;
|
|
unsigned char *packet = psmouse->packet;
|
|
bool relative_packet = packet[0] & 0x08;
|
|
|
|
if (relative_packet || !lifebook_use_6byte_proto) {
|
|
if (psmouse->pktcnt != 3)
|
|
return PSMOUSE_GOOD_DATA;
|
|
} else {
|
|
switch (psmouse->pktcnt) {
|
|
case 1:
|
|
return (packet[0] & 0xf8) == 0x00 ?
|
|
PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
|
|
case 2:
|
|
return PSMOUSE_GOOD_DATA;
|
|
case 3:
|
|
return ((packet[2] & 0x30) << 2) == (packet[2] & 0xc0) ?
|
|
PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
|
|
case 4:
|
|
return (packet[3] & 0xf8) == 0xc0 ?
|
|
PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
|
|
case 5:
|
|
return (packet[4] & 0xc0) == (packet[2] & 0xc0) ?
|
|
PSMOUSE_GOOD_DATA : PSMOUSE_BAD_DATA;
|
|
case 6:
|
|
if (((packet[5] & 0x30) << 2) != (packet[5] & 0xc0))
|
|
return PSMOUSE_BAD_DATA;
|
|
if ((packet[5] & 0xc0) != (packet[1] & 0xc0))
|
|
return PSMOUSE_BAD_DATA;
|
|
break; /* report data */
|
|
}
|
|
}
|
|
|
|
if (relative_packet) {
|
|
if (!dev2)
|
|
printk(KERN_WARNING "lifebook.c: got relative packet "
|
|
"but no relative device set up\n");
|
|
} else {
|
|
if (lifebook_use_6byte_proto) {
|
|
input_report_abs(dev1, ABS_X,
|
|
((packet[1] & 0x3f) << 6) | (packet[2] & 0x3f));
|
|
input_report_abs(dev1, ABS_Y,
|
|
4096 - (((packet[4] & 0x3f) << 6) | (packet[5] & 0x3f)));
|
|
} else {
|
|
input_report_abs(dev1, ABS_X,
|
|
(packet[1] | ((packet[0] & 0x30) << 4)));
|
|
input_report_abs(dev1, ABS_Y,
|
|
1024 - (packet[2] | ((packet[0] & 0xC0) << 2)));
|
|
}
|
|
input_report_key(dev1, BTN_TOUCH, packet[0] & 0x04);
|
|
input_sync(dev1);
|
|
}
|
|
|
|
if (dev2) {
|
|
if (relative_packet) {
|
|
input_report_rel(dev2, REL_X,
|
|
((packet[0] & 0x10) ? packet[1] - 256 : packet[1]));
|
|
input_report_rel(dev2, REL_Y,
|
|
-(int)((packet[0] & 0x20) ? packet[2] - 256 : packet[2]));
|
|
}
|
|
input_report_key(dev2, BTN_LEFT, packet[0] & 0x01);
|
|
input_report_key(dev2, BTN_RIGHT, packet[0] & 0x02);
|
|
input_sync(dev2);
|
|
}
|
|
|
|
return PSMOUSE_FULL_PACKET;
|
|
}
|
|
|
|
static int lifebook_absolute_mode(struct psmouse *psmouse)
|
|
{
|
|
struct ps2dev *ps2dev = &psmouse->ps2dev;
|
|
unsigned char param;
|
|
|
|
if (psmouse_reset(psmouse))
|
|
return -1;
|
|
|
|
/*
|
|
* Enable absolute output -- ps2_command fails always but if
|
|
* you leave this call out the touchsreen will never send
|
|
* absolute coordinates
|
|
*/
|
|
param = lifebook_use_6byte_proto ? 0x08 : 0x07;
|
|
ps2_command(ps2dev, ¶m, PSMOUSE_CMD_SETRES);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void lifebook_relative_mode(struct psmouse *psmouse)
|
|
{
|
|
struct ps2dev *ps2dev = &psmouse->ps2dev;
|
|
unsigned char param = 0x06;
|
|
|
|
ps2_command(ps2dev, ¶m, PSMOUSE_CMD_SETRES);
|
|
}
|
|
|
|
static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolution)
|
|
{
|
|
static const unsigned char params[] = { 0, 1, 2, 2, 3 };
|
|
unsigned char p;
|
|
|
|
if (resolution == 0 || resolution > 400)
|
|
resolution = 400;
|
|
|
|
p = params[resolution / 100];
|
|
ps2_command(&psmouse->ps2dev, &p, PSMOUSE_CMD_SETRES);
|
|
psmouse->resolution = 50 << p;
|
|
}
|
|
|
|
static void lifebook_disconnect(struct psmouse *psmouse)
|
|
{
|
|
struct lifebook_data *priv = psmouse->private;
|
|
|
|
psmouse_reset(psmouse);
|
|
if (priv) {
|
|
input_unregister_device(priv->dev2);
|
|
kfree(priv);
|
|
}
|
|
psmouse->private = NULL;
|
|
}
|
|
|
|
int lifebook_detect(struct psmouse *psmouse, bool set_properties)
|
|
{
|
|
if (!lifebook_present)
|
|
return -1;
|
|
|
|
if (desired_serio_phys &&
|
|
strcmp(psmouse->ps2dev.serio->phys, desired_serio_phys))
|
|
return -1;
|
|
|
|
if (set_properties) {
|
|
psmouse->vendor = "Fujitsu";
|
|
psmouse->name = "Lifebook TouchScreen";
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int lifebook_create_relative_device(struct psmouse *psmouse)
|
|
{
|
|
struct input_dev *dev2;
|
|
struct lifebook_data *priv;
|
|
int error = -ENOMEM;
|
|
|
|
priv = kzalloc(sizeof(struct lifebook_data), GFP_KERNEL);
|
|
dev2 = input_allocate_device();
|
|
if (!priv || !dev2)
|
|
goto err_out;
|
|
|
|
priv->dev2 = dev2;
|
|
snprintf(priv->phys, sizeof(priv->phys),
|
|
"%s/input1", psmouse->ps2dev.serio->phys);
|
|
|
|
dev2->phys = priv->phys;
|
|
dev2->name = "PS/2 Touchpad";
|
|
dev2->id.bustype = BUS_I8042;
|
|
dev2->id.vendor = 0x0002;
|
|
dev2->id.product = PSMOUSE_LIFEBOOK;
|
|
dev2->id.version = 0x0000;
|
|
dev2->dev.parent = &psmouse->ps2dev.serio->dev;
|
|
|
|
dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
|
|
dev2->relbit[BIT_WORD(REL_X)] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
|
|
dev2->keybit[BIT_WORD(BTN_LEFT)] =
|
|
BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT);
|
|
|
|
error = input_register_device(priv->dev2);
|
|
if (error)
|
|
goto err_out;
|
|
|
|
psmouse->private = priv;
|
|
return 0;
|
|
|
|
err_out:
|
|
input_free_device(dev2);
|
|
kfree(priv);
|
|
return error;
|
|
}
|
|
|
|
int lifebook_init(struct psmouse *psmouse)
|
|
{
|
|
struct input_dev *dev1 = psmouse->dev;
|
|
int max_coord = lifebook_use_6byte_proto ? 4096 : 1024;
|
|
|
|
if (lifebook_absolute_mode(psmouse))
|
|
return -1;
|
|
|
|
dev1->evbit[0] = BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);
|
|
dev1->relbit[0] = 0;
|
|
dev1->keybit[BIT_WORD(BTN_MOUSE)] = 0;
|
|
dev1->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
|
|
input_set_abs_params(dev1, ABS_X, 0, max_coord, 0, 0);
|
|
input_set_abs_params(dev1, ABS_Y, 0, max_coord, 0, 0);
|
|
|
|
if (!desired_serio_phys) {
|
|
if (lifebook_create_relative_device(psmouse)) {
|
|
lifebook_relative_mode(psmouse);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
psmouse->protocol_handler = lifebook_process_byte;
|
|
psmouse->set_resolution = lifebook_set_resolution;
|
|
psmouse->disconnect = lifebook_disconnect;
|
|
psmouse->reconnect = lifebook_absolute_mode;
|
|
|
|
psmouse->model = lifebook_use_6byte_proto ? 6 : 3;
|
|
|
|
/*
|
|
* Use packet size = 3 even when using 6-byte protocol because
|
|
* that's what POLL will return on Lifebooks (according to spec).
|
|
*/
|
|
psmouse->pktsize = 3;
|
|
|
|
return 0;
|
|
}
|
|
|