LinuxLists.cc - [patch] Input - Better naming of HID devices [3/23]

2002-10-08 13:35:12

by Vojtech Pavlik

[permalink] [raw]

Subject: [patch] Input - Better naming of HID devices [3/23]

2002-10-08 13:37:13

by Vojtech Pavlik

[permalink] [raw]

Subject: [patch] Input - Fix Logitech Desktop Pro wheel [5/23]

2002-10-08 13:40:29

by Vojtech Pavlik

[permalink] [raw]

Subject: [patch] Input - Use lists.h in gameport core [7/23]

2002-10-08 13:36:33

by Vojtech Pavlik

[permalink] [raw]

Subject: [patch] Input - Support for PS/2 Multiplexing spec [4/23]

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-09-24 18:48:50+02:00, [email protected]
Add support for PS/2 Active Multiplexing Spec, updates for PS/2 mouse
and keyboard handling - proper cleanup on reboot, allow USB-emulated
AT keyboards, option to restrict PS/2 mouse to generic mode.

drivers/input/keyboard/atkbd.c | 86 ++++++---
drivers/input/mouse/psmouse.c | 42 ++++
drivers/input/serio/i8042-io.h | 9 -
drivers/input/serio/i8042-ppcio.h | 12 -
drivers/input/serio/i8042-sparcio.h | 13 -
drivers/input/serio/i8042.c | 321 ++++++++++++++++++++++++------------
drivers/input/serio/i8042.h | 25 ++
include/linux/serio.h | 12 +
8 files changed, 361 insertions(+), 159 deletions(-)

===================================================================

diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/atkbd.c Tue Oct 8 15:27:18 2002
+++ b/drivers/input/keyboard/atkbd.c Tue Oct 8 15:27:18 2002
@@ -22,9 +22,15 @@
MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
MODULE_DESCRIPTION("AT and PS/2 keyboard driver");
MODULE_PARM(atkbd_set, "1i");
+MODULE_PARM(atkbd_reset, "1i");
MODULE_LICENSE("GPL");

static int atkbd_set = 2;
+#if defined(__i386__) || defined (__x86_64__)
+static int atkbd_reset;
+#else
+static int atkbd_reset = 1;
+#endif

/*
* Scancode to keycode tables. These are just the default setting, and
@@ -89,6 +95,7 @@
#define ATKBD_CMD_RESEND 0x00fe
#define ATKBD_CMD_EX_ENABLE 0x10ea
#define ATKBD_CMD_EX_SETLEDS 0x20eb
+#define ATKBD_CMD_OK_GETID 0x02e8

#define ATKBD_RET_ACK 0xfa
#define ATKBD_RET_NAK 0xfe
@@ -113,6 +120,7 @@
unsigned char cmdbuf[4];
unsigned char cmdcnt;
unsigned char set;
+ unsigned char oldset;
unsigned char release;
signed char ack;
unsigned char emul;
@@ -134,7 +142,6 @@
printk(KERN_DEBUG "atkbd.c: Received %02x flags %02x\n", data, flags);
#endif

- /* Interface error. Request that the keyboard resend. */
if ((flags & (SERIO_FRAME | SERIO_PARITY)) && (~flags & SERIO_TIMEOUT) && atkbd->write) {
printk("atkbd.c: frame/parity error: %02x\n", flags);
serio_write(serio, ATKBD_CMD_RESEND);
@@ -205,7 +212,9 @@
#ifdef ATKBD_DEBUG
printk(KERN_DEBUG "atkbd.c: Sent: %02x\n", byte);
#endif
- serio_write(atkbd->serio, byte);
+ if (serio_write(atkbd->serio, byte))
+ return -1;
+
while (!atkbd->ack && timeout--) udelay(10);

return -(atkbd->ack <= 0);
@@ -289,34 +298,41 @@

static int atkbd_set_3(struct atkbd *atkbd)
{
- unsigned char param;
+ unsigned char param[2];
+
+/*
+ * Remember original scancode set value, so that we can restore it on exit.
+ */
+
+ if (atkbd_command(atkbd, &atkbd->oldset, ATKBD_CMD_GSCANSET))
+ atkbd->oldset = 2;

/*
* For known special keyboards we can go ahead and set the correct set.
+ * We check for NCD PS/2 Sun, NorthGate OmniKey 101 and IBM RapidAccess
+ * keyboards.
*/

if (atkbd->id == 0xaca1) {
- param = 3;
- atkbd_command(atkbd, &param, ATKBD_CMD_SSCANSET);
+ param[0] = 3;
+ atkbd_command(atkbd, param, ATKBD_CMD_SSCANSET);
return 3;
}

-/*
- * We check for the extra keys on an some keyboards that need extra
- * command to get enabled. This shouldn't harm any keyboards not
- * knowing the command.
- */
+ if (!atkbd_command(atkbd, param, ATKBD_CMD_OK_GETID)) {
+ atkbd->id = param[0] << 8 | param[1];
+ return 2;
+ }

- param = 0x71;
- if (!atkbd_command(atkbd, &param, ATKBD_CMD_EX_ENABLE))
+ param[0] = 0x71;
+ if (!atkbd_command(atkbd, param, ATKBD_CMD_EX_ENABLE))
return 4;

/*
* Try to set the set we want.
*/

- param = atkbd_set;
- if (atkbd_command(atkbd, &param, ATKBD_CMD_SSCANSET))
+ if (atkbd_command(atkbd, &atkbd_set, ATKBD_CMD_SSCANSET))
return 2;

/*
@@ -327,8 +343,8 @@
* In that case we time out, and return 2.
*/

- param = 0;
- if (atkbd_command(atkbd, &param, ATKBD_CMD_GSCANSET))
+ param[0] = 0;
+ if (atkbd_command(atkbd, param, ATKBD_CMD_GSCANSET))
return 2;

/*
@@ -336,7 +352,7 @@
* itself.
*/

- return (param == 3) ? 3 : 2;
+ return (param[0] == 3) ? 3 : 2;
}

/*
@@ -353,10 +369,9 @@
* these systems the BIOS also usually doesn't do it for us.
*/

-#ifdef CONFIG_KEYBOARD_ATKBD_RESET
- if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_BAT))
- printk(KERN_WARNING "atkbd.c: keyboard reset failed\n");
-#endif
+ if (atkbd_reset)
+ if (atkbd_command(atkbd, NULL, ATKBD_CMD_RESET_BAT))
+ printk(KERN_WARNING "atkbd.c: keyboard reset failed\n");

/*
* Next we check we can set LEDs on the keyboard. This should work on every
@@ -405,7 +420,18 @@
}

/*
- * atkbd_disconnect() cleans up behind us ...
+ * atkbd_cleanup() restores the keyboard state so that BIOS is happy after a
+ * reboot.
+ */
+
+static void atkbd_cleanup(struct serio *serio)
+{
+ struct atkbd *atkbd = serio->private;
+ atkbd_command(atkbd, &atkbd->oldset, ATKBD_CMD_SSCANSET);
+}
+
+/*
+ * atkbd_disconnect() closes and frees.
*/

static void atkbd_disconnect(struct serio *serio)
@@ -508,18 +534,28 @@
static struct serio_dev atkbd_dev = {
.interrupt = atkbd_interrupt,
.connect = atkbd_connect,
- .disconnect = atkbd_disconnect
+ .disconnect = atkbd_disconnect,
+ .cleanup = atkbd_cleanup,
};

#ifndef MODULE
-static int __init atkbd_setup(char *str)
+static int __init atkbd_setup_set(char *str)
{
int ints[4];
str = get_options(str, ARRAY_SIZE(ints), ints);
if (ints[0] > 0) atkbd_set = ints[1];
return 1;
}
-__setup("atkbd_set=", atkbd_setup);
+static int __init atkbd_setup_reset(char *str)
+{
+ int ints[4];
+ str = get_options(str, ARRAY_SIZE(ints), ints);
+ if (ints[0] > 0) atkbd_reset = ints[1];
+ return 1;
+}
+
+__setup("atkbd_set=", atkbd_setup_set);
+__setup("atkbd_reset", atkbd_setup_reset);
#endif

int __init atkbd_init(void)
diff -Nru a/drivers/input/mouse/psmouse.c b/drivers/input/mouse/psmouse.c
--- a/drivers/input/mouse/psmouse.c Tue Oct 8 15:27:18 2002
+++ b/drivers/input/mouse/psmouse.c Tue Oct 8 15:27:18 2002
@@ -21,8 +21,11 @@

MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
MODULE_DESCRIPTION("PS/2 mouse driver");
+MODULE_PARM(psmouse_noext, "1i");
MODULE_LICENSE("GPL");

+static int psmouse_noext;
+
#define PSMOUSE_CMD_SETSCALE11 0x00e6
#define PSMOUSE_CMD_SETRES 0x10e8
#define PSMOUSE_CMD_GETINFO 0x03e9
@@ -33,6 +36,7 @@
#define PSMOUSE_CMD_SETRATE 0x10f3
#define PSMOUSE_CMD_ENABLE 0x00f4
#define PSMOUSE_CMD_RESET_DIS 0x00f6
+#define PSMOUSE_CMD_RESET_BAT 0x02ff

