Ticket #2918: kbd.1.diff

src/system/kernel/arch/x86/arch_debug_console.c

@@ -104 +104 @@
  *  again if anything else requests the interrupt 1.
  */
 
+bool tmp = false;
+
 static int32
 debug_keyboard_interrupt(void *data)
 {
@@ -111 +113 @@
     static bool altPressed;
     uint8 key;
 
+    if (tmp) {
+        ktrace_printf("KS!\n");
+        return B_HANDLED_INTERRUPT;
+    }
+
     key = in8(PS2_PORT_DATA);
     //dprintf("debug_keyboard_interrupt: key = 0x%x\n", key);
 
+    ktrace_printf("KSi\n");
+
     if (key & 0x80) {
         if (key == LEFT_CONTROL)
             controlPressed = false;
@@ -188 +197 @@
     static uint8 special = 0;
     static uint8 special2 = 0;
     uint8 key = 0;
+    tmp=true;
+    ktrace_printf("KSa\n");
 
     if (special & 0x80) {
         special &= ~0x80;
-        return '[';
+        ktrace_printf("KSb\n");
+        tmp=false;return '[';
     }
     if (special != 0) {
         key = special;
         special = 0;
-        return key;
+        ktrace_printf("KSc\n");
+        tmp=false;return key;
     }
     if (special2 != 0) {
         key = special2;
         special2 = 0;
-        return key;
+        ktrace_printf("KSd\n");
+        tmp=false;return key;
     }
 
     while (true) {
@@ -220 +234 @@
             // we read mouse data, ignore it
             continue;
         }
+        ktrace_printf("KSe\n");
 
         if (key & 0x80) {
             // key up
@@ -254 +269 @@
                 // start escape sequence for cursor movement
                 case CURSOR_UP:
                     special = 0x80 | 'A';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case CURSOR_DOWN:
                     special = 0x80 | 'B';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case CURSOR_RIGHT:
                     special = 0x80 | 'C';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case CURSOR_LEFT:
                     special = 0x80 | 'D';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case CURSOR_HOME:
                     special = 0x80 | 'H';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case CURSOR_END:
                     special = 0x80 | 'F';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case PAGE_UP:
                     special = 0x80 | '5';
                     special2 = '~';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
                 case PAGE_DOWN:
                     special = 0x80 | '6';
                     special2 = '~';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
 
 
                 case DELETE:
@@ -286 +301 @@
 
                     special = 0x80 | '3';
                     special2 = '~';
-                    return '\x1b';
+                    tmp=false;return '\x1b';
 
                 default:
                     if (controlPressed) {
                         char c = kShiftedKeymap[key];
                         if (c >= 'A' && c <= 'Z')
-                            return 0x1f & c;
+                            tmp=false;return 0x1f & c;
                     }
 
                     if (altPressed)
-                        return kAltedKeymap[key];
+                        tmp=false;return kAltedKeymap[key];
 
-                    return shiftPressed
+                    tmp=false;return shiftPressed
                         ? kShiftedKeymap[key] : kUnshiftedKeymap[key];
             }
         }