diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-01-13 21:28:24 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-01-13 21:28:24 +0000 |
| commit | 8e6206d943a09391c080662cc8136d2f82cf304a (patch) | |
| tree | 0f5c27f1031aaa70deb66efa363fa5ef8a066e83 /sys/boot | |
| parent | 26d48b4044f423a90168903c429bff20cd79bef3 (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 6 | ||||
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 4f6229674c0c..6105ddc765e9 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -51,10 +51,12 @@ #define RBX_GDB 0xf /* -g */ #define RBX_MUTE 0x10 /* -m */ #define RBX_PAUSE 0x12 /* -p */ +#define RBX_NOINTR 0x1c /* -n */ #define RBX_DUAL 0x1d /* -D */ #define RBX_PROBEKBD 0x1e /* -P */ -#define RBX_NOINTR 0x1f /* -n */ +/* 0x1f is reserved for the historical RB_BOOTINFO option */ +/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ #define RBX_MASK 0x2005ffff #define PATH_CONFIG "/boot.config" @@ -109,7 +111,7 @@ static struct dsk { } dsk; static char cmd[512]; static char kname[1024]; -static uint32_t opts = RB_BOOTINFO; +static uint32_t opts = 0; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 4f6229674c0c..6105ddc765e9 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -51,10 +51,12 @@ #define RBX_GDB 0xf /* -g */ #define RBX_MUTE 0x10 /* -m */ #define RBX_PAUSE 0x12 /* -p */ +#define RBX_NOINTR 0x1c /* -n */ #define RBX_DUAL 0x1d /* -D */ #define RBX_PROBEKBD 0x1e /* -P */ -#define RBX_NOINTR 0x1f /* -n */ +/* 0x1f is reserved for the historical RB_BOOTINFO option */ +/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ #define RBX_MASK 0x2005ffff #define PATH_CONFIG "/boot.config" @@ -109,7 +111,7 @@ static struct dsk { } dsk; static char cmd[512]; static char kname[1024]; -static uint32_t opts = RB_BOOTINFO; +static uint32_t opts = 0; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; |