Module Name: src
Committed By: riz
Date: Sat Nov 20 17:41:27 UTC 2010
Modified Files:
src/sys/dev/isa [netbsd-5]: pcppi.c
src/sys/dev/pad [netbsd-5]: pad.c
src/sys/dev/raidframe [netbsd-5]: rf_netbsdkintf.c
src/sys/dev/scsipi [netbsd-5]: cd.c
src/sys/kern [netbsd-5]: subr_autoconf.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1386):
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.258
sys/dev/pad/pad.c: revision 1.11
sys/dev/scsipi/cd.c: revision 1.288
sys/dev/isa/pcppi.c: revision 1.33
sys/kern/subr_autoconf.c: revision 1.169
'boot -z' bogons
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.14.1 src/sys/dev/isa/pcppi.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.250.4.6 -r1.250.4.7 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.283.4.2 -r1.283.4.3 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.163.4.2 -r1.163.4.3 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/pcppi.c
diff -u src/sys/dev/isa/pcppi.c:1.32 src/sys/dev/isa/pcppi.c:1.32.14.1
--- src/sys/dev/isa/pcppi.c:1.32 Wed Mar 5 22:46:43 2008
+++ src/sys/dev/isa/pcppi.c Sat Nov 20 17:41:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.32 2008/03/05 22:46:43 cube Exp $ */
+/* $NetBSD: pcppi.c,v 1.32.14.1 2010/11/20 17:41:27 riz 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.32.14.1 2010/11/20 17:41:27 riz Exp $");
#include "attimer.h"
@@ -164,8 +164,7 @@
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);
}
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.10 src/sys/dev/pad/pad.c:1.10.4.1
--- src/sys/dev/pad/pad.c:1.10 Thu Sep 4 10:42:55 2008
+++ src/sys/dev/pad/pad.c Sat Nov 20 17:41:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.10 2008/09/04 10:42:55 christos Exp $ */
+/* $NetBSD: pad.c,v 1.10.4.1 2010/11/20 17:41:26 riz Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -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.10.4.1 2010/11/20 17:41:26 riz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -147,9 +147,7 @@
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) {
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.6 src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.7
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.250.4.6 Sat Mar 6 20:56:15 2010
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Nov 20 17:41:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.6 2010/03/06 20:56:15 sborrill Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.250.4.7 2010/11/20 17:41:26 riz 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.250.4.6 2010/03/06 20:56:15 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.250.4.7 2010/11/20 17:41:26 riz Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -344,9 +344,7 @@
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
@@ -433,9 +431,7 @@
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. */
@@ -471,18 +467,14 @@
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 {
@@ -533,10 +525,8 @@
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;
}
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.283.4.2 src/sys/dev/scsipi/cd.c:1.283.4.3
--- src/sys/dev/scsipi/cd.c:1.283.4.2 Wed Apr 8 23:02:15 2009
+++ src/sys/dev/scsipi/cd.c Sat Nov 20 17:41:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.283.4.2 2009/04/08 23:02:15 snj Exp $ */
+/* $NetBSD: cd.c,v 1.283.4.3 2010/11/20 17:41:26 riz 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.283.4.2 2009/04/08 23:02:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.283.4.3 2010/11/20 17:41:26 riz Exp $");
#include "rnd.h"
@@ -287,7 +287,7 @@
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),
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.163.4.2 src/sys/kern/subr_autoconf.c:1.163.4.3
--- src/sys/kern/subr_autoconf.c:1.163.4.2 Sun Mar 15 19:43:48 2009
+++ src/sys/kern/subr_autoconf.c Sat Nov 20 17:41:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.163.4.2 2009/03/15 19:43:48 snj Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.163.4.3 2010/11/20 17:41:27 riz 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.163.4.2 2009/03/15 19:43:48 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.163.4.3 2010/11/20 17:41:27 riz Exp $");
#include "opt_ddb.h"
#include "drvctl.h"
@@ -1829,7 +1829,7 @@
(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; "
