diff options
| author | Peter Osterlund <petero2@telia.com> | 2004-01-10 22:13:44 +0100 |
|---|---|---|
| committer | Peter Osterlund <petero2@telia.com> | 2006-04-09 04:01:38 +0200 |
| commit | 6d4ba1df4bb44831cf5e24513b4f749a83350f36 (patch) | |
| tree | 39851c15ef1424b8bd3d37af371a6a665ccc56de /alps.patch | |
| parent | 1879d055d658a6a52fd8f0ebeb38b8a702736892 (diff) | |
Removed deprecated use of psmouse_noext in the alps patch.
This makes the patch work also for recent -mm kernels.
Diffstat (limited to 'alps.patch')
| -rw-r--r-- | alps.patch | 33 |
1 files changed, 17 insertions, 16 deletions
@@ -53,13 +53,13 @@ initial announcement have not been dealt with: linux-petero/drivers/input/mouse/Makefile | 2 linux-petero/drivers/input/mouse/alps.c | 140 ++++++++++++++++++++++++ linux-petero/drivers/input/mouse/alps.h | 17 ++ - linux-petero/drivers/input/mouse/psmouse-base.c | 7 + + linux-petero/drivers/input/mouse/psmouse-base.c | 8 + linux-petero/drivers/input/mouse/psmouse.h | 1 - 5 files changed, 166 insertions(+), 1 deletion(-) + 5 files changed, 167 insertions(+), 1 deletion(-) diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile ---- linux/drivers/input/mouse/Makefile~alps 2003-11-30 13:43:39.000000000 +0100 -+++ linux-petero/drivers/input/mouse/Makefile 2003-12-16 20:17:12.000000000 +0100 +--- linux/drivers/input/mouse/Makefile~alps 2004-01-10 21:39:13.000000000 +0100 ++++ linux-petero/drivers/input/mouse/Makefile 2004-01-10 21:39:13.000000000 +0100 @@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_PC9800) += 98busmouse obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o @@ -67,8 +67,8 @@ diff -puN drivers/input/mouse/Makefile~alps drivers/input/mouse/Makefile -psmouse-objs := psmouse-base.o logips2pp.o synaptics.o +psmouse-objs := psmouse-base.o logips2pp.o alps.o synaptics.o diff -puN drivers/input/mouse/alps.c~alps drivers/input/mouse/alps.c ---- linux/drivers/input/mouse/alps.c~alps 2003-11-30 13:43:39.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.c 2003-12-16 20:20:59.000000000 +0100 +--- linux/drivers/input/mouse/alps.c~alps 2004-01-10 21:39:13.000000000 +0100 ++++ linux-petero/drivers/input/mouse/alps.c 2004-01-10 21:39:13.000000000 +0100 @@ -0,0 +1,140 @@ +/* + * ALPS touchpad PS/2 mouse driver @@ -211,8 +211,8 @@ diff -puN drivers/input/mouse/alps.c~alps drivers/input/mouse/alps.c + return 0; +} diff -puN drivers/input/mouse/alps.h~alps drivers/input/mouse/alps.h ---- linux/drivers/input/mouse/alps.h~alps 2003-11-30 13:43:39.000000000 +0100 -+++ linux-petero/drivers/input/mouse/alps.h 2003-11-30 13:43:39.000000000 +0100 +--- linux/drivers/input/mouse/alps.h~alps 2004-01-10 21:39:13.000000000 +0100 ++++ linux-petero/drivers/input/mouse/alps.h 2004-01-10 21:39:13.000000000 +0100 @@ -0,0 +1,17 @@ +/* + * ALPS touchpad PS/2 mouse driver @@ -232,8 +232,8 @@ diff -puN drivers/input/mouse/alps.h~alps drivers/input/mouse/alps.h +int ALPS_process_byte(struct psmouse *psmouse, struct pt_regs *regs); +#endif diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-base.c ---- linux/drivers/input/mouse/psmouse-base.c~alps 2003-11-30 13:43:39.000000000 +0100 -+++ linux-petero/drivers/input/mouse/psmouse-base.c 2003-12-16 20:17:12.000000000 +0100 +--- linux/drivers/input/mouse/psmouse-base.c~alps 2004-01-10 21:39:13.000000000 +0100 ++++ linux-petero/drivers/input/mouse/psmouse-base.c 2004-01-10 22:11:50.000000000 +0100 @@ -21,6 +21,7 @@ #include "psmouse.h" #include "synaptics.h" @@ -242,29 +242,30 @@ diff -puN drivers/input/mouse/psmouse-base.c~alps drivers/input/mouse/psmouse-ba MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); MODULE_DESCRIPTION("PS/2 mouse driver"); -@@ -177,6 +178,9 @@ static irqreturn_t psmouse_interrupt(str +@@ -187,6 +188,10 @@ static irqreturn_t psmouse_interrupt(str goto out; } -+ if (!psmouse_noext && !ALPS_process_byte(psmouse, regs)) ++ if ((psmouse_max_proto > PSMOUSE_PS2) && ++ !ALPS_process_byte(psmouse, regs)) + goto out; + if (psmouse->pktcnt == 3 + (psmouse->type >= PSMOUSE_GENPS)) { psmouse_process_packet(psmouse, regs); psmouse->pktcnt = 0; -@@ -479,6 +483,9 @@ static void psmouse_initialize(struct ps +@@ -498,6 +503,9 @@ static void psmouse_initialize(struct ps */ psmouse_command(psmouse, param, PSMOUSE_CMD_SETSTREAM); + -+ if (!psmouse_noext) ++ if (psmouse_max_proto > PSMOUSE_PS2) + ALPS_initialize(psmouse); } /* diff -puN drivers/input/mouse/psmouse.h~alps drivers/input/mouse/psmouse.h ---- linux/drivers/input/mouse/psmouse.h~alps 2003-11-30 13:43:39.000000000 +0100 -+++ linux-petero/drivers/input/mouse/psmouse.h 2003-12-16 20:17:12.000000000 +0100 +--- linux/drivers/input/mouse/psmouse.h~alps 2004-01-10 21:39:13.000000000 +0100 ++++ linux-petero/drivers/input/mouse/psmouse.h 2004-01-10 21:39:13.000000000 +0100 @@ -9,6 +9,7 @@ #define PSMOUSE_CMD_GETID 0x02f2 #define PSMOUSE_CMD_SETRATE 0x10f3 |