Re: Fwd: Patch for initial CapsLock

[Vojtech Pavlik]

On Tue, Jan 07, 2003 at 05:07:46PM -0500, Pete Zaitcev wrote:
> > > Do you want me to do the same for 2.5? It should be a little
> > > simpler there, and no new exports.
> > 
> > Yes, please.
> 
> Done, works for me.
> 
> I toyed with the idea to trigger keyboard tasklet instead of
> locking it out and calling methods, but I did not see how
> to force updates for unchanged ledstate. Changing ledstate to 0xff
> just looked so very wrong...

Thanks, this looks very good.

> 
> -- Pete
> 
> --- linux-2.5.54/drivers/char/keyboard.c	2002-12-15 18:07:54.000000000 -0800
> +++ linux-2.5.54-p3/drivers/char/keyboard.c	2003-01-07 13:55:25.000000000 -0800
> @@ -894,9 +894,9 @@
>   * Aside from timing (which isn't really that important for
>   * keyboard interrupts as they happen often), using the software
>   * interrupt routines for this thing allows us to easily mask
> - * this when we don't want any of the above to happen. Not yet
> - * used, but this allows for easy and efficient race-condition
> - * prevention later on.
> + * this when we don't want any of the above to happen.
> + * This allows for easy and efficient race-condition prevention
> + * for kbd_refresh_leds => input_event(dev, EV_LED, ...) => ...
>   */
>  
>  static void kbd_bh(unsigned long dummy)
> @@ -918,6 +918,22 @@
>  
>  DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0);
>  
> +/*
> + * This allows a newly plugged keyboard to pick the LED state.
> + */
> +void kbd_refresh_leds(struct input_handle *handle)
> +{
> +	unsigned char leds = ledstate;
> +
> +	tasklet_disable(&keyboard_tasklet);
> +	if (leds != 0xff) {
> +		input_event(handle->dev, EV_LED, LED_SCROLLL, !!(leds & 0x01));
> +		input_event(handle->dev, EV_LED, LED_NUML,    !!(leds & 0x02));
> +		input_event(handle->dev, EV_LED, LED_CAPSL,   !!(leds & 0x04));
> +	}
> +	tasklet_enable(&keyboard_tasklet);
> +}
> +
>  #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)
>  
>  static unsigned short x86_keycodes[256] =
> @@ -1159,6 +1175,7 @@
>  	handle->name = kbd_name;
>  
>  	input_open_device(handle);
> +	kbd_refresh_leds(handle);
>  
>  	return handle;
>  }

-- 
Vojtech Pavlik
SuSE Labs