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

'boot -z' bogons

Browse Source
This commit is contained in:
ad 2009-03-14 11:08:28 +00:00
parent b33d444d81
commit 0fa70e9b6f
5 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/isa/pcppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcppi.c,v 1.32 2008/03/05 22:46:43 cube Exp $ */
/* $NetBSD: pcppi.c,v 1.33 2009/03/14 11:08:28 ad Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.32 2008/03/05 22:46:43 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.33 2009/03/14 11:08:28 ad Exp $");
#include "attimer.h"
@ -164,8 +164,7 @@ pcppi_isa_attach(device_t parent, device_t self, void *aux)
if (bus_space_map(iot, IO_PPI, sc->sc_size, 0, &sc->sc_ppi_ioh))
panic("pcppi_attach: couldn't map");
printf("\n");
aprint_normal("\n");
pcppi_attach(sc);
}

8
sys/dev/pad/pad.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pad.c,v 1.10 2008/09/04 10:42:55 christos Exp $ */
/* $NetBSD: pad.c,v 1.11 2009/03/14 11:08:28 ad Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.10 2008/09/04 10:42:55 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.11 2009/03/14 11:08:28 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -147,9 +147,7 @@ padattach(int n)
int i, err;
cfdata_t cf;
#ifdef DEBUG
printf("pad: requested %d units\n", n);
#endif
aprint_debug("pad: requested %d units\n", n);
err = config_cfattach_attach(pad_cd.cd_name, &pad_ca);
if (err) {

24
sys/dev/raidframe/rf_netbsdkintf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_netbsdkintf.c,v 1.257 2009/02/28 23:11:11 oster Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.258 2009/03/14 11:08:28 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@ -139,7 +139,7 @@
***********************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.257 2009/02/28 23:11:11 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.258 2009/03/14 11:08:28 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@ -342,9 +342,7 @@ raidattach(int num)
int raidID;
int i, rc;
#ifdef DEBUG
printf("raidattach: Asked for %d units\n", num);
#endif
aprint_debug("raidattach: Asked for %d units\n", num);
if (num <= 0) {
#ifdef DIAGNOSTIC
@ -431,9 +429,7 @@ rf_autoconfig(struct device *self)
raidautoconfig = 0;
/* 1. locate all RAID components on the system */
#ifdef DEBUG
printf("Searching for RAID components...\n");
#endif
aprint_debug("Searching for RAID components...\n");
ac_list = rf_find_raid_components();
/* 2. Sort them into their respective sets. */
@ -469,18 +465,14 @@ rf_buildroothack(RF_ConfigSet_t *config_sets)
cset->ac->clabel->autoconfigure==1) {
retcode = rf_auto_config_set(cset,&raidID);
if (!retcode) {
#ifdef DEBUG
printf("raid%d: configured ok\n", raidID);
#endif
aprint_debug("raid%d: configured ok\n", raidID);
if (cset->rootable) {
rootID = raidID;
num_root++;
}
} else {
/* The autoconfig didn't work :( */
#ifdef DEBUG
printf("Autoconfig failed with code %d for raid%d\n", retcode, raidID);
#endif
aprint_debug("Autoconfig failed with code %d for raid%d\n", retcode, raidID);
rf_release_all_vps(cset);
}
} else {
@ -531,10 +523,8 @@ rf_buildroothack(RF_ConfigSet_t *config_sets)
if (strncmp(devname, device_xname(booted_device),
strlen(device_xname(booted_device))) != 0)
continue;
#ifdef DEBUG
printf("raid%d includes boot device %s\n",
aprint_debug("raid%d includes boot device %s\n",
raidID, devname);
#endif
num_root++;
rootID = raidID;
}

6
sys/dev/scsipi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.287 2009/01/21 17:16:12 cegger Exp $ */
/* $NetBSD: cd.c,v 1.288 2009/03/14 11:08:29 ad Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.287 2009/01/21 17:16:12 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.288 2009/03/14 11:08:29 ad Exp $");
#include "rnd.h"
@ -286,7 +286,7 @@ cdattach(device_t parent, device_t self, void *aux)
disk_init(&cd->sc_dk, device_xname(cd->sc_dev), &cddkdriver);
disk_attach(&cd->sc_dk);
printf("\n");
aprint_normal("\n");
#if NRND > 0
rnd_attach_source(&cd->rnd_source, device_xname(cd->sc_dev),

6
sys/kern/subr_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_autoconf.c,v 1.168 2009/02/12 18:24:18 christos Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.169 2009/03/14 11:08:28 ad Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.168 2009/02/12 18:24:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.169 2009/03/14 11:08:28 ad Exp $");
#include "opt_ddb.h"
#include "drvctl.h"
@ -1825,7 +1825,7 @@ config_finalize(void)
(boothowto & AB_VERBOSE) == 0) {
if (config_do_twiddle) {
config_do_twiddle = 0;
printf_nolog("done.\n");
printf_nolog(" done.\n");
}
if (errcnt != 0) {
printf("WARNING: %d error%s while detecting hardware; "