diff options
| author | ru <ru@FreeBSD.org> | 2006-09-05 19:28:03 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-09-05 19:28:03 +0000 |
| commit | d3b5cc24ad0dd27e4969c5099c9282e8929dcf21 (patch) | |
| tree | a23def826d1a3637dc6bbb4d9fde2aa969da06a7 /sys/boot | |
| parent | b02696f24096a6103d12c93a830042dbf7055864 (diff) | |
| download | FreeBSD-src-d3b5cc24ad0dd27e4969c5099c9282e8929dcf21.zip FreeBSD-src-d3b5cc24ad0dd27e4969c5099c9282e8929dcf21.tar.gz | |
- Include <sys/reboot.h> to get the RB_* defines.
- Make the PROBE_KEYBOARD option better resemble the -P option in
boot2, i.e., if keyboard isn't present then boot with both
RB_SERIAL and RB_MULTIPLE set.
Reviewed by: jhb
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index 12b008b..897e838 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -25,6 +25,8 @@ * separate PXE-aware client just to load the loader. */ +#include <sys/reboot.h> + /* * Memory locations. */ @@ -53,10 +55,6 @@ .set KARGS_FLAGS_PXE,0x2 # flag to indicate booting from # PXE loader /* - * Boot howto bits - */ - .set RB_SERIAL,0x1000 # serial console -/* * Segment selectors. */ .set SEL_SDATA,0x8 # Supervisor data @@ -119,11 +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. + * set the RBX_DUAL and RBX_SERIAL bits in the howto byte. */ testb $KEYBOARD_BIT, MEM_BIOS_KEYBOARD # keyboard present? jnz keyb # yes, so skip - orl $RB_SERIAL, (%bx) # enable serial console + orl $(RB_MULTIPLE | RB_SERIAL), (%bx) # enable serial console keyb: #endif /* |
