Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In some future (ie, without COMPAT_OLDBOOT), we don't want to bother 

with the disk type (IDE or SCSI) here - the BIOS doesn't do it either.
Set "#ifdef"s accordingly.
This commit is contained in:
drochner 1997-09-20 12:36:05 +00:00
parent dc0b04e0ad
commit c03122fcb1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/i386/stand/biosboot/devopen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: devopen.c,v 1.5 1997/09/17 18:32:50 drochner Exp $ */
/* $NetBSD: devopen.c,v 1.6 1997/09/20 12:36:05 drochner Exp $ */
/*
* Copyright (c) 1996, 1997
@ -54,15 +54,17 @@ static struct {
{
"fd", 0
},
{
"hd", 0x80
},
#ifdef COMPAT_OLDBOOT
{
"wd", 0x80
},
{
"sd", 0x80
},
{
"hd", 0x80
}
#endif
};
#define NUMBIOSDEVS (sizeof(biosdevtab) / sizeof(biosdevtab[0]))
@ -100,13 +102,13 @@ bios2dev(biosdev, devname, unit)
if(disklabel.d_magic == DISKMAGIC) {
if(disklabel.d_type == DTYPE_SCSI)
*devname = biosdevtab[2].name;
*devname = biosdevtab[3].name;
else
*devname = biosdevtab[1].name;
*devname = biosdevtab[2].name;
} else
#endif
/* call it "hd", we don't know better */
*devname = biosdevtab[3].name;
*devname = biosdevtab[1].name;
} else
*devname = biosdevtab[0].name;

9
sys/arch/i386/stand/biosboot/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.11 1997/09/17 19:39:37 drochner Exp $ */
/* $NetBSD: main.c,v 1.12 1997/09/20 12:36:07 drochner Exp $ */
/*
* Copyright (c) 1996, 1997
@ -205,8 +205,11 @@ print_banner(void)
printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
printf(">> Memory: %d/%d k\n", getbasemem(), getextmem());
printf("Use hd1a:netbsd to boot sd0 when wd0 is also installed\n"
"Press return to boot now, any other key for boot menu\n");
printf(
#ifdef COMPAT_OLDBOOT
"Use hd1a:netbsd to boot sd0 when wd0 is also installed\n"
#endif
"Press return to boot now, any other key for boot menu\n");
}