[OpenBIOS] r820 - cpu/x86/pc/olpc

[svn at openbios.org]

Author: wmb
Date: 2008-03-10 18:39:13 +0100 (Mon, 10 Mar 2008)
New Revision: 820

Modified:
   cpu/x86/pc/olpc/parsekbd0.py
Log:
OLPC parsekbd0 - fixed a bug in one of the keyboard table parsers.
It was claiming to replace a key entry with a better choice, but
not actually doing it.  Test case: python parsekbd0.py OLPC_Thailand_Keyboard
resulted in a keymap that used the wrong stations for - and / .


Modified: cpu/x86/pc/olpc/parsekbd0.py
===================================================================
--- cpu/x86/pc/olpc/parsekbd0.py	2008-03-06 16:29:11 UTC (rev 819)
+++ cpu/x86/pc/olpc/parsekbd0.py	2008-03-10 17:39:13 UTC (rev 820)
@@ -103,6 +103,8 @@
                 if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)):
                         if modifier < modifiers[ascii]:
                                 print "Replacing", chr(ascii), "at keyid", keys[ascii], "modifier", modifiers[ascii], "with keyid", keyid, "modifier", modifier
+                                modifiers[ascii] = modifier
+                                keys[ascii] = keyid
                         else:
                                 print "Discarding", chr(ascii), "at keyid", keyid, "modifier", modifier, "because keyid", keys[ascii], "modifier", modifiers[ascii], "is better"
                         return