#define PSMOUSE_RET_BAT 0xaa
#define PSMOUSE_RET_ACK 0xfa
@@ -222,7 +226,11 @@
psmouse->ack = 0;
psmouse->acking = 1;

- serio_write(psmouse->serio, byte);
+ if (serio_write(psmouse->serio, byte)) {
+ psmouse->acking = 0;
+ return -1;
+ }
+
while (!psmouse->ack && timeout--) udelay(10);

return -(psmouse->ack <= 0);
@@ -302,6 +310,9 @@
psmouse->name = "Mouse";
psmouse->model = 0;

+ if (psmouse_noext)
+ return PSMOUSE_PS2;
+
/*
* Try Genius NetMouse magic init.
*/
@@ -529,15 +540,24 @@
* Last, we enable the mouse so that we get reports from it.
*/

- if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE)) {
+ if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", psmouse->serio->phys);
- }

}

/*
- * psmouse_disconnect() cleans up after we don't want talk
- * to the mouse anymore.
+ * psmouse_cleanup() resets the mouse into power-on state.
+ */
+
+static void psmouse_cleanup(struct serio *serio)
+{
+ struct psmouse *psmouse = serio->private;
+ unsigned char param[2];
+ psmouse_command(psmouse, param, PSMOUSE_CMD_RESET_BAT);
+}
+
+/*
+ * psmouse_disconnect() closes and frees.
*/

static void psmouse_disconnect(struct serio *serio)
@@ -607,8 +627,18 @@
static struct serio_dev psmouse_dev = {
.interrupt = psmouse_interrupt,
.connect = psmouse_connect,
- .disconnect = psmouse_disconnect
+ .disconnect = psmouse_disconnect,
+ .cleanup = psmouse_cleanup,
};
+
+#ifndef MODULE
+static int __init psmouse_setup(char *str)
+{
+ psmouse_noext = 1;
+ return 1;
+}
+__setup("psmouse_noext", psmouse_setup);
+#endif

int __init psmouse_init(void)
{
diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h Tue Oct 8 15:27:18 2002
+++ b/drivers/input/serio/i8042-io.h Tue Oct 8 15:27:18 2002
@@ -13,6 +13,7 @@

#define I8042_KBD_PHYS_DESC "isa0060/serio0"
#define I8042_AUX_PHYS_DESC "isa0060/serio1"
+#define I8042_MUX_PHYS_DESC "isa0060/serio%d"

/*
* IRQs.
@@ -64,9 +65,13 @@
*/
#if !defined(__i386__) && !defined(__sh__) && !defined(__alpha__) && !defined(__x86_64__)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
- return 0;
+ return -1;
#endif
- return 1;
+
+#if !defined(__i386__) && !defined(__x86_64__)
+ i8042_reset = 1;
+#endif
+ return 0;
}

static inline void i8042_platform_exit(void)
diff -Nru a/drivers/input/serio/i8042-ppcio.h b/drivers/input/serio/i8042-ppcio.h
--- a/drivers/input/serio/i8042-ppcio.h Tue Oct 8 15:27:18 2002
+++ b/drivers/input/serio/i8042-ppcio.h Tue Oct 8 15:27:18 2002
@@ -14,6 +14,7 @@

#define I8042_KBD_PHYS_DESC "walnutps2/serio0"
#define I8042_AUX_PHYS_DESC "walnutps2/serio1"
+#define I8042_MUX_PHYS_DESC "walnutps2/serio%d"

extern void *kb_cs;
extern void *kb_data;
@@ -34,18 +35,17 @@
static inline void i8042_write_data(int val)
{
writeb(val, kb_data);
- return;
}

static inline void i8042_write_command(int val)
{
writeb(val, kb_cs);
- return;
}

static inline int i8042_platform_init(void)
{
- return 1;
+ i8042_reset = 1;
+ return 0;
}

static inline void i8042_platform_exit(void)
@@ -59,6 +59,7 @@

#define I8042_KBD_PHYS_DESC "spruceps2/serio0"
#define I8042_AUX_PHYS_DESC "spruceps2/serio1"
+#define I8042_MUX_PHYS_DESC "spruceps2/serio%d"

#define I8042_COMMAND_REG 0xff810000
#define I8042_DATA_REG 0xff810001
@@ -109,18 +110,17 @@
static inline void i8042_write_data(int val)
{
*((unsigned char *)0xff810000) = (char)val;
- return;
}

static inline void i8042_write_command(int val)
{
*((unsigned char *)0xff810001) = (char)val;
- return;
}

static inline int i8042_platform_init(void)
{
- return 1;
+ i8042_reset = 1;
+ return 0;
}

static inline void i8042_platform_exit(void)
diff -Nru a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
--- a/drivers/input/serio/i8042-sparcio.h Tue Oct 8 15:27:18 2002
+++ b/drivers/input/serio/i8042-sparcio.h Tue Oct 8 15:27:18 2002
@@ -11,6 +11,7 @@

#define I8042_KBD_PHYS_DESC "sparcps2/serio0"
#define I8042_AUX_PHYS_DESC "sparcps2/serio1"
+#define I8042_MUX_PHYS_DESC "sparcps2/serio%d"

static unsigned long kbd_iobase;

@@ -50,14 +51,14 @@
len = prom_getproperty(prom_root_node, "name", prop, sizeof(prop));
if (len < 0) {
printk("i8042: Cannot get name property of root OBP node.\n");
- return 0;
+ return -1;
}
if (strncmp(prop, "SUNW,JavaStation-1", len) == 0) {
/* Hardcoded values for MrCoffee. */
i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
kbd_iobase = (unsigned long) ioremap(0x71300060, 8);
if (!kbd_iobase)
- return 0;
+ return -1;
} else {
struct linux_ebus *ebus;
struct linux_ebus_device *edev;
@@ -69,7 +70,7 @@
goto edev_found;
}
}
- return 0;
+ return -1;

edev_found:
for_each_edevchild(edev, child) {
@@ -87,11 +88,13 @@
i8042_aux_irq == -1) {
printk("i8042: Error, 8042 device lacks both kbd and "
"mouse nodes.\n");
- return 0;
+ return -1;
}
}

- return 1;
+ i8042_reset = 1;
+
+ return 0;
}

static inline void i8042_platform_exit(void)
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c Tue Oct 8 15:27:18 2002
+++ b/drivers/input/serio/i8042.c Tue Oct 8 15:27:18 2002
@@ -19,7 +19,9 @@
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/serio.h>
-#include <linux/sched.h> /* request/free_irq */
+#include <linux/sched.h>
+
+#undef DEBUG

#include "i8042.h"

@@ -31,13 +33,13 @@
MODULE_PARM(i8042_unlock, "1i");
MODULE_PARM(i8042_reset, "1i");
MODULE_PARM(i8042_direct, "1i");
-MODULE_PARM(i8042_restore_ctr, "1i");
+MODULE_PARM(i8042_dumbkbd, "1i");

static int i8042_noaux;
static int i8042_unlock;
static int i8042_reset;
static int i8042_direct;
-static int i8042_restore_ctr;
+static int i8042_dumbkbd;

spinlock_t i8042_lock = SPIN_LOCK_UNLOCKED;

@@ -46,6 +48,7 @@
unsigned char disable;
unsigned char irqen;
unsigned char exists;
+ signed char mux;
unsigned char *name;
unsigned char *phys;
};
@@ -55,12 +58,9 @@
static unsigned char i8042_initial_ctr;
static unsigned char i8042_ctr;
static unsigned char i8042_last_e0;
+static unsigned char i8042_mux_open;
struct timer_list i8042_timer;

-#ifdef I8042_DEBUG_IO
-static unsigned long i8042_start;
-#endif
-
extern struct pt_regs *kbd_pt_regs;

static unsigned long i8042_unxlate_seen[128 / BITS_PER_LONG];
@@ -110,18 +110,16 @@
static int i8042_flush(void)
{
unsigned long flags;
+ unsigned char data;
int i = 0;

spin_lock_irqsave(&i8042_lock, flags);

- while ((i8042_read_status() & I8042_STR_OBF) && (i++ < I8042_BUFFER_SIZE))
-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x <- i8042 (flush, %s) [%d]\n",
- i8042_read_data(), i8042_read_status() & I8042_STR_AUXDATA ? "aux" : "kbd",
- (int) (jiffies - i8042_start));
-#else
- i8042_read_data();
-#endif
+ while ((i8042_read_status() & I8042_STR_OBF) && (i++ < I8042_BUFFER_SIZE)) {
+ data = i8042_read_data();
+ dbg("%02x <- i8042 (flush, %s)", data,
+ i8042_read_status() & I8042_STR_AUXDATA ? "aux" : "kbd");
+ }

spin_unlock_irqrestore(&i8042_lock, flags);

@@ -145,20 +143,14 @@

retval = i8042_wait_write();
if (!retval) {
-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x -> i8042 (command) [%d]\n",
- command & 0xff, (int) (jiffies - i8042_start));
-#endif
+ dbg("%02x -> i8042 (command)", command & 0xff);
i8042_write_command(command & 0xff);
}

