From 7ae188c379c8b40ded244cd416e767fe279ae45c Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 9 Feb 2010 19:47:23 +0000 Subject: [PATCH] Patch by Grey which fixes "auto-enabling" of the boot loader screen debug which happened on some systems (mine included). Should close ticket #5341. Thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35441 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/bios_ia32/bios.S | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/system/boot/platform/bios_ia32/bios.S b/src/system/boot/platform/bios_ia32/bios.S index 7842062243..41f03765a9 100644 --- a/src/system/boot/platform/bios_ia32/bios.S +++ b/src/system/boot/platform/bios_ia32/bios.S @@ -237,7 +237,7 @@ int_number: /** uint32 search_keyboard_buffer() * Search in keyboard buffer keycodes for F8, F12 or Space - * if not found - search ESC keycode. + * if not found - search ESC keycode at the end of this buffer (2 positions) */ FUNCTION(search_keyboard_buffer) @@ -266,13 +266,12 @@ search_cycle1: cmp $0x440, %si jnz search_cycle1 - movw $0x41E, %si // BIOS kbd buffer -search_cycle2: - lodsw + addw 0x41C, %si + movw -0x42(%si), %ax cmp $0x011B, %ax // test ESC key jz to_ret - cmp $0x440, %si - jnz search_cycle2 + movw -0x44(%si), %ax + cmp $0x011B, %ax // test ESC key to_ret: pop %ds