diff options
| author | jhb <jhb@FreeBSD.org> | 2008-04-09 17:59:17 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2008-04-09 17:59:17 +0000 |
| commit | bc89dc0350a6f0aa4ffa7ab6086d6868f244b2b8 (patch) | |
| tree | 5e1ccd6a5762cf315e8d10c84b10d21e0998bcef /sys/boot | |
| parent | 69ec9a439cda4fb79f94985315b7a90845c0c8c4 (diff) | |
| download | FreeBSD-src-bc89dc0350a6f0aa4ffa7ab6086d6868f244b2b8.zip FreeBSD-src-bc89dc0350a6f0aa4ffa7ab6086d6868f244b2b8.tar.gz | |
Revert the previous change and let PROBE_KEYBOARD function identical to -P
in boot2/gptboot.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index f7af380..897e838 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -117,13 +117,11 @@ start: cld # string ops inc #ifdef PROBE_KEYBOARD /* * Look at the BIOS data area to see if we have an enhanced keyboard. If not, - * set the RBX_SERIAL bit in the howto byte to prefer the serial console to - * the video console. + * set the RBX_DUAL and RBX_SERIAL bits in the howto byte. */ - orl $RB_MULTIPLE, (%bx) # enable multiple consoles testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $RB_SERIAL, (%bx) # prefer serial console + orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console keyb: #endif /* |
