diff options
| author | jhb <jhb@FreeBSD.org> | 2008-03-06 21:43:56 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2008-03-06 21:43:56 +0000 |
| commit | 94c41ca263746befb52c5c2a2d18089c94c4c759 (patch) | |
| tree | d2cbd9847e55c693be620c582b3d20aa88676e8a | |
| parent | 78ba8d2f6ebbe1bd773014102d4480f32c7174cb (diff) | |
| download | FreeBSD-src-94c41ca263746befb52c5c2a2d18089c94c4c759.zip FreeBSD-src-94c41ca263746befb52c5c2a2d18089c94c4c759.tar.gz | |
In the PROBE_KEYBOARD case, always enable multiple consoles and set the
serial console as the primary console if the keyboard probe fails.
MFC after: 1 week
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index 897e838..f7af380 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -117,11 +117,13 @@ 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_DUAL and RBX_SERIAL bits in the howto byte. + * set the RBX_SERIAL bit in the howto byte to prefer the serial console to + * the video console. */ + orl $RB_MULTIPLE, (%bx) # enable multiple consoles testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console + orl $RB_SERIAL, (%bx) # prefer serial console keyb: #endif /* |
