Changeset 24396 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 4:09:32 PM (15 years ago)

Author:

vboxsync

Message:

DevPS2: Added qemu code to emulate turning off scancode translation in controller (S8 keyboard fix); from ​http://git.savannah.gnu.org/cgit/qemu.git/tree/hw/ps2.c#n502

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -103 +103 @@
 #define KBD_CMD_SET_LEDS        0xED    /* Set keyboard leds */
 #define KBD_CMD_ECHO            0xEE
+#define KBD_CMD_SCANCODE        0xF0    /* Get/set scancode set */
 #define KBD_CMD_GET_ID          0xF2    /* get keyboard ID */
 #define KBD_CMD_SET_RATE        0xF3    /* Set typematic rate */
@@ -193 +194 @@
     int32_t kbd_write_cmd;
     int32_t scan_enabled;
+    int32_t translate;
+    int32_t scancode_set;   /* 1=XT, 2=AT, 3=PS/2 */
     /* mouse state */
     int32_t mouse_write_cmd;
@@ -249 +252 @@
 } KBDState;
 
+/* Table to convert from PC scancodes to raw scancodes.  */
+static const unsigned char ps2_raw_keycode[128] = {
+      0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
+     21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
+     35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
+     50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88,  5,  6,  4, 12,  3,
+     11,  2, 10,  1,  9,119,126,108,117,125,123,107,115,116,121,105,
+    114,122,112,113,127, 96, 97,120,  7, 15, 23, 31, 39, 47, 55, 63,
+     71, 79, 86, 94,  8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
+     19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
+};
+
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
@@ -332 +347 @@
 {
     KBDState *s = (KBDState*)opaque;
+
+    /* XXX: add support for scancode sets 1 and 3 */
+    if (!s->translate && keycode < 0xe0 && s->scancode_set == 2)
+    {
+        if (keycode & 0x80)
+           kbd_queue(s, 0xf0, 0);
+        keycode = ps2_raw_keycode[keycode & 0x7f];
+    }
     kbd_queue(s, keycode, 0);
 }
@@ -520 +543 @@
 {
     s->scan_enabled = 1;
+    s->scancode_set = 2;
 }
 
@@ -546 +570 @@
             kbd_queue(s, KBD_REPLY_ACK, 0);
             break;
+        case KBD_CMD_SCANCODE:
         case KBD_CMD_SET_LEDS:
         case KBD_CMD_SET_RATE:
@@ -571 +596 @@
         }
         break;
+    case KBD_CMD_SCANCODE:
+#ifdef IN_RING3
+        if (val == 0) {
+            if (s->scancode_set == 1)
+                pc_kbd_put_keycode(s, 0x43);
+            else if (s->scancode_set == 2)
+                pc_kbd_put_keycode(s, 0x41);
+            else if (s->scancode_set == 3)
+                pc_kbd_put_keycode(s, 0x3f);
+        } else {
+            if (val >= 1 && val <= 3) 
+                s->scancode_set = val;
+            kbd_queue(s, KBD_REPLY_ACK, 0);
+        }
+#else
+        return VINF_IOM_HC_IOPORT_WRITE;
+#endif
     case KBD_CMD_SET_LEDS:
         {
@@ -887 +929 @@
     case KBD_CCMD_WRITE_MODE:
         s->mode = val;
+        s->translate = (s->mode & KBD_MODE_KCC) == KBD_MODE_KCC;
         kbd_update_irq(s);
         break;
@@ -938 +981 @@
     s->write_cmd = 0;
     s->scan_enabled = 0;
+    s->translate = 0;
+    s->scancode_set = 2;
     s->mouse_status = 0;
     s->mouse_resolution = 0;
@@ -989 +1034 @@
     qemu_put_8s(f, &s->mouse_buttons);
 
+    /* XXX: s->scancode_set isn't being saved, but we only really support set 2,
+     * so no real harm done.
+     */
+
     /*
      * We have to save the queues too.
@@ -1052 +1101 @@
     s->mouse_event_queue.rptr = 0;
     s->mouse_event_queue.wptr = 0;
+
+    /* Determine the translation state. */
+    s->translate = (s->mode & KBD_MODE_KCC) == KBD_MODE_KCC;
+    s->scancode_set = 2;    /* XXX: See comment in kbd_save(). */
 
     /*