if (!retval)
for (i = 0; i < ((command >> 12) & 0xf); i++) {
if ((retval = i8042_wait_write())) break;
-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x -> i8042 (parameter) [%d]\n",
- param[i], (int) (jiffies - i8042_start));
-#endif
+ dbg("%02x -> i8042 (parameter)", param[i]);
i8042_write_data(param[i]);
}

@@ -169,19 +161,13 @@
param[i] = ~i8042_read_data();
else
param[i] = i8042_read_data();
-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x <- i8042 (return) [%d]\n",
- param[i], (int) (jiffies - i8042_start));
-#endif
+ dbg("%02x <- i8042 (return)\n", param[i]);
}

spin_unlock_irqrestore(&i8042_lock, flags);

-#ifdef I8042_DEBUG_IO
if (retval)
- printk(KERN_DEBUG "i8042.c: -- i8042 (timeout) [%d]\n",
- (int) (jiffies - i8042_start));
-#endif
+ dbg(" -- i8042 (timeout)");

return retval;
}
@@ -198,10 +184,7 @@
spin_lock_irqsave(&i8042_lock, flags);

if(!(retval = i8042_wait_write())) {
-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x -> i8042 (kbd-data) [%d]\n",
- c, (int) (jiffies - i8042_start));
-#endif
+ dbg("%02x -> i8042 (kbd-data)", c);
i8042_write_data(c);
}

@@ -216,21 +199,17 @@

static int i8042_aux_write(struct serio *port, unsigned char c)
{
+ struct i8042_values *values = port->driver;
int retval;

/*
* Send the byte out.
*/

- retval = i8042_command(&c, I8042_CMD_AUX_SEND);
-
-/*
- * Here we restore the CTR value if requested. I don't know why, but i8042's in
- * half-AT mode tend to trash their CTR when doing the AUX_SEND command.
- */
-
- if (i8042_restore_ctr)
- retval |= i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR);
+ if (values->mux == -1)
+ retval = i8042_command(&c, I8042_CMD_AUX_SEND);
+ else
+ retval = i8042_command(&c, I8042_CMD_MUX_SEND + values->mux);

/*
* Make sure the interrupt happens and the character is received even
@@ -242,6 +221,7 @@
return retval;
}

+
/*
* i8042_open() is called when a port is open by the higher layer.
* It allocates the interrupt and enables in in the chip.
@@ -253,6 +233,10 @@

i8042_flush();

+ if (values->mux != -1)
+ if (i8042_mux_open++)
+ return 0;
+
if (request_irq(values->irq, i8042_interrupt, 0, "i8042", NULL)) {
printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", values->irq, values->name);
values->exists = 0;
@@ -282,6 +266,10 @@
{
struct i8042_values *values = port->driver;

+ if (values->mux != -1)
+ if (--i8042_mux_open)
+ return;
+
i8042_ctr &= ~values->irqen;

if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
@@ -299,11 +287,11 @@
*/

static struct i8042_values i8042_kbd_values = {
- .irq = 0,
+ .irq = I8042_KBD_IRQ,
.irqen = I8042_CTR_KBDINT,
.disable = I8042_CTR_KBDDIS,
.name = "KBD",
- .exists = 0,
+ .mux = -1,
};

static struct serio i8042_kbd_port =
@@ -318,11 +306,11 @@
};

static struct i8042_values i8042_aux_values = {
- .irq = 0,
+ .irq = I8042_AUX_IRQ,
.irqen = I8042_CTR_AUXINT,
.disable = I8042_CTR_AUXDIS,
.name = "AUX",
- .exists = 0,
+ .mux = -1,
};

static struct serio i8042_aux_port =
@@ -336,6 +324,12 @@
.phys = I8042_AUX_PHYS_DESC,
};

+static struct i8042_values i8042_mux_values[4];
+static struct serio i8042_mux_port[4];
+static char i8042_mux_names[4][16];
+static char i8042_mux_short[4][8];
+static char i8042_mux_phys[4][32];
+
/*
* i8042_interrupt() is the most important function in this driver -
* it handles the interrupts from the i8042, and sends incoming bytes
@@ -373,34 +367,60 @@
dfl = ((str & I8042_STR_PARITY) ? SERIO_PARITY : 0) |
((str & I8042_STR_TIMEOUT) ? SERIO_TIMEOUT : 0);

-#ifdef I8042_DEBUG_IO
- printk(KERN_DEBUG "i8042.c: %02x <- i8042 (interrupt, %s, %d%s%s) [%d]\n",
+ if (i8042_mux_values[0].exists && (buffer[i].str & I8042_STR_AUXDATA)) {
+
+ if (buffer[i].str & I8042_STR_MUXERR) {
+ switch (buffer[i].data) {
+ case 0xfd:
+ case 0xfe: dfl = SERIO_TIMEOUT; break;
+ case 0xff: dfl = SERIO_PARITY; break;
+ }
+ buffer[i].data = 0xfe;
+ } else dfl = 0;
+
+ dbg("%02x <- i8042 (interrupt, aux%d, %d%s%s)",
+ data, (str >> 6), irq,
+ dfl & SERIO_PARITY ? ", bad parity" : "",
+ dfl & SERIO_TIMEOUT ? ", timeout" : "");
+
+ if (i8042_mux_values[(str >> 6)].exists)
+ serio_interrupt(i8042_mux_port + (str >> 6), buffer[i].data, dfl);
+ continue;
+ }
+
+ dbg("%02x <- i8042 (interrupt, %s, %d%s%s)",
data, (str & I8042_STR_AUXDATA) ? "aux" : "kbd", irq,
dfl & SERIO_PARITY ? ", bad parity" : "",
- dfl & SERIO_TIMEOUT ? ", timeout" : "",
- (int) (jiffies - i8042_start));
-#endif
+ dfl & SERIO_TIMEOUT ? ", timeout" : "");

if (i8042_aux_values.exists && (buffer[i].str & I8042_STR_AUXDATA)) {
serio_interrupt(&i8042_aux_port, buffer[i].data, dfl);
- } else
- if (i8042_kbd_values.exists) {
- if (!i8042_direct) {
- if (data > 0x7f) {
- if (test_and_clear_bit(data & 0x7f, i8042_unxlate_seen)) {
- serio_interrupt(&i8042_kbd_port, 0xf0, dfl);
- if (i8042_last_e0 && (data == 0xaa || data == 0xb6))
- set_bit(data & 0x7f, i8042_unxlate_seen);
- data = i8042_unxlate_table[data & 0x7f];
- }
- } else {
- set_bit(data, i8042_unxlate_seen);
- data = i8042_unxlate_table[data];
- }
- i8042_last_e0 = (data == 0xe0);
- }
- serio_interrupt(&i8042_kbd_port, data, dfl);
+ continue;
+ }
+
+ if (!i8042_kbd_values.exists)
+ continue;
+
+ if (i8042_direct) {
+ serio_interrupt(&i8042_kbd_port, data, dfl);
+ continue;
+ }
+
+ if (data > 0x7f) {
+ if (test_and_clear_bit(data & 0x7f, i8042_unxlate_seen)) {
+ serio_interrupt(&i8042_kbd_port, 0xf0, dfl);
+ if (i8042_last_e0 && (data == 0xaa || data == 0xb6))
+ set_bit(data & 0x7f, i8042_unxlate_seen);
+ data = i8042_unxlate_table[data & 0x7f];
}
+ } else {
+ set_bit(data, i8042_unxlate_seen);
+ data = i8042_unxlate_table[data];
+ }
+
+ i8042_last_e0 = (data == 0xe0);
+
+ serio_interrupt(&i8042_kbd_port, data, dfl);
}

}
@@ -460,17 +480,15 @@
*/

if (~i8042_read_status() & I8042_STR_KEYLOCK) {
-
- if (i8042_unlock) {
+ if (i8042_unlock)
i8042_ctr |= I8042_CTR_IGNKEYLOCK;
- } else {
+ else
printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n");
- }
}

/*
* If the chip is configured into nontranslated mode by the BIOS, don't
- * bother enabling translating and just use that happily.
+ * bother enabling translating and be happy.
*/

if (~i8042_ctr & I8042_CTR_XLATE)
@@ -478,10 +496,9 @@

/*
* Set nontranslated mode for the kbd interface if requested by an option.
- * This is vital for a working scancode set 3 support. After this the kbd
- * interface becomes a simple serial in/out, like the aux interface is. If
- * the user doesn't wish this, the driver tries to untranslate the values
- * after the i8042 translates them.
+ * After this the kbd interface becomes a simple serial in/out, like the aux
+ * interface is. We don't do this by default, since it can confuse notebook
+ * BIOSes.
*/

if (i8042_direct)
@@ -506,10 +523,25 @@

void i8042_controller_cleanup(void)
{
+ int i;

i8042_flush();

/*
+ * Reset anything that is connected to the ports.
+ */
+
+ if (i8042_kbd_values.exists)
+ serio_cleanup(&i8042_kbd_port);
+
+ if (i8042_aux_values.exists)
+ serio_cleanup(&i8042_aux_port);
+
+ for (i = 0; i < 4; i++)
+ if (i8042_mux_values[i].exists)
+ serio_cleanup(i8042_mux_port + i);
+
+/*
* Reset the controller.
*/

@@ -529,16 +561,72 @@
if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
printk(KERN_WARNING "i8042.c: Can't restore CTR.\n");

+}
+
/*
- * Reset anything that is connected to the ports if the ports
- * are enabled in the original config.
+ * i8042_check_mux() checks whether the controller supports the PS/2 Active
+ * Multiplexing specification by Synaptics, Phoenix, Insyde and
+ * LCS/Telegraphics.
*/

