Changeset 40236 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Feb 23, 2012 4:08:49 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76445

Message:

BIOS: Do not let fake shift keys modify shift flags.

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS-new/keyboard.c (modified) (3 diffs)
• BIOS/rombios.c (modified) (2 diffs)

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

@@ -346 +346 @@
 {
     uint8_t scancode, asciicode, shift_flags;
-    uint8_t mf2_flags, mf2_state;
+    uint8_t mf2_flags, mf2_state, flag;
     
     //
@@ -377 +377 @@
         write_byte(0x0040, 0x18, mf2_flags);
         break;
-    
+
     case 0x2a: /* L Shift press */
-        shift_flags |= 0x02;
-        write_byte(0x0040, 0x17, shift_flags);
-        break;
     case 0xaa: /* L Shift release */
-        shift_flags &= ~0x02;
-        write_byte(0x0040, 0x17, shift_flags);
-        break;
-    
     case 0x36: /* R Shift press */
-        shift_flags |= 0x01;
-        write_byte(0x0040, 0x17, shift_flags);
-        break;
     case 0xb6: /* R Shift release */
-        shift_flags &= ~0x01;
-        write_byte(0x0040, 0x17, shift_flags);
-        break;
-    
+        /* If this was an extended (i.e. faked) key, leave flags alone. */
+        if (!(mf2_state & 0x02)) {
+            flag = (scancode & 0x7f) == 0x2a ? 0x02 : 0x01;
+            if (scancode & 0x80)
+                shift_flags &= ~flag;
+            else
+                shift_flags |= flag;
+            write_byte(0x0040, 0x17, shift_flags);
+        }
+        break;
+
     case 0x1d: /* Ctrl press */
         if ((mf2_state & 0x01) == 0) {
@@ -551 +548 @@
         *ascii_code = acode;
         *scan_code  = scode;
-        
+        BX_DEBUG_INT16("dequeue_key: ascii=%02x scan=%02x \n", acode, scode);
+
         if (incr) {
             buffer_head += 2;

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

@@ -5235 +5235 @@
 {
   Bit8u scancode, asciicode, shift_flags;
-  Bit8u mf2_flags, mf2_state;
+  Bit8u mf2_flags, mf2_state, flag;
 
   //
@@ -5268 +5268 @@
 
     case 0x2a: /* L Shift press */
-      shift_flags |= 0x02;
-      write_byte(0x0040, 0x17, shift_flags);
-      break;
     case 0xaa: /* L Shift release */
-      shift_flags &= ~0x02;
-      write_byte(0x0040, 0x17, shift_flags);
-      break;
-
     case 0x36: /* R Shift press */
-      shift_flags |= 0x01;
-      write_byte(0x0040, 0x17, shift_flags);
-      break;
     case 0xb6: /* R Shift release */
-      shift_flags &= ~0x01;
-      write_byte(0x0040, 0x17, shift_flags);
+      /* If this was an extended (i.e. faked) key, leave flags alone. */
+      if (!(mf2_state & 0x02)) {
+        flag = (scancode & 0x7f) == 0x2a ? 0x02 : 0x01;
+        if (scancode & 0x80)
+          shift_flags &= ~flag;
+        else
+          shift_flags |= flag;
+        write_byte(0x0040, 0x17, shift_flags);
+      }
       break;