[Linuxconsole-commit]CVS: ruby/linux/drivers/input/serio i8042.c,1.18,1.19

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/serio
In directory usw-pr-cvs1:/tmp/cvs-serv12494

Modified Files:
	i8042.c 
Log Message:
Better comments for automatic direct mode on some weird hardware.


Index: i8042.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/serio/i8042.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- i8042.c	12 Feb 2002 09:34:34 -0000	1.18
+++ i8042.c	15 Feb 2002 00:25:24 -0000	1.19
@@ -483,17 +483,23 @@
 	}
 
 /*
- * Set nontranslated mode for the kbd interface. This is vital for a working
- * scancode set 2/3 support. After this the kbd interface becomes a simple serial
- * in/out, like the aux interface is. If the user doesn't wish this, the driver
- * tries to untranslate the values after the i8042 translates them.
+ * If the chip is configured into nontranslated mode by the BIOS, don't
+ * bother enabling translating and just use that happily.
  */
 
-	if (i8042_direct)
-		i8042_ctr &= ~I8042_CTR_XLATE;
-
 	if (~i8042_ctr & I8042_CTR_XLATE)
 		i8042_direct = 1;
+
+/*
+ * Set nontranslated mode for the kbd interface if requested by an option.
+ * This is vital for a working scancode set 3 support. After this the kbd
+ * interface becomes a simple serial in/out, like the aux interface is. If
+ * the user doesn't wish this, the driver tries to untranslate the values
+ * after the i8042 translates them.
+ */
+
+	if (i8042_direct)
+		i8042_ctr &= ~I8042_CTR_XLATE;
 
 /*
  * Write CTR back.