- if (i8042_kbd_values.exists)
- i8042_kbd_write(&i8042_kbd_port, 0xff);
+static int __init i8042_check_mux(struct i8042_values *values)
+{
+ unsigned char param;
+ int i;

- if (i8042_aux_values.exists)
- i8042_aux_write(&i8042_aux_port, 0xff);
+/*
+ * Check if AUX irq is available.
+ */
+
+ if (request_irq(values->irq, i8042_interrupt, 0, "i8042", NULL))
+ return -1;
+ free_irq(values->irq, NULL);
+
+/*
+ * Get rid of bytes in the queue.
+ */
+
+ i8042_flush();
+
+/*
+ * Internal loopback test - send three bytes, they should come back from the
+ * mouse interface, the last should be version. Note that we negate mouseport
+ * command responses for the i8042_check_aux() routine.
+ */
+
+ param = 0xf0;
+ if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
+ return -1;
+ param = 0x56;
+ if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa9)
+ return -1;
+ param = 0xa4;
+ if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == 0x5b)
+ return -1;
+
+ printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev%d.%d.\n",
+ ~param >> 4, ~param & 0xf);
+
+/*
+ * Disable all muxed ports by disabling AUX.
+ */
+
+ i8042_ctr &= I8042_CTR_AUXDIS;
+ i8042_ctr &= ~I8042_CTR_AUXINT;
+
+ if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+ return -1;
+
+/*
+ * Enable all muxed ports.
+ */
+
+ for (i = 0; i < 4; i++) {
+ i8042_command(&param, I8042_CMD_MUX_PFX + i);
+ i8042_command(&param, I8042_CMD_AUX_ENABLE);
+ }
+
+ return 0;
}

/*
@@ -546,7 +634,7 @@
* the presence of an AUX interface.
*/

-static int __init i8042_check_aux(struct i8042_values *values, struct serio *port)
+static int __init i8042_check_aux(struct i8042_values *values)
{
unsigned char param;

@@ -570,7 +658,6 @@
*/

param = 0x5a;
-
if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa5)
return -1;

@@ -665,9 +752,9 @@
i8042_direct = 1;
return 1;
}
-static int __init i8042_setup_restore_ctr(char *str)
+static int __init i8042_setup_dumbkbd(char *str)
{
- i8042_restore_ctr = 1;
+ i8042_dumbkbd = 1;
return 1;
}

@@ -675,7 +762,7 @@
__setup("i8042_noaux", i8042_setup_noaux);
__setup("i8042_unlock", i8042_setup_unlock);
__setup("i8042_direct", i8042_setup_direct);
-__setup("i8042_restore_ctr", i8042_setup_restore_ctr);
+__setup("i8042_dumbkbd", i8042_setup_dumbkbd);
#endif

/*
@@ -698,27 +785,43 @@
0
};

+static void __init i8042_init_mux_values(struct i8042_values *values, struct serio *port, int index)
+{
+ memcpy(port, &i8042_aux_port, sizeof(struct serio));
+ memcpy(values, &i8042_aux_values, sizeof(struct i8042_values));
+ sprintf(i8042_mux_names[index], "i8042 Aux-%d Port", index);
+ sprintf(i8042_mux_phys[index], I8042_MUX_PHYS_DESC, index + 1);
+ sprintf(i8042_mux_short[index], "AUX%d", index);
+ port->name = i8042_mux_names[index];
+ port->phys = i8042_mux_phys[index];
+ values->name = i8042_mux_short[index];
+ values->mux = index;
+}
+
int __init i8042_init(void)
{
-#ifdef I8042_DEBUG_IO
- i8042_start = jiffies;
-#endif
+ int i;

-#if !defined(__i386__) && !defined(__x86_64__)
- i8042_reset = 1;
-#endif
+ dbg_init();

- if (!i8042_platform_init())
+ if (i8042_platform_init())
return -EBUSY;

- i8042_kbd_values.irq = I8042_KBD_IRQ;
- i8042_aux_values.irq = I8042_AUX_IRQ;
-
if (i8042_controller_init())
return -ENODEV;
-
- if (!i8042_noaux && !i8042_check_aux(&i8042_aux_values, &i8042_aux_port))
- i8042_port_register(&i8042_aux_values, &i8042_aux_port);
+
+ if (i8042_dumbkbd)
+ i8042_kbd_port.write = NULL;
+
+ for (i = 0; i < 4; i++)
+ i8042_init_mux_values(i8042_mux_values + i, i8042_mux_port + i, i);
+
+ if (!i8042_noaux && !i8042_check_mux(&i8042_aux_values))
+ for (i = 0; i < 4; i++)
+ i8042_port_register(i8042_mux_values + i, i8042_mux_port + i);
+ else
+ if (!i8042_noaux && !i8042_check_aux(&i8042_aux_values))
+ i8042_port_register(&i8042_aux_values, &i8042_aux_port);

i8042_port_register(&i8042_kbd_values, &i8042_kbd_port);

@@ -732,22 +835,26 @@

void __exit i8042_exit(void)
{
+ int i;
+
unregister_reboot_notifier(&i8042_notifier);

del_timer(&i8042_timer);
+
+ i8042_controller_cleanup();

if (i8042_kbd_values.exists)
serio_unregister_port(&i8042_kbd_port);

if (i8042_aux_values.exists)
serio_unregister_port(&i8042_aux_port);
-
- i8042_controller_cleanup();
+
+ for (i = 0; i < 4; i++)
+ if (i8042_mux_values[i].exists)
+ serio_unregister_port(i8042_mux_port + i);

i8042_platform_exit();
}

module_init(i8042_init);
module_exit(i8042_exit);
-
-
diff -Nru a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
--- a/drivers/input/serio/i8042.h Tue Oct 8 15:27:18 2002
+++ b/drivers/input/serio/i8042.h Tue Oct 8 15:27:18 2002
@@ -22,13 +22,6 @@
#endif

/*
- * If you want to trace all the i/o the i8042 module does for
- * debugging purposes, define this.
- */
-
-#undef I8042_DEBUG_IO
-
-/*
* This is in 50us units, the time we wait for the i8042 to react. This
* has to be long enough for the i8042 itself to timeout on sending a byte
* to a non-existent mouse.
@@ -54,6 +47,7 @@
#define I8042_STR_AUXDATA 0x20
#define I8042_STR_KEYLOCK 0x10
#define I8042_STR_CMDDAT 0x08
+#define I8042_STR_MUXERR 0x04
#define I8042_STR_IBF 0x02
#define I8042_STR_OBF 0x01

@@ -87,6 +81,9 @@
#define I8042_CMD_AUX_SEND 0x10d4
#define I8042_CMD_AUX_LOOP 0x11d3

+#define I8042_CMD_MUX_PFX 0x0090
+#define I8042_CMD_MUX_SEND 0x1090
+
/*
* Return codes.
*/
@@ -99,5 +96,19 @@
*/

#define I8042_BUFFER_SIZE 32
+
+/*
+ * Debug.
+ */
+
+#ifdef DEBUG
+static unsigned long i8042_start;
+#define dbg_init() do { i8042_start = jiffies; } while (0);
+#define dbg(format, arg...) printk(KERN_DEBUG __FILE__ ": " format "[%d]\n" ,\
+ ## arg, (int) (jiffies - i8042_start))
+#else
+#define dbg_init() do { } while (0);
+#define dbg(format, arg...) do {} while (0)
+#endif

#endif /* _I8042_H */
diff -Nru a/include/linux/serio.h b/include/linux/serio.h
--- a/include/linux/serio.h Tue Oct 8 15:27:18 2002
+++ b/include/linux/serio.h Tue Oct 8 15:27:18 2002
@@ -69,6 +69,7 @@
void (*interrupt)(struct serio *, unsigned char, unsigned int);
void (*connect)(struct serio *, struct serio_dev *dev);
void (*disconnect)(struct serio *);
+ void (*cleanup)(struct serio *);

struct serio_dev *next;
};
@@ -85,13 +86,22 @@

static __inline__ int serio_write(struct serio *serio, unsigned char data)
{
- return serio->write(serio, data);
+ if (serio->write)
+ return serio->write(serio, data);
+ else
+ return -1;
}

static __inline__ void serio_dev_write_wakeup(struct serio *serio)
{
if (serio->dev && serio->dev->write_wakeup)
serio->dev->write_wakeup(serio);
+}
+
+static __inline__ void serio_cleanup(struct serio *serio)
+{
+ if (serio->dev && serio->dev->cleanup)
+ serio->dev->cleanup(serio);
}

