summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-06-01 20:41:04 +0000
committerobrien <obrien@FreeBSD.org>2003-06-01 20:41:04 +0000
commitbb80268e0a171835299c6eca63a375073ab03a31 (patch)
tree6b9c961c893490fe3ff7e10675d34d659556cca9 /sys/boot
parentc42b647365c4cd7217177f4b2f58e45ff3805179 (diff)
downloadFreeBSD-src-bb80268e0a171835299c6eca63a375073ab03a31.zip
FreeBSD-src-bb80268e0a171835299c6eca63a375073ab03a31.tar.gz
Accpet '1'..'5' in place of F1..F5 for serial console users.
Reviewed by: Bruce M Simpson <bms@spc.org>
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/boot0/boot0.s8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index 89570ed..eb4ddcc 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
OpenPOWER on IntegriCloud