Changeset 39946 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2012 11:17:06 PM (13 years ago)

Author:

vboxsync

Message:

Avoid keyboard BIOS read ID race.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS-new/keyboard.c (modified) (1 diff)
• BIOS/rombios.c (modified) (1 diff)

trunk/src/VBox/Devices/PC/BIOS-new/keyboard.c

@@ -660 +660 @@
         count = 2;
         kbd_code = 0x0;
+        //@todo: Might be better to just mask the KB interrupt
+        int_disable();
         outb(0x60, 0xf2);
         /* Wait for data */
         max=0xffff;
-        while ( ((inb(0x64) & 0x01) == 0) && (--max>0) ) outb(0x80, 0x00);
+        while ( ((inb(0x64) & 0x01) == 0) && (--max>0) )
+            inb(0x80);
         if (max>0x0) {
             if ((inb(0x60) == 0xfa)) {
                 do {
                     max=0xffff;
-                    while ( ((inb(0x64) & 0x01) == 0) && (--max>0) ) outb(0x80, 0x00);
+                    while ( ((inb(0x64) & 0x01) == 0) && (--max>0) )
+                        inb(0x80);
                     if (max>0x0) {
                         kbd_code >>= 8;

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -5077 +5077 @@
       count = 2;
       kbd_code = 0x0;
+ASM_START
+      cli // avoid racing the interrupt handler
+ASM_END
       outb(0x60, 0xf2);
       /* Wait for data */