[haiku-commits] r35441 - haiku/trunk/src/system/boot/platform/bios_ia32
- From: stefano.ceccherini@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 9 Feb 2010 20:47:23 +0100 (CET)
Author: jackburton
Date: 2010-02-09 20:47:23 +0100 (Tue, 09 Feb 2010)
New Revision: 35441
Changeset: http://dev.haiku-os.org/changeset/35441/haiku
Ticket: http://dev.haiku-os.org/ticket/5341
Modified:
haiku/trunk/src/system/boot/platform/bios_ia32/bios.S
Log:
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!
Modified: haiku/trunk/src/system/boot/platform/bios_ia32/bios.S
===================================================================
--- haiku/trunk/src/system/boot/platform/bios_ia32/bios.S 2010-02-09
14:10:07 UTC (rev 35440)
+++ haiku/trunk/src/system/boot/platform/bios_ia32/bios.S 2010-02-09
19:47:23 UTC (rev 35441)
@@ -237,7 +237,7 @@
/** 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 @@
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
Other related posts:
- » [haiku-commits] r35441 - haiku/trunk/src/system/boot/platform/bios_ia32 - stefano . ceccherini
