[PATCH] more keyboard stuff

[PATCH] more keyboard stuff

[Andries.Brouwer]

I looked a bit more at the keyboard code and find a bug
and a probable bug.

(i) In case a synaptics touchpad has been detected, the comment
says "disable AUX". But we do not set the disable bit, but
instead .and. with the bit - no doubt getting zero.
This must be a bug.

(ii) Directly above this is the suspicious comment
"keyboard translation seems to be always off".
But every machine comes always up in translated scancode 2.
Translation is never off. But wait! by mistake the above .and.
cleared the XLATE bit.

So, I think bug (i) explains mystery (ii).

However, note that this is code reading only.
I do not have the hardware, so cannot test.

Andries

[line numbers will be off]


diff -u --recursive --new-file -X /linux/dontdiff a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
--- a/drivers/input/serio/i8042.c	Sat Aug  9 22:16:42 2003
+++ b/drivers/input/serio/i8042.c	Sat Sep  6 02:05:34 2003
@@ -618,16 +619,10 @@
 		(~param >> 4) & 0xf, ~param & 0xf);
 
 /*
- * In MUX mode the keyboard translation seems to be always off.
- */
- 
-	i8042_direct = 1;
-
-/*
  * Disable all muxed ports by disabling AUX.
  */
 
-	i8042_ctr &= I8042_CTR_AUXDIS;
+	i8042_ctr |= I8042_CTR_AUXDIS;
 	i8042_ctr &= ~I8042_CTR_AUXINT;
 
 	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))

Re: [PATCH] more keyboard stuff

[Vojtech Pavlik]

On Sat, Sep 06, 2003 at 01:22:44AM +0200, Andries.Brouwer@cwi.nl wrote:
> I looked a bit more at the keyboard code and find a bug
> and a probable bug.
> 
> (i) In case a synaptics touchpad has been detected, the comment
> says "disable AUX". But we do not set the disable bit, but
> instead .and. with the bit - no doubt getting zero.
> This must be a bug.
> 
> (ii) Directly above this is the suspicious comment
> "keyboard translation seems to be always off".
> But every machine comes always up in translated scancode 2.
> Translation is never off. But wait! by mistake the above .and.
> cleared the XLATE bit.
> 
> So, I think bug (i) explains mystery (ii).
> 
> However, note that this is code reading only.
> I do not have the hardware, so cannot test.
> 
> Andries
> 
> [line numbers will be off]

Thanks for spotting this. 

> diff -u --recursive --new-file -X /linux/dontdiff a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
> --- a/drivers/input/serio/i8042.c	Sat Aug  9 22:16:42 2003
> +++ b/drivers/input/serio/i8042.c	Sat Sep  6 02:05:34 2003
> @@ -618,16 +619,10 @@
>  		(~param >> 4) & 0xf, ~param & 0xf);
>  
>  /*
> - * In MUX mode the keyboard translation seems to be always off.
> - */
> - 
> -	i8042_direct = 1;
> -
> -/*
>   * Disable all muxed ports by disabling AUX.
>   */
>  
> -	i8042_ctr &= I8042_CTR_AUXDIS;
> +	i8042_ctr |= I8042_CTR_AUXDIS;
>  	i8042_ctr &= ~I8042_CTR_AUXINT;
>  
>  	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR