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
This commit is contained in:
jhb 2008-03-06 21:43:56 +00:00
parent 78ba8d2f6e
commit 94c41ca263

View File

@ -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
/*