Messages in this thread Patch in this message | | | Date | Mon, 1 Sep 2003 00:40:40 -0400 | Subject | Re: [PATCH][RESEND] Force mouse detection as imps/2 (and fix my KVM switch) | From | <> |
| |
On Sun, Aug 31, 2003 at 12:14:32PM -0700, Andrew Morton wrote: > <jhf@rivenstone.net> wrote: > > > > This patch is against -test4; it applies to -test4-mm4 with > > offsets (I'm running -mm4). More than half the length of the patch is > > indentation. Is there a possibility of getting this applied? > > Please resend as an attachment. I was unable to de-mime it.
Okay, I'm attaching a slightly changed patch that puts things back in the roughly alphabetical order I found them in. It compiles and tests okay.
-- Joseph Fannin jhf@rivenstone.net
"Bull in pure form is rare; there is usually some contamination by data." -- William Graves Perry Jr. diff -urN linux-2.6.0-test4/Documentation/kernel-parameters.txt linux-2.6.0-test4_changed/Documentation/kernel-parameters.txt --- linux-2.6.0-test4/Documentation/kernel-parameters.txt 2003-08-31 08:08:00.000000000 -0400 +++ linux-2.6.0-test4_changed/Documentation/kernel-parameters.txt 2003-09-01 00:17:53.000000000 -0400 @@ -783,6 +783,8 @@ before loading. See Documentation/ramdisk.txt. + psmouse_imps2 [HW,MOUSE] Probe only for Intellimouse PS2 mouse protocol extensions + psmouse_noext [HW,MOUSE] Disable probing for PS2 mouse protocol extensions pss= [HW,OSS] Personal Sound System (ECHO ESC614) diff -urN linux-2.6.0-test4/drivers/input/mouse/psmouse-base.c linux-2.6.0-test4_changed/drivers/input/mouse/psmouse-base.c --- linux-2.6.0-test4/drivers/input/mouse/psmouse-base.c 2003-07-27 12:58:51.000000000 -0400 +++ linux-2.6.0-test4_changed/drivers/input/mouse/psmouse-base.c 2003-09-01 00:17:25.000000000 -0400 @@ -23,6 +23,8 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); MODULE_DESCRIPTION("PS/2 mouse driver"); +MODULE_PARM(psmouse_imps2, "1i"); +MODULE_PARM_DESC(psmouse_imps2, "Limit protocol extensions to the Intellimouse protocol."); MODULE_PARM(psmouse_noext, "1i"); MODULE_PARM_DESC(psmouse_noext, "Disable any protocol extensions. Useful for KVM switches."); MODULE_PARM(psmouse_resolution, "i"); @@ -33,6 +35,7 @@ #define PSMOUSE_LOGITECH_SMARTSCROLL 1 +static int psmouse_imps2; static int psmouse_noext; int psmouse_resolution; int psmouse_smartscroll = PSMOUSE_LOGITECH_SMARTSCROLL; @@ -250,66 +253,68 @@ if (psmouse_noext) return PSMOUSE_PS2; -/* - * Try Synaptics TouchPad magic ID - */ - - param[0] = 0; - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); + if (!psmouse_imps2) { - if (param[1] == 0x47) { - psmouse->vendor = "Synaptics"; - psmouse->name = "TouchPad"; - if (!synaptics_init(psmouse)) - return PSMOUSE_SYNAPTICS; - else - return PSMOUSE_PS2; - } + /* + * Try Synaptics TouchPad magic ID + */ -/* - * Try Genius NetMouse magic init. - */ + param[0] = 0; + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); + + if (param[1] == 0x47) { + psmouse->vendor = "Synaptics"; + psmouse->name = "TouchPad"; + if (!synaptics_init(psmouse)) + return PSMOUSE_SYNAPTICS; + else + return PSMOUSE_PS2; + } - param[0] = 3; - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); + /* + * Try Genius NetMouse magic init. + */ - if (param[0] == 0x00 && param[1] == 0x33 && param[2] == 0x55) { + param[0] = 3; + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); - set_bit(BTN_EXTRA, psmouse->dev.keybit); - set_bit(BTN_SIDE, psmouse->dev.keybit); - set_bit(REL_WHEEL, psmouse->dev.relbit); + if (param[0] == 0x00 && param[1] == 0x33 && param[2] == 0x55) { - psmouse->vendor = "Genius"; - psmouse->name = "Wheel Mouse"; - return PSMOUSE_GENPS; - } + set_bit(BTN_EXTRA, psmouse->dev.keybit); + set_bit(BTN_SIDE, psmouse->dev.keybit); + set_bit(REL_WHEEL, psmouse->dev.relbit); -/* - * Try Logitech magic ID. - */ + psmouse->vendor = "Genius"; + psmouse->name = "Wheel Mouse"; + return PSMOUSE_GENPS; + } - param[0] = 0; - psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); - param[1] = 0; - psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); + /* + * Try Logitech magic ID. + */ - if (param[1]) { - int type = ps2pp_detect_model(psmouse, param); - if (type) - return type; + param[0] = 0; + psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + psmouse_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11); + param[1] = 0; + psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO); + + if (param[1]) { + int type = ps2pp_detect_model(psmouse, param); + if (type) + return type; + } } - /* * Try IntelliMouse magic init. */ @@ -549,6 +554,12 @@ }; #ifndef MODULE +static int __init psmouse_imps2_setup(char *str) +{ + psmouse_imps2 = 1; + return 1; +} + static int __init psmouse_noext_setup(char *str) { psmouse_noext = 1; @@ -567,6 +578,7 @@ return 1; } +__setup("psmouse_imps2", psmouse_imps2_setup); __setup("psmouse_noext", psmouse_noext_setup); __setup("psmouse_resolution=", psmouse_resolution_setup); __setup("psmouse_smartscroll=", psmouse_smartscroll_setup);[unhandled content-type:application/pgp-signature] | |