Ticket #5163: boot_keys.patch

src/system/boot/platform/bios_ia32/keyboard.cpp

@@ -58 +58 @@
 extern "C" uint32
 check_for_boot_keys(void)
 {
-    union key key;
     uint32 options = 0;
-
-    while ((key.ax = check_for_key()) != 0) {
-        switch (key.code.ascii) {
-            case ' ':
-                options |= BOOT_OPTION_MENU;
-                break;
-            case 0x1b:  // escape
-                options |= BOOT_OPTION_DEBUG_OUTPUT;
-                break;
-            case 0:
-                // evaluate BIOS scan codes
-                // ...
-                break;
-        }
+    bios_regs regs;
+    regs.eax = 0x0200;
+    call_bios(0x16, &regs);
+        // Read Keyboard flags
+        // bit 7 Insert, bit 6 CapsLock, bit 5 NumLock, bit 4 Scroll Lock
+    if( (regs.eax & 0x40) != 0 ) {
+            // CapsLock - option menu
+        options |= BOOT_OPTION_MENU;
+    } else if( (regs.eax & 0x10) != 0 ) {
+            // Scroll Lock - debug output
+        options |= BOOT_OPTION_DEBUG_OUTPUT;
     }
 
     dprintf("options = %ld\n", options);

src/system/boot/platform/bios_ia32/start.c

@@ -129 +129 @@
     mmu_init();
     parse_multiboot_commandline(&args);
 
-    // wait a bit to give the user the opportunity to press a key
-    spin(750000);
-
     // reading the keyboard doesn't seem to work in graphics mode
     // (maybe a bochs problem)
     sBootOptions = check_for_boot_keys();