Ticket #5163: modifiers_check.patch

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

@@ -33 +33 @@
 }
 
 
+static uint16
+check_for_modifiers(void)
+{
+    bios_regs regs;
+    regs.eax = 0x0200;
+    call_bios(0x16, &regs);
+
+    return regs.eax & 0xffff;
+}
+
+
 extern "C" void
 clear_key_buffer(void)
 {
@@ -54 +65 @@
     return key;
 }
 
+#define RIGHT_SHIFT 1
+#define LEFT_SHIFT 1
+#define CTRL 4
+#define ALT 8
 
 extern "C" uint32
 check_for_boot_keys(void)
 {
     union key key;
     uint32 options = 0;
+    uint32 modifiers = check_for_modifiers();
+    
+    if (modifiers & (CTRL | ALT))
+        options |= BOOT_OPTION_MENU;
 
+    if (modifiers & (LEFT_SHIFT | RIGHT_SHIFT))
+        options |= BOOT_OPTION_DEBUG_OUTPUT;
+    
+#if 0   
+    // wait a bit to give the user the opportunity to press a key
+    spin(750000);
+
     while ((key.ax = check_for_key()) != 0) {
         switch (key.code.ascii) {
             case ' ':
@@ -75 +101 @@
                 break;
         }
     }
-
+#endif
     dprintf("options = %ld\n", options);
     return 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();