From 3c5dad6ef0bce92d8fa9d84adc0013c0f23cf0b8 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 1 Jun 2003 20:41:04 +0000 Subject: [PATCH] Accpet '1'..'5' in place of F1..F5 for serial console users. Reviewed by: Bruce M Simpson --- sys/boot/i386/boot0/boot0.s | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s index 89570ed3e956..eb4ddcc29f52 100644 --- a/sys/boot/i386/boot0/boot0.s +++ b/sys/boot/i386/boot0/boot0.s @@ -32,6 +32,7 @@ .set KEY_ENTER,0x1c # Enter key scan code .set KEY_F1,0x3b # F1 key scan code + .set KEY_1,0x02 # #1 key scan code # # Addresses in the sector of embedded data values. @@ -228,6 +229,9 @@ main.11: xorb %ah,%ah # BIOS: Get # subb $KEY_F1,%al # Less F1 scan code cmpb $0x4,%al # F1..F5? + jna main.12 # Yes + subb $(KEY_1 - KEY_F1),%al # Less #1 scan code + cmpb $0x4,%al # #1..#5? ja main.10 # No # # We have a selection. @@ -364,7 +368,7 @@ tables: # # These values indicate bootable types we know the names of # - .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x63, 0x83 + .byte 0x1, 0x4, 0x6, 0xb, 0xc, 0xe, 0x83 .byte 0x9f, 0xa5, 0xa6, 0xa9 # # These are offsets that match the known names above and point to the strings @@ -377,7 +381,6 @@ tables: .byte os_dos-. # Windows .byte os_dos-. # Windows .byte os_dos-. # Windows - .byte os_unix-. # UNIX .byte os_linux-. # Linux .byte os_bsd-. # BSD/OS .byte os_freebsd-. # FreeBSD @@ -389,7 +392,6 @@ tables: # os_misc: .ascii "?"; .byte '?'|0x80 os_dos: .ascii "DO"; .byte 'S'|0x80 -os_unix: .ascii "UNI"; .byte 'X'|0x80 os_linux: .ascii "Linu"; .byte 'x'|0x80 os_freebsd: .ascii "Free" os_bsd: .ascii "BS"; .byte 'D'|0x80