diff options
Diffstat (limited to 'sys/boot/i386/libi386/bootinfo64.c')
| -rw-r--r-- | sys/boot/i386/libi386/bootinfo64.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 9014265..63be83f 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -43,7 +43,7 @@ static struct bootinfo bi; */ static struct { - char *ev; + const char *ev; int mask; } howto_names[] = { {"boot_askname", RB_ASKNAME}, @@ -56,6 +56,8 @@ static struct {NULL, 0} }; +vm_offset_t bi_copymodules(vm_offset_t addr); + int bi_getboothowto(char *kargs) { @@ -227,7 +229,7 @@ bi_copymodules(vm_offset_t addr) * Load the information expected by an i386 kernel. * * - The 'boothowto' argument is constructed - * - The 'botdev' argument is constructed + * - The 'bootdev' argument is constructed * - The 'bootinfo' struct is constructed, and copied into the kernel space. * - The kernel environment is copied into kernel space. * - Module metadata are formatted and placed in kernel space. @@ -237,7 +239,7 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) { struct preloaded_file *xp; struct i386_devdesc *rootdev; - vm_offset_t addr, bootinfo_addr; + vm_offset_t addr; char *rootdevname; int bootdevnr, i; u_int pad; @@ -262,6 +264,10 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) getrootmount(i386_fmtdev((void *)rootdev)); /* Do legacy rootdev guessing */ + + /* XXX - use a default bootdev of 0. Is this ok??? */ + bootdevnr = 0; + switch(rootdev->d_type) { case DEVT_DISK: /* pass in the BIOS device number of the current disk */ |
