Input: whitespace fixes in drivers/input/mouse
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
@@ -61,11 +61,11 @@ static struct alps_model_info alps_model_data[] = {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* ALPS abolute Mode - new format
|
* ALPS abolute Mode - new format
|
||||||
*
|
*
|
||||||
* byte 0: 1 ? ? ? 1 ? ? ?
|
* byte 0: 1 ? ? ? 1 ? ? ?
|
||||||
* byte 1: 0 x6 x5 x4 x3 x2 x1 x0
|
* byte 1: 0 x6 x5 x4 x3 x2 x1 x0
|
||||||
* byte 2: 0 x10 x9 x8 x7 ? fin ges
|
* byte 2: 0 x10 x9 x8 x7 ? fin ges
|
||||||
* byte 3: 0 y9 y8 y7 1 M R L
|
* byte 3: 0 y9 y8 y7 1 M R L
|
||||||
* byte 4: 0 y6 y5 y4 y3 y2 y1 y0
|
* byte 4: 0 y6 y5 y4 y3 y2 y1 y0
|
||||||
* byte 5: 0 z6 z5 z4 z3 z2 z1 z0
|
* byte 5: 0 z6 z5 z4 z3 z2 z1 z0
|
||||||
*
|
*
|
||||||
@@ -85,7 +85,7 @@ static void alps_process_packet(struct psmouse *psmouse, struct pt_regs *regs)
|
|||||||
input_regs(dev, regs);
|
input_regs(dev, regs);
|
||||||
|
|
||||||
if ((packet[0] & 0xc8) == 0x08) { /* 3-byte PS/2 packet */
|
if ((packet[0] & 0xc8) == 0x08) { /* 3-byte PS/2 packet */
|
||||||
input_report_key(dev2, BTN_LEFT, packet[0] & 1);
|
input_report_key(dev2, BTN_LEFT, packet[0] & 1);
|
||||||
input_report_key(dev2, BTN_RIGHT, packet[0] & 2);
|
input_report_key(dev2, BTN_RIGHT, packet[0] & 2);
|
||||||
input_report_key(dev2, BTN_MIDDLE, packet[0] & 4);
|
input_report_key(dev2, BTN_MIDDLE, packet[0] & 4);
|
||||||
input_report_rel(dev2, REL_X,
|
input_report_rel(dev2, REL_X,
|
||||||
@@ -436,8 +436,8 @@ int alps_init(struct psmouse *psmouse)
|
|||||||
priv->dev2.id.bustype = BUS_I8042;
|
priv->dev2.id.bustype = BUS_I8042;
|
||||||
priv->dev2.id.vendor = 0x0002;
|
priv->dev2.id.vendor = 0x0002;
|
||||||
priv->dev2.id.product = PSMOUSE_ALPS;
|
priv->dev2.id.product = PSMOUSE_ALPS;
|
||||||
priv->dev2.id.version = 0x0000;
|
priv->dev2.id.version = 0x0000;
|
||||||
|
|
||||||
priv->dev2.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
|
priv->dev2.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
|
||||||
priv->dev2.relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
|
priv->dev2.relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
|
||||||
priv->dev2.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
|
priv->dev2.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
|
||||||
@@ -461,17 +461,15 @@ init_fail:
|
|||||||
int alps_detect(struct psmouse *psmouse, int set_properties)
|
int alps_detect(struct psmouse *psmouse, int set_properties)
|
||||||
{
|
{
|
||||||
int version;
|
int version;
|
||||||
struct alps_model_info *model;
|
struct alps_model_info *model;
|
||||||
|
|
||||||
if (!(model = alps_get_model(psmouse, &version)))
|
if (!(model = alps_get_model(psmouse, &version)))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (set_properties) {
|
if (set_properties) {
|
||||||
psmouse->vendor = "ALPS";
|
psmouse->vendor = "ALPS";
|
||||||
if (model->flags & ALPS_DUALPOINT)
|
psmouse->name = model->flags & ALPS_DUALPOINT ?
|
||||||
psmouse->name = "DualPoint TouchPad";
|
"DualPoint TouchPad" : "GlidePoint";
|
||||||
else
|
|
||||||
psmouse->name = "GlidePoint";
|
|
||||||
psmouse->model = version;
|
psmouse->model = version;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -17,18 +17,18 @@
|
|||||||
/*
|
/*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*
|
*
|
||||||
* Should you need to contact me, the author, you can do so either by
|
* Should you need to contact me, the author, you can do so either by
|
||||||
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
||||||
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
||||||
@@ -120,11 +120,11 @@ static struct input_dev inport_dev = {
|
|||||||
.close = inport_close,
|
.close = inport_close,
|
||||||
.name = INPORT_NAME,
|
.name = INPORT_NAME,
|
||||||
.phys = "isa023c/input0",
|
.phys = "isa023c/input0",
|
||||||
.id = {
|
.id = {
|
||||||
.bustype = BUS_ISA,
|
.bustype = BUS_ISA,
|
||||||
.vendor = INPORT_VENDOR,
|
.vendor = INPORT_VENDOR,
|
||||||
.product = 0x0001,
|
.product = 0x0001,
|
||||||
.version = 0x0100,
|
.version = 0x0100,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -18,18 +18,18 @@
|
|||||||
/*
|
/*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful,
|
* This program is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*
|
*
|
||||||
* Should you need to contact me, the author, you can do so either by
|
* Should you need to contact me, the author, you can do so either by
|
||||||
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
* e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
|
||||||
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
|
||||||
@@ -167,7 +167,7 @@ static int __init logibm_init(void)
|
|||||||
outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT);
|
outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT);
|
||||||
|
|
||||||
input_register_device(&logibm_dev);
|
input_register_device(&logibm_dev);
|
||||||
|
|
||||||
printk(KERN_INFO "input: Logitech bus mouse at %#x irq %d\n", LOGIBM_BASE, logibm_irq);
|
printk(KERN_INFO "input: Logitech bus mouse at %#x irq %d\n", LOGIBM_BASE, logibm_irq);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: maplemouse.c,v 1.2 2004/03/22 01:18:15 lethal Exp $
|
* $Id: maplemouse.c,v 1.2 2004/03/22 01:18:15 lethal Exp $
|
||||||
* SEGA Dreamcast mouse driver
|
* SEGA Dreamcast mouse driver
|
||||||
* Based on drivers/usb/usbmouse.c
|
* Based on drivers/usb/usbmouse.c
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ static int dc_mouse_connect(struct maple_device *dev)
|
|||||||
|
|
||||||
mouse->dev.name = dev->product_name;
|
mouse->dev.name = dev->product_name;
|
||||||
mouse->dev.id.bustype = BUS_MAPLE;
|
mouse->dev.id.bustype = BUS_MAPLE;
|
||||||
|
|
||||||
input_register_device(&mouse->dev);
|
input_register_device(&mouse->dev);
|
||||||
|
|
||||||
maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
|
maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
* Copyright (c) 2000-2001 Vojtech Pavlik
|
* Copyright (c) 2000-2001 Vojtech Pavlik
|
||||||
*
|
*
|
||||||
* Based on the work of:
|
* Based on the work of:
|
||||||
* Alan Cox Robin O'Leary
|
* Alan Cox Robin O'Leary
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -74,7 +74,7 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr, struct pt_regs *regs)
|
|||||||
|
|
||||||
if (pc110pad_count < 3)
|
if (pc110pad_count < 3)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
|
|
||||||
input_regs(&pc110pad_dev, regs);
|
input_regs(&pc110pad_dev, regs);
|
||||||
input_report_key(&pc110pad_dev, BTN_TOUCH,
|
input_report_key(&pc110pad_dev, BTN_TOUCH,
|
||||||
pc110pad_data[0] & 0x01);
|
pc110pad_data[0] & 0x01);
|
||||||
@@ -145,7 +145,7 @@ static int __init pc110pad_init(void)
|
|||||||
|
|
||||||
pc110pad_dev.absmax[ABS_X] = 0x1ff;
|
pc110pad_dev.absmax[ABS_X] = 0x1ff;
|
||||||
pc110pad_dev.absmax[ABS_Y] = 0x0ff;
|
pc110pad_dev.absmax[ABS_Y] = 0x0ff;
|
||||||
|
|
||||||
pc110pad_dev.open = pc110pad_open;
|
pc110pad_dev.open = pc110pad_open;
|
||||||
pc110pad_dev.close = pc110pad_close;
|
pc110pad_dev.close = pc110pad_close;
|
||||||
|
|
||||||
@@ -156,17 +156,17 @@ static int __init pc110pad_init(void)
|
|||||||
pc110pad_dev.id.product = 0x0001;
|
pc110pad_dev.id.product = 0x0001;
|
||||||
pc110pad_dev.id.version = 0x0100;
|
pc110pad_dev.id.version = 0x0100;
|
||||||
|
|
||||||
input_register_device(&pc110pad_dev);
|
input_register_device(&pc110pad_dev);
|
||||||
|
|
||||||
printk(KERN_INFO "input: %s at %#x irq %d\n",
|
printk(KERN_INFO "input: %s at %#x irq %d\n",
|
||||||
pc110pad_name, pc110pad_io, pc110pad_irq);
|
pc110pad_name, pc110pad_io, pc110pad_irq);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit pc110pad_exit(void)
|
static void __exit pc110pad_exit(void)
|
||||||
{
|
{
|
||||||
input_unregister_device(&pc110pad_dev);
|
input_unregister_device(&pc110pad_dev);
|
||||||
|
|
||||||
outb(PC110PAD_OFF, pc110pad_io + 2);
|
outb(PC110PAD_OFF, pc110pad_io + 2);
|
||||||
|
|
||||||
|
@@ -99,7 +99,7 @@ static ssize_t psmouse_do_set_##_name(struct device *d, const char *b, size_t s)
|
|||||||
{ \
|
{ \
|
||||||
return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \
|
return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \
|
||||||
} \
|
} \
|
||||||
static struct device_attribute psmouse_attr_##_name = \
|
static struct device_attribute psmouse_attr_##_name = \
|
||||||
__ATTR(_name, S_IWUSR | S_IRUGO, \
|
__ATTR(_name, S_IWUSR | S_IRUGO, \
|
||||||
psmouse_do_show_##_name, psmouse_do_set_##_name);
|
psmouse_do_show_##_name, psmouse_do_set_##_name);
|
||||||
|
|
||||||
|
@@ -59,7 +59,7 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs)
|
|||||||
b = (short) (__raw_readl(0xe0310000) ^ 0x70);
|
b = (short) (__raw_readl(0xe0310000) ^ 0x70);
|
||||||
|
|
||||||
dx = x - rpcmouse_lastx;
|
dx = x - rpcmouse_lastx;
|
||||||
dy = y - rpcmouse_lasty;
|
dy = y - rpcmouse_lasty;
|
||||||
|
|
||||||
rpcmouse_lastx = x;
|
rpcmouse_lastx = x;
|
||||||
rpcmouse_lasty = y;
|
rpcmouse_lasty = y;
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Driver for DEC VSXXX-AA mouse (hockey-puck mouse, ball or two rollers)
|
* Driver for DEC VSXXX-AA mouse (hockey-puck mouse, ball or two rollers)
|
||||||
* DEC VSXXX-GA mouse (rectangular mouse, with ball)
|
* DEC VSXXX-GA mouse (rectangular mouse, with ball)
|
||||||
* DEC VSXXX-AB tablet (digitizer with hair cross or stylus)
|
* DEC VSXXX-AB tablet (digitizer with hair cross or stylus)
|
||||||
*
|
*
|
||||||
* Copyright (C) 2003-2004 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
|
* Copyright (C) 2003-2004 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user