/*

===================================================================

This BitKeeper patch contains the following changesets:
1.573.1.33
## Wrapped with gzip_uu ##

begin 664 bkpatch18386
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
M%C&V'0[C``Y@;9!%W@UD)!24`"[email protected]\"'(;-\I!=UL*GM!OY_
MQ?`I)A@]X*L*-J0W+6#H.]1GQ[8[J/LX*>9C`G*-O+#IAU6CODXMQ!H!=P3E
MB+$UT>''G-3V'X`YE>[M&+N$2562T]L@*!SN?U3JXS]AS^5W@RJG*,XZYV!G
M/G(=!SMQBH(#YFD-CT($\P#6:W`1:&BE__5*;K?,?\GG>LWD'8B^3IWH[Z*>
M3OJ&]7`Z]03KX2L'.!:KP/AWQ.XFG%0)]PV=4!A,I_`UR4*%CA1^4H"\RNGJ
MC#O>V'-L>M$?#GSPX-LS`!K@L\\F`?>]>\"5?O0`J1YH)H[_=#38N>!3?A7:
MLPD08AM4-86XF!$LUXFKTC\!IZEVO**BOI<I5`_;`M0=D)FN)H7R(WH9`PX#
M(`M&7M0K^];VIN@>2JH4\C_FZ("!*$.L%*J%-(6P!8YT@VYNB*9%,R\05KJ6
MU#K!6OPR5QJ8O^3R`0P@]%P6C*DQ`\#2IR,"F>8%.4D4ROD:A<%]E`U?C)D&
MP6QDPX(QE+`V6#GXC'@"`@BN+>3YP``^SJ<N9FYP'\G'87"#CY!9UC41#H"&
M,'29Z3#P05@[P)>RV`G8>?;>C<^OL-E/#%#)D%N:'88\F@5^E/Q`!5D6S]XF
MS0W!%7E^OEHZ7P'*TC<O*JE-TB\IIT6?3D_/Z&TJ,?XG9""-*V\A%9CKQE]D
M;G<?9VYKKV=.<4D?+;T_57J+HW_R_C111WR%H\=CX3)M48*Z*=IT[@=:<""W
MFVX'_L4L&F;XCY@3,)[68LD72ND+>M;S(M&:G4ZQL`*S"%^"X8`>X22PD(J^
M.I@.[*=K3=*'_F"O\OP_)8+^R47%1V=[EXTJ[M_1Q:?AKS!V^74S(?NQOTKT
M3-)''#G!D'5'1W79][\E+GL]/1YUTMI,.JN%U!F\&#4JQ.5IEVFO<YD]G8!%
MSR"TT1>7QWB*UR*28EKI/1+#%%U$NM1*13=1208*,0%=L@Y>B7*CM6H>K#R8
M$O!52]W8DF#X9R&*/K7D5CGIWA:(3;S`XO)["B(W_,:9/33$HTI41SCS;QZ,
M2^W?)AY3,BJ=IC`NF[DTLB@=,8C(:L>%."\R?1+L6QI2V.'\OKWILC,0!G>,
MI%XYFA+\=/"*!D$R&+127LU`%!&RZ4$K-]WBE*)ZA4)FX+HJ=4:%PI2H"M(!
M41KYEI@592C040E&2"*ZWCT3L@,5544O0$BX:XJ[]%H=9)ND*Q@:>Z9X`4M<
M"EYD!F@:C/TFH6PB)6(IN'2)%]:*U++G274UL^T41G;HU0H0%:/Y.D"X4I>K
M$!&=2*M2+$KNY9@U26/]`-2/>I95'+6DG>05'Y<M$0XG&X;\"A`J#Y\M6EJ"
M9.4D>[5T]J/2K91AA9DMX_"^"6A8R;3B*]Y`V)D'H"SNY2^*H(IH.*QO:E3O
M_%O`_-Q/12?A5H/ZGJDK,/'3/;?7]8B?^TNY%_YJJ_)C,!78*KHIO?376K+%
MVC^FZ;:R*U;]\<R*KAS]-'GIUS-/[,.KNF,Z,R&@+_>.\]HHOL,%R;R%+JA,
M4P`82"1UI4<(L*H/%#)2@`G@N^6076?0#3<F13MOO''>B*NVQ>!`KM)('=LA
M_M`@F2_WKU@(^+-(!$;S+V\\]GBTQ[ZSI">&%97"V`:Z71OKI.%5I]-ILB*,
M)5D@[+_O?SH>#MG&+MM@@IYM?-ETOP%*92TP:/;F#8YO41VQR1K)K*Q=E`;\
IB?AQQ&.2/UM$I"X09^\<I?^O!B+9GM_L*UV7&_)(JO\?O))1_D)!````
`
end

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-09-25 17:05:02+02:00, [email protected]
Convert more of input to list.h usage.

evdev.c | 104 ++++++++++++--------------------------------------
gameport/emu10k1-gp.c | 1
gameport/ns558.c | 52 ++++++++++---------------
joydev.c | 91 +++++++++++--------------------------------
mousedev.c | 97 ++++++++++++----------------------------------
tsdev.c | 103 ++++++++++++++-----------------------------------
6 files changed, 130 insertions(+), 318 deletions(-)

===================================================================

diff -Nru a/drivers/input/evdev.c b/drivers/input/evdev.c
--- a/drivers/input/evdev.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/evdev.c Tue Oct 8 15:26:21 2002
@@ -1,29 +1,11 @@
/*
- * $Id: evdev.c,v 1.48 2002/05/26 14:28:26 jdeneux Exp $
+ * Event char devices, giving access to raw input device events.
*
- * Copyright (c) 1999-2001 Vojtech Pavlik
+ * Copyright (c) 1999-2002 Vojtech Pavlik
*
- * Event char devices, giving access to raw input device events.
- */
-
-/*
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <[email protected]>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * 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.
*/

#define EVDEV_MINOR_BASE 64
@@ -38,7 +20,7 @@
#include <linux/smp_lock.h>
#include <linux/device.h>

-struct evdev {
+struct evdev{
int exist;
int open;
int minor;
@@ -46,7 +28,7 @@
struct input_handle handle;
wait_queue_head_t wait;
devfs_handle_t devfs;
- struct evdev_list *list;
+ struct list_head list;
};

struct evdev_list {
@@ -55,17 +37,17 @@
int tail;
struct fasync_struct *fasync;
struct evdev *evdev;
- struct evdev_list *next;
+ struct list_head node;
};

-static struct evdev *evdev_table[EVDEV_MINORS] = { NULL, /* ... */ };
+static struct evdev *evdev_table[EVDEV_MINORS];

static void evdev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
{
struct evdev *evdev = handle->private;
- struct evdev_list *list = evdev->list;
+ struct evdev_list *list;

- while (list) {
+ list_for_each_entry(list, &evdev->list, node) {

do_gettimeofday(&list->buffer[list->head].time);
list->buffer[list->head].type = type;
@@ -74,8 +56,6 @@
list->head = (list->head + 1) & (EVDEV_BUFFER_SIZE - 1);

kill_fasync(&list->fasync, SIGIO, POLL_IN);
-
- list = list->next;
}

wake_up_interruptible(&evdev->wait);
@@ -91,7 +71,7 @@

static int evdev_flush(struct file * file)
{
- struct evdev_list *list = (struct evdev_list*)file->private_data;
+ struct evdev_list *list = file->private_data;
if (!list->evdev->exist) return -ENODEV;
return input_flush_device(&list->evdev->handle, file);
}
@@ -99,14 +79,9 @@
static int evdev_release(struct inode * inode, struct file * file)
{
struct evdev_list *list = file->private_data;
- struct evdev_list **listptr;

- listptr = &list->evdev->list;
evdev_fasync(-1, file, 0);
-
- while (*listptr && (*listptr != list))
- listptr = &((*listptr)->next);
- *listptr = (*listptr)->next;
+ list_del(&list->node);

if (!--list->evdev->open) {
if (list->evdev->exist) {
@@ -132,19 +107,15 @@
if (i >= EVDEV_MINORS || !evdev_table[i])
return -ENODEV;

- /* Ask the driver if he wishes to accept the open() */
- if ((accept_err = input_accept_process(&(evdev_table[i]->handle), file))) {
+ if ((accept_err = input_accept_process(&(evdev_table[i]->handle), file)))
return accept_err;
- }

if (!(list = kmalloc(sizeof(struct evdev_list), GFP_KERNEL)))
return -ENOMEM;
memset(list, 0, sizeof(struct evdev_list));

list->evdev = evdev_table[i];
- list->next = evdev_table[i]->list;
- evdev_table[i]->list = list;
-
+ list_add_tail(&list->node, &evdev_table[i]->list);
file->private_data = list;

if (!list->evdev->open++)
@@ -175,40 +146,21 @@

static ssize_t evdev_read(struct file * file, char * buffer, size_t count, loff_t *ppos)
{
- DECLARE_WAITQUEUE(wait, current);
struct evdev_list *list = file->private_data;
- int retval = 0;
-
- if (list->head == list->tail) {
-
- add_wait_queue(&list->evdev->wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
-
- while (list->head == list->tail) {
-
- if (!list->evdev->exist) {
- retval = -ENODEV;
- break;
- }
- if (file->f_flags & O_NONBLOCK) {
- retval = -EAGAIN;
- break;
- }
- if (signal_pending(current)) {
- retval = -ERESTARTSYS;
- break;
- }
+ int retval;

- schedule();
- }
+ if (list->head == list->tail && list->evdev->exist && (file->f_flags & O_NONBLOCK))
+ return -EAGAIN;

- set_current_state(TASK_RUNNING);
- remove_wait_queue(&list->evdev->wait, &wait);
- }
+ retval = wait_event_interruptible(list->evdev->wait,
+ list->head != list->tail && list->evdev->exist);

if (retval)
return retval;

+ if (!list->evdev->exist)
+ return -ENODEV;
+
while (list->head != list->tail && retval + sizeof(struct input_event) <= count) {
if (copy_to_user(buffer + retval, list->buffer + list->tail,
sizeof(struct input_event))) return -EFAULT;
@@ -433,21 +385,19 @@
return NULL;
memset(evdev, 0, sizeof(struct evdev));

+ INIT_LIST_HEAD(&evdev->list);
init_waitqueue_head(&evdev->wait);

+ evdev->exist = 1;
evdev->minor = minor;
- evdev_table[minor] = evdev;
-
- sprintf(evdev->name, "event%d", minor);
-
evdev->handle.dev = dev;
evdev->handle.name = evdev->name;
evdev->handle.handler = handler;
evdev->handle.private = evdev;
+ sprintf(evdev->name, "event%d", minor);

+ evdev_table[minor] = evdev;
evdev->devfs = input_register_minor("event%d", minor, EVDEV_MINOR_BASE);
-
- evdev->exist = 1;

return &evdev->handle;
}
diff -Nru a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
--- a/drivers/input/gameport/emu10k1-gp.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/gameport/emu10k1-gp.c Tue Oct 8 15:26:21 2002
@@ -44,7 +44,6 @@

struct emu {
struct pci_dev *dev;
- struct emu *next;
struct gameport gameport;
int size;
char phys[32];
diff -Nru a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c
--- a/drivers/input/gameport/ns558.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/gameport/ns558.c Tue Oct 8 15:26:21 2002
@@ -53,13 +53,13 @@
int type;
int size;
struct pci_dev *dev;
- struct ns558 *next;
+ struct list_head node;
struct gameport gameport;
char phys[32];
char name[32];
};

-static struct ns558 *ns558;
+static LIST_HEAD(ns558_list);

/*
* ns558_isa_probe() tries to find an isa gameport at the
@@ -67,7 +67,7 @@
* A joystick must be attached for this to work.
*/

-static struct ns558* ns558_isa_probe(int io, struct ns558 *next)
+static void ns558_isa_probe(int io)
{
int i, j, b;
unsigned char c, u, v;
@@ -78,7 +78,7 @@
*/

if (check_region(io, 1))
- return next;
+ return;

/*
* We must not be able to write arbitrary values to the port.
@@ -89,7 +89,7 @@
outb(~c & ~3, io);
if (~(u = v = inb(io)) & 3) {
outb(c, io);
- return next;
+ return;
}
/*
* After a trigger, there must be at least some bits changing.
@@ -99,7 +99,7 @@

if (u == v) {
outb(c, io);
- return next;
+ return;
}
wait_ms(3);
/*
@@ -110,7 +110,7 @@
for (i = 0; i < 1000; i++)
if ((u ^ inb(io)) & 0xf) {
outb(c, io);
- return next;
+ return;
}
/*
* And now find the number of mirrors of the port.
@@ -134,11 +134,10 @@

if (!(port = kmalloc(sizeof(struct ns558), GFP_KERNEL))) {
printk(KERN_ERR "ns558: Memory allocation failed.\n");
- return next;
+ return;
}
memset(port, 0, sizeof(struct ns558));

- port->next = next;
port->type = NS558_ISA;
port->size = (1 << i);
port->gameport.io = io & (-1 << i);
@@ -157,7 +156,7 @@
if (port->size > 1) printk(" size %d", port->size);
printk(" speed %d kHz\n", port->gameport.speed);

- return port;
+ list_add(&port->node, &ns558_list);
}

#ifdef __ISAPNP__
@@ -194,22 +193,22 @@

MODULE_DEVICE_TABLE(isapnp, pnp_devids);

-static struct ns558* ns558_pnp_probe(struct pci_dev *dev, struct ns558 *next)
+static void ns558_pnp_probe(struct pci_dev *dev)
{
int ioport, iolen;
struct ns558 *port;

if (dev->prepare && dev->prepare(dev) < 0)
- return next;
+ return;

if (!(dev->resource[0].flags & IORESOURCE_IO)) {
printk(KERN_WARNING "ns558: No i/o ports on a gameport? Weird\n");
- return next;
+ return;
}

if (dev->activate && dev->activate(dev) < 0) {
printk(KERN_ERR "ns558: PnP resource allocation failed\n");
- return next;
+ return;
}

ioport = pci_resource_start(dev, 0);
@@ -224,7 +223,6 @@
}
memset(port, 0, sizeof(struct ns558));

- port->next = next;
port->type = NS558_PNP;
port->size = iolen;
port->dev = dev;
@@ -247,12 +245,12 @@
if (iolen > 1) printk(" size %d", iolen);
printk(" speed %d kHz\n", port->gameport.speed);

- return port;
+ list_add_tail(&port->node, &ns558_list);
+ return;

deactivate:
if (dev->deactivate)
dev->deactivate(dev);
- return next;
}
#endif

@@ -269,28 +267,26 @@
*/

while (ns558_isa_portlist[i])
- ns558 = ns558_isa_probe(ns558_isa_portlist[i++], ns558);
+ ns558_isa_probe(ns558_isa_portlist[i++]);

/*
* Probe for PnP ports.
*/

#ifdef __ISAPNP__
- for (devid = pnp_devids; devid->vendor; devid++) {
- while ((dev = isapnp_find_dev(NULL, devid->vendor, devid->function, dev))) {
- ns558 = ns558_pnp_probe(dev, ns558);
- }
- }
+ for (devid = pnp_devids; devid->vendor; devid++)
+ while ((dev = isapnp_find_dev(NULL, devid->vendor, devid->function, dev)))
+ ns558_pnp_probe(dev);
#endif

- return ns558 ? 0 : -ENODEV;
+ return list_empty(&ns558_list) ? -ENODEV : 0;
}

void __exit ns558_exit(void)
{
- struct ns558 *next, *port = ns558;
+ struct ns558 *port;

- while (port) {
+ list_for_each_entry(port, &ns558_list, node) {
gameport_unregister_port(&port->gameport);
switch (port->type) {

@@ -308,10 +304,6 @@
default:
break;
}
-
- next = port->next;
- kfree(port);
- port = next;
}
}

diff -Nru a/drivers/input/joydev.c b/drivers/input/joydev.c
--- a/drivers/input/joydev.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/joydev.c Tue Oct 8 15:26:21 2002
@@ -1,30 +1,13 @@
/*
- * $Id: joydev.c,v 1.43 2002/04/09 23:59:01 jsimmons Exp $
+ * Joystick device driver for the input driver suite.
*
- * Copyright (c) 1999-2001 Vojtech Pavlik
- * Copyright (c) 1999 Colin Van Dyke
+ * Copyright (c) 1999-2002 Vojtech Pavlik
+ * Copyright (c) 1999 Colin Van Dyke
*
- * Joystick device driver for the input driver suite.
- */
-
-/*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <[email protected]>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
*/

#include <asm/io.h>
@@ -63,8 +46,7 @@
struct input_handle handle;
wait_queue_head_t wait;
devfs_handle_t devfs;
- struct joydev *next;
- struct joydev_list *list;
+ struct list_head list;
struct js_corr corr[ABS_MAX];
struct JS_DATA_SAVE_TYPE glue;
int nabs;
@@ -83,7 +65,7 @@
int startup;
struct fasync_struct *fasync;
struct joydev *joydev;
- struct joydev_list *next;
+ struct list_head node;
};

static struct joydev *joydev_table[JOYDEV_MINORS];
@@ -111,7 +93,7 @@
static void joydev_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
{
struct joydev *joydev = handle->private;
- struct joydev_list *list = joydev->list;
+ struct joydev_list *list;
struct js_event event;

switch (type) {
@@ -137,7 +119,7 @@

event.time = MSECS(jiffies);

- while (list) {
+ list_for_each_entry(list, &joydev->list, node) {

memcpy(list->buffer + list->head, &event, sizeof(struct js_event));

@@ -146,8 +128,6 @@
list->startup = 0;

kill_fasync(&list->fasync, SIGIO, POLL_IN);
-
- list = list->next;
}

wake_up_interruptible(&joydev->wait);
@@ -164,14 +144,10 @@
static int joydev_release(struct inode * inode, struct file * file)
{
struct joydev_list *list = file->private_data;
- struct joydev_list **listptr;

- listptr = &list->joydev->list;
joydev_fasync(-1, file, 0);

- while (*listptr && (*listptr != list))
- listptr = &((*listptr)->next);
- *listptr = (*listptr)->next;
+ list_del(&list->node);

if (!--list->joydev->open) {
if (list->joydev->exist) {
@@ -201,9 +177,7 @@
memset(list, 0, sizeof(struct joydev_list));

list->joydev = joydev_table[i];
- list->next = joydev_table[i]->list;
- joydev_table[i]->list = list;
-
+ list_add_tail(&list->node, &joydev_table[i]->list);
file->private_data = list;

if (!list->joydev->open++)
@@ -220,12 +194,14 @@

static ssize_t joydev_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
- DECLARE_WAITQUEUE(wait, current);
struct joydev_list *list = file->private_data;
struct joydev *joydev = list->joydev;
struct input_dev *input = joydev->handle.dev;
int retval = 0;

+ if (!list->joydev->exist)
+ return -ENODEV;
+
if (count < sizeof(struct js_event))
return -EINVAL;

@@ -248,36 +224,19 @@
return sizeof(struct JS_DATA_TYPE);
}

- if (list->head == list->tail && list->startup == joydev->nabs + joydev->nkey) {
-
- add_wait_queue(&list->joydev->wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
-
- while (list->head == list->tail) {
-
- if (!joydev->exist) {
- retval = -ENODEV;
- break;
- }
- if (file->f_flags & O_NONBLOCK) {
- retval = -EAGAIN;
- break;
- }
- if (signal_pending(current)) {
- retval = -ERESTARTSYS;
- break;
- }
-
- schedule();
- }
+ if (list->startup == joydev->nabs + joydev->nkey
+ && list->head == list->tail && (file->f_flags & O_NONBLOCK))
+ return -EAGAIN;

- set_current_state(TASK_RUNNING);
- remove_wait_queue(&list->joydev->wait, &wait);
- }
+ retval = wait_event_interruptible(list->joydev->wait, list->joydev->exist
+ && (list->startup < joydev->nabs + joydev->nkey || list->head != list->tail));

if (retval)
return retval;

+ if (!list->joydev->exist)
+ return -ENODEV;
+
while (list->startup < joydev->nabs + joydev->nkey && retval + sizeof(struct js_event) <= count) {

struct js_event event;
@@ -431,17 +390,16 @@
return NULL;
memset(joydev, 0, sizeof(struct joydev));

+ INIT_LIST_HEAD(&joydev->list);
init_waitqueue_head(&joydev->wait);

joydev->minor = minor;
- joydev_table[minor] = joydev;
-
- sprintf(joydev->name, "js%d", minor);
-
+ joydev->exist = 1;
joydev->handle.dev = dev;
joydev->handle.name = joydev->name;
joydev->handle.handler = handler;
joydev->handle.private = joydev;
+ sprintf(joydev->name, "js%d", minor);

for (i = 0; i < ABS_MAX; i++)
if (test_bit(i, dev->absbit)) {
@@ -482,9 +440,8 @@
joydev->abs[i] = joydev_correct(dev->abs[j], joydev->corr + i);
}

+ joydev_table[minor] = joydev;
joydev->devfs = input_register_minor("js%d", minor, JOYDEV_MINOR_BASE);
-
- joydev->exist = 1;

return &joydev->handle;
}
diff -Nru a/drivers/input/mousedev.c b/drivers/input/mousedev.c
--- a/drivers/input/mousedev.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/mousedev.c Tue Oct 8 15:26:21 2002
@@ -1,29 +1,11 @@
/*
- * $Id: mousedev.c,v 1.42 2002/04/09 20:51:26 jdeneux Exp $
+ * Input driver to ExplorerPS/2 device driver module.
*
- * Copyright (c) 1999-2001 Vojtech Pavlik
+ * Copyright (c) 1999-2002 Vojtech Pavlik
*
- * Input driver to ExplorerPS/2 device driver module.
- */
-
-/*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <[email protected]>, or by paper mail:
- * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ * it under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
*/

#define MOUSEDEV_MINOR_BASE 32
@@ -61,7 +43,7 @@
int minor;
char name[16];
wait_queue_head_t wait;
- struct mousedev_list *list;
+ struct list_head list;
struct input_handle handle;
devfs_handle_t devfs;
};
@@ -69,7 +51,7 @@
struct mousedev_list {
struct fasync_struct *fasync;
struct mousedev *mousedev;
- struct mousedev_list *next;
+ struct list_head node;
int dx, dy, dz, oldx, oldy;
signed char ps2[6];
unsigned long buttons;
@@ -98,9 +80,10 @@
int index, size, wake;

while (*mousedev) {
+
wake = 0;
- list = (*mousedev)->list;
- while (list) {
+
+ list_for_each_entry(list, &(*mousedev)->list, node)
switch (type) {
case EV_ABS:
if (test_bit(BTN_TRIGGER, handle->dev->keybit))
@@ -116,6 +99,7 @@
list->oldx += list->dx;
}
break;
+
case ABS_Y:
size = handle->dev->absmax[ABS_Y] - handle->dev->absmin[ABS_Y];
if (size != 0) {
@@ -170,10 +154,10 @@
break;
}
}
- list = list->next;
- }
+
if (wake)
wake_up_interruptible(&((*mousedev)->wait));
+
mousedev++;
}
}
@@ -189,21 +173,17 @@
static int mousedev_release(struct inode * inode, struct file * file)
{
struct mousedev_list *list = file->private_data;
- struct mousedev_list **listptr;
+ struct input_handle *handle;
+ struct mousedev *mousedev;

- listptr = &list->mousedev->list;
mousedev_fasync(-1, file, 0);

- while (*listptr && (*listptr != list))
- listptr = &((*listptr)->next);
- *listptr = (*listptr)->next;
+ list_del(&list->node);

if (!--list->mousedev->open) {
if (list->mousedev->minor == MOUSEDEV_MIX) {
- struct list_head * node;
- list_for_each(node,&mousedev_handler.h_list) {
- struct input_handle *handle = to_handle_h(node);
- struct mousedev *mousedev = handle->private;
+ list_for_each_entry(handle, &mousedev_handler.h_list, h_node) {
+ mousedev = handle->private;
if (!mousedev->open) {
if (mousedev->exist) {
input_close_device(&mousedev->handle);
@@ -252,8 +232,7 @@
memset(list, 0, sizeof(struct mousedev_list));

list->mousedev = mousedev_table[i];
- list->next = mousedev_table[i]->list;
- mousedev_table[i]->list = list;
+ list_add_tail(&list->node, &mousedev_table[i]->list);
file->private_data = list;

if (!list->mousedev->open++) {
@@ -373,35 +352,13 @@

static ssize_t mousedev_read(struct file * file, char * buffer, size_t count, loff_t *ppos)
{
- DECLARE_WAITQUEUE(wait, current);
struct mousedev_list *list = file->private_data;
int retval = 0;

- if (!list->ready && !list->buffer) {
-
- add_wait_queue(&list->mousedev->wait, &wait);
-
- for (;;) {
- set_current_state(TASK_INTERRUPTIBLE);
-
- retval = 0;
- if (list->ready || list->buffer)
- break;
-
- retval = -EAGAIN;
- if (file->f_flags & O_NONBLOCK)
- break;
+ if (!list->ready && !list->buffer && (file->f_flags & O_NONBLOCK))
+ return -EAGAIN;

- retval = -ERESTARTSYS;
- if (signal_pending(current))
- break;
-
- schedule();
- }
-
- set_current_state(TASK_RUNNING);
- remove_wait_queue(&list->mousedev->wait, &wait);
- }
+ retval = wait_event_interruptible(list->mousedev->wait, list->ready || list->buffer);

if (retval)
return retval;
@@ -454,23 +411,23 @@
if (!(mousedev = kmalloc(sizeof(struct mousedev), GFP_KERNEL)))
return NULL;
memset(mousedev, 0, sizeof(struct mousedev));
+
+ INIT_LIST_HEAD(&mousedev->list);
init_waitqueue_head(&mousedev->wait);

mousedev->minor = minor;
- mousedev_table[minor] = mousedev;
- sprintf(mousedev->name, "mouse%d", minor);
-
+ mousedev->exist = 1;
mousedev->handle.dev = dev;
mousedev->handle.name = mousedev->name;
mousedev->handle.handler = handler;
mousedev->handle.private = mousedev;
-
- mousedev->devfs = input_register_minor("mouse%d", minor, MOUSEDEV_MINOR_BASE);
+ sprintf(mousedev->name, "mouse%d", minor);

if (mousedev_mix.open)
input_open_device(&mousedev->handle);

- mousedev->exist = 1;
+ mousedev_table[minor] = mousedev;
+ mousedev->devfs = input_register_minor("mouse%d", minor, MOUSEDEV_MINOR_BASE);

return &mousedev->handle;
}
diff -Nru a/drivers/input/tsdev.c b/drivers/input/tsdev.c
--- a/drivers/input/tsdev.c Tue Oct 8 15:26:21 2002
+++ b/drivers/input/tsdev.c Tue Oct 8 15:26:21 2002
@@ -55,7 +55,7 @@
int minor;
char name[16];
wait_queue_head_t wait;
- struct tsdev_list *list;
+ struct list_head list;
struct input_handle handle;
devfs_handle_t devfs;
};
@@ -70,7 +70,7 @@

struct tsdev_list {
struct fasync_struct *fasync;
- struct tsdev_list *next;
+ struct list_head node;
struct tsdev *tsdev;
int head, tail;
int oldx, oldy, pendown;
@@ -106,8 +106,7 @@
memset(list, 0, sizeof(struct tsdev_list));

list->tsdev = tsdev_table[i];
- list->next = tsdev_table[i]->list;
- tsdev_table[i]->list = list;
+ list_add_tail(&list->node, &tsdev_table[i]->list);
file->private_data = list;

if (!list->tsdev->open++)
@@ -119,14 +118,9 @@
static int tsdev_release(struct inode *inode, struct file *file)
{
struct tsdev_list *list = file->private_data;
- struct tsdev_list **listptr;

- listptr = &list->tsdev->list;
tsdev_fasync(-1, file, 0);
-
- while (*listptr && (*listptr != list))
- listptr = &((*listptr)->next);
- *listptr = (*listptr)->next;
+ list_del(&list->node);

if (!--list->tsdev->open) {
if (list->tsdev->exist) {
@@ -144,45 +138,28 @@
static ssize_t tsdev_read(struct file *file, char *buffer, size_t count,
loff_t * ppos)
{
- DECLARE_WAITQUEUE(wait, current);
struct tsdev_list *list = file->private_data;
int retval = 0;

- if (list->head == list->tail) {
- add_wait_queue(&list->tsdev->wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
-
- while (list->head == list->tail) {
- if (!list->tsdev->exist) {
- retval = -ENODEV;
- break;
- }
- if (file->f_flags & O_NONBLOCK) {
- retval = -EAGAIN;
- break;
- }
- if (signal_pending(current)) {
- retval = -ERESTARTSYS;
- break;
- }
- schedule();
- }
- set_current_state(TASK_RUNNING);
- remove_wait_queue(&list->tsdev->wait, &wait);
- }
+ if (list->head == list->tail && list->tsdev->exist && (file->f_flags & O_NONBLOCK))
+ return -EAGAIN;
+
+ retval = wait_event_interruptible(list->tsdev->wait,
+ (list->head != list->tail) && list->tsdev->exist);

if (retval)
return retval;

- while (list->head != list->tail
- && retval + sizeof(TS_EVENT) <= count) {
- if (copy_to_user
- (buffer + retval, list->event + list->tail,
- sizeof(TS_EVENT)))
+ if (!list->tsdev->exist)
+ return -ENODEV;
+
+ while (list->head != list->tail && retval + sizeof(TS_EVENT) <= count) {
+ if (copy_to_user (buffer + retval, list->event + list->tail, sizeof(TS_EVENT)))
return -EFAULT;
list->tail = (list->tail + 1) & (TSDEV_BUFFER_SIZE - 1);
retval += sizeof(TS_EVENT);
}
+
return retval;
}

@@ -232,54 +209,35 @@
unsigned int code, int value)
{
struct tsdev *tsdev = handle->private;
- struct tsdev_list *list = tsdev->list;
+ struct tsdev_list *list;
struct timeval time;
int size;

- while (list) {
+ list_for_each_entry(list, &tsdev->list, node) {
switch (type) {
case EV_ABS:
switch (code) {
case ABS_X:
if (!list->pendown)
return;
-
- size =
- handle->dev->absmax[ABS_X] -
- handle->dev->absmin[ABS_X];
+ size = handle->dev->absmax[ABS_X] - handle->dev->absmin[ABS_X];
if (size > 0)
- list->oldx =
- ((value -
- handle->dev->absmin[ABS_X]) *
- xres / size);
+ list->oldx = ((value - handle->dev->absmin[ABS_X]) * xres / size);
else
- list->oldx =
- ((value -
- handle->dev->absmin[ABS_X]));
+ list->oldx = ((value - handle->dev->absmin[ABS_X]));
break;
case ABS_Y:
if (!list->pendown)
return;
-
- size =
- handle->dev->absmax[ABS_Y] -
- handle->dev->absmin[ABS_Y];
+ size = handle->dev->absmax[ABS_Y] - handle->dev->absmin[ABS_Y];
if (size > 0)
- list->oldy =
- ((value -
- handle->dev->absmin[ABS_Y]) *
- yres / size);
+ list->oldy = ((value - handle->dev->absmin[ABS_Y]) * yres / size);
else
- list->oldy =
- ((value -
- handle->dev->absmin[ABS_Y]));
+ list->oldy = ((value - handle->dev->absmin[ABS_Y]));
break;
case ABS_PRESSURE:
- list->pendown =
- ((value >
- handle->dev->
- absmin[ABS_PRESSURE])) ? value -
- handle->dev->absmin[ABS_PRESSURE] : 0;
+ list->pendown = ((value > handle->dev-> absmin[ABS_PRESSURE])) ?
+ value - handle->dev->absmin[ABS_PRESSURE] : 0;
break;
}
break;
@@ -289,7 +247,6 @@
case REL_X:
if (!list->pendown)
return;
-
list->oldx += value;
if (list->oldx < 0)
list->oldx = 0;
@@ -299,7 +256,6 @@
case REL_Y:
if (!list->pendown)
return;
-
list->oldy += value;
if (list->oldy < 0)
list->oldy = 0;
@@ -333,7 +289,6 @@
list->event[list->head].y = list->oldy;
list->head = (list->head + 1) & (TSDEV_BUFFER_SIZE - 1);
kill_fasync(&list->fasync, SIGIO, POLL_IN);
- list = list->next;
}
wake_up_interruptible(&tsdev->wait);
}
@@ -356,21 +311,23 @@
if (!(tsdev = kmalloc(sizeof(struct tsdev), GFP_KERNEL)))
return NULL;
memset(tsdev, 0, sizeof(struct tsdev));
+
+ INIT_LIST_HEAD(&tsdev->list);
init_waitqueue_head(&tsdev->wait);

- tsdev->minor = minor;
- tsdev_table[minor] = tsdev;
sprintf(tsdev->name, "ts%d", minor);

+ tsdev->exist = 1;
+ tsdev->minor = minor;
tsdev->handle.dev = dev;
tsdev->handle.name = tsdev->name;
tsdev->handle.handler = handler;
tsdev->handle.private = tsdev;

+ tsdev_table[minor] = tsdev;
tsdev->devfs =
input_register_minor("ts%d", minor, TSDEV_MINOR_BASE);

- tsdev->exist = 1;

return &tsdev->handle;
}

===================================================================

This BitKeeper patch contains the following changesets:
1.573.1.42
## Wrapped with gzip_uu ##

begin 664 bkpatch18154
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
/7:$\1U7_#RDC9GTK*```
`
end

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 9 Oct 2002 00:03, Vojtech Pavlik wrote:
> You can import this changeset into BK by piping this whole message to:
> '| bk receive [path to repository]' or apply the patch as usual.
> 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.
>
> ===================================================================
>
> [email protected], 2002-10-08 12:51:35+02:00, [email protected]
> Initialize struct input_dev in input drivers before it's passed to
> input_event(). input_register_device() usually does that, but some drivers
> will call input_event() before registering to pre-load the absolute values
> in struct input_dev in an easy way.
Is this the change we discussed? Every input driver should now
init_input_dev(), irrespective of whether it does input_event() before
registering?

Brad

- --
http://linux.conf.au. 22-25Jan2003. Perth, Aust. I'm registered. Are you?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9o27qW6pHgIdAuOMRAkbUAJ0QRHYO+wEERp1wGVdZOE/0QAzLYQCfVYzF
Kirm1iSdUtdempJu1Kh+fVw=
=cmnq
-----END PGP SIGNATURE-----

2002-10-09 00:08:08

by Paul Mackerras

[permalink] [raw]

Subject: Re: [patch] Input - Make sure input_dev is initialized where needed [23/23]

Vojtech,

> You can import this changeset into BK by piping this whole message to:
> '| bk receive [path to repository]' or apply the patch as usual.
> 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

It's nice that we get to see the patch, but what would be really nice
is to see the changeset comments that go along with it, which
hopefully explain in a few lines what is being changed and why. No
doubt the changeset comments are in the gzip_uu part, but that is a
bit opaque.

Thanks,
Paul.

2002-10-09 09:26:39

by Pavel Machek

[permalink] [raw]

Subject: Re: [patch] Input - Support for PS/2 Multiplexing spec [4/23]

Hi!

PS/2 multiplexing spec? What is that beast? Something allowing
notebook to work with external and internal mouse?
Pavel

--
I'm [email protected]. "In my country we have almost anarchy and I don't care."
Panos Katsaloulis describing me w.r.t. patents at [email protected]

2002-10-09 09:40:08

by Vojtech Pavlik

[permalink] [raw]

Subject: Re: [patch] Input - Support for PS/2 Multiplexing spec [4/23]

On Tue, Oct 08, 2002 at 11:59:37PM +0200, Pavel Machek wrote:

> PS/2 multiplexing spec? What is that beast? Something allowing
> notebook to work with external and internal mouse?

Exactly. It's a spec that if supported by your notebook allows the
driver to recognize which attached mouse/touchpad/touchpoint/whatever
the data is coming from and thus can talk different protocols to each of
the devices.

--
Vojtech Pavlik
SuSE Labs