Fix the mess I apparently have done committing 1.52 of autoconf.c
In particular: add back the 1.50->1.51 change, and add back Amiga audio. Thanks to Thorsten Frueauf, who pointed this out in PR 3911.
This commit is contained in:
parent
181debe530
commit
449feee671
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: autoconf.c,v 1.53 1997/07/22 15:03:22 is Exp $ */
|
/* $NetBSD: autoconf.c,v 1.54 1997/07/23 10:47:12 is Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1994 Christian E. Hopps
|
* Copyright (c) 1994 Christian E. Hopps
|
||||||
|
@ -291,6 +291,11 @@ mbattach(pdp, dp, auxp)
|
||||||
config_found(dp, "zbus", simple_devprint);
|
config_found(dp, "zbus", simple_devprint);
|
||||||
if (is_a3000())
|
if (is_a3000())
|
||||||
config_found(dp, "ahsc", simple_devprint);
|
config_found(dp, "ahsc", simple_devprint);
|
||||||
|
#ifdef DRACO
|
||||||
|
if (!is_draco())
|
||||||
|
#endif
|
||||||
|
config_found(dp, "aucc", simple_devprint);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -365,6 +370,7 @@ findroot(devpp, partp)
|
||||||
*/
|
*/
|
||||||
if (boot_partition != 0) {
|
if (boot_partition != 0) {
|
||||||
struct bdevsw *bdp;
|
struct bdevsw *bdp;
|
||||||
|
int i;
|
||||||
|
|
||||||
for (unit = 0; unit < sd_cd.cd_ndevs; ++unit) {
|
for (unit = 0; unit < sd_cd.cd_ndevs; ++unit) {
|
||||||
if (sd_cd.cd_devs[unit] == NULL)
|
if (sd_cd.cd_devs[unit] == NULL)
|
||||||
|
@ -390,18 +396,20 @@ findroot(devpp, partp)
|
||||||
continue;
|
continue;
|
||||||
bdp->d_close(MAKEDISKDEV(4, unit, 0),
|
bdp->d_close(MAKEDISKDEV(4, unit, 0),
|
||||||
FREAD | FNONBLOCK, 0, curproc);
|
FREAD | FNONBLOCK, 0, curproc);
|
||||||
/*
|
|
||||||
* XXX - assumes booting only from 'a' partition
|
|
||||||
*/
|
|
||||||
pp = &dkp->dk_label->d_partitions[0];
|
pp = &dkp->dk_label->d_partitions[0];
|
||||||
if (pp->p_size == 0 || pp->p_fstype != FS_BSDFFS)
|
for (i = 0; i < dkp->dk_label->d_npartitions;
|
||||||
continue;
|
i++, pp++) {
|
||||||
if (pp->p_offset == boot_partition) {
|
if (pp->p_size == 0 ||
|
||||||
if (*devpp == NULL) {
|
(pp->p_fstype != FS_BSDFFS &&
|
||||||
*devpp = devs[unit];
|
pp->p_fstype != FS_SWAP))
|
||||||
*partp = 0; /* XXX */
|
continue;
|
||||||
} else
|
if (pp->p_offset == boot_partition) {
|
||||||
printf("Ambiguous boot device\n");
|
if (*devpp == NULL) {
|
||||||
|
*devpp = devs[unit];
|
||||||
|
*partp = i;
|
||||||
|
} else
|
||||||
|
printf("Ambiguous boot device\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue