From 5272ce479614b97ed93fc4c6af393c79bf6bed84 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 22 Sep 2005 11:20:33 +0000 Subject: [PATCH] - RBX_MASK wasn't updated when RB_PAUSE was changed from 0x40000 to 0x100000 in rev. 1.67. - NOPT wasn't updated (decremented) in previous revision. --- sys/boot/i386/boot2/boot2.c | 4 ++-- sys/boot/i386/gptboot/gptboot.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 0a4d0568e3c2..2027a85a06d6 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -66,14 +66,14 @@ __FBSDID("$FreeBSD$"); /* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK 0x2005ffff +#define RBX_MASK 0x2011ffff #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 11 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 0a4d0568e3c2..2027a85a06d6 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -66,14 +66,14 @@ __FBSDID("$FreeBSD$"); /* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK 0x2005ffff +#define RBX_MASK 0x2011ffff #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 11 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15