Re: [PATCH] PS/2 mouse rate setting

[Vojtech Pavlik <vojtech@suse.cz>]

On Mon, Oct 27, 2003 at 08:29:50PM +0100, Andi Kleen wrote:

> jOn Mon, Oct 27, 2003 at 10:56:16AM -0800, Linus Torvalds wrote:
> > 
> > Which makes no sense.
> 
> Ok new patch with this fixed.

Thanks, this one is good.

> 
> ---------------------------
> 
> Only set PS/2 mouse rate when the user specified a value.
> 
> Allow specifying it from the command line when the driver is compiled in.
> 
> Make rates[] static.
> 
> diff -u linux-2.6.0test9-averell/drivers/input/mouse/psmouse-base.c-o linux-2.6.0test9-averell/drivers/input/mouse/psmouse-base.c
> --- linux-2.6.0test9-averell/drivers/input/mouse/psmouse-base.c-o	2003-09-28 10:53:17.000000000 +0200
> +++ linux-2.6.0test9-averell/drivers/input/mouse/psmouse-base.c	2003-10-27 20:16:25.000000000 +0100
> @@ -40,7 +40,7 @@
>  
>  static int psmouse_noext;
>  int psmouse_resolution;
> -unsigned int psmouse_rate = 60;
> +unsigned int psmouse_rate = 0;
>  int psmouse_smartscroll = PSMOUSE_LOGITECH_SMARTSCROLL;
>  unsigned int psmouse_resetafter;
>  
> @@ -451,9 +451,12 @@
>  
>  static void psmouse_set_rate(struct psmouse *psmouse)
>  {
> -	unsigned char rates[] = { 200, 100, 80, 60, 40, 20, 10, 0 };
> +	static unsigned char rates[] = { 200, 100, 80, 60, 40, 20, 10, 0 };
>  	int i = 0;
>  
> +	if (!psmouse_rate)
> +		return; 
> +
>  	while (rates[i] > psmouse_rate) i++;
>  	psmouse_command(psmouse, rates + i, PSMOUSE_CMD_SETRATE);
>  }
> @@ -651,10 +654,17 @@
>  	return 1;
>  }
>  
> +static int __init psmouse_rate_setup(char *str)
> +{
> +	get_option(&str, &psmouse_rate);
> +	return 1;
> +}
> +
>  __setup("psmouse_noext", psmouse_noext_setup);
>  __setup("psmouse_resolution=", psmouse_resolution_setup);
>  __setup("psmouse_smartscroll=", psmouse_smartscroll_setup);
>  __setup("psmouse_resetafter=", psmouse_resetafter_setup);
> +__setup("psmouse_rate=", psmouse_rate_setup);
>  
>  #endif
>  

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR