Module Name: src
Committed By: phx
Date: Mon Jan 23 16:22:58 UTC 2012
Modified Files:
src/sys/arch/powerpc/oea: cpu_subr.c
src/sys/arch/powerpc/pci: pchb.c
src/sys/arch/sandpoint/sandpoint: satmgr.c
Log Message:
Insert some missing aprint_naive().
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/powerpc/oea/cpu_subr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pci/pchb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sandpoint/sandpoint/satmgr.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/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.70 src/sys/arch/powerpc/oea/cpu_subr.c:1.71
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.70 Wed Jun 29 06:00:17 2011
+++ src/sys/arch/powerpc/oea/cpu_subr.c Mon Jan 23 16:22:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.70 2011/06/29 06:00:17 matt Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.71 2012/01/23 16:22:57 phx Exp $ */
/*-
* Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.70 2011/06/29 06:00:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.71 2012/01/23 16:22:57 phx Exp $");
#include "opt_ppcparam.h"
#include "opt_multiprocessor.h"
@@ -404,6 +404,7 @@ cpu_attach_common(device_t self, int id)
* and just bail out.
*/
if (id != 0) {
+ aprint_naive("\n");
aprint_normal(": ID %d\n", id);
aprint_normal_dev(self,
"processor off-line; "
@@ -440,6 +441,7 @@ cpu_attach_common(device_t self, int id)
cpu_setup(self, ci);
break;
default:
+ aprint_naive("\n");
if (id >= CPU_MAXNUM) {
aprint_normal(": more than %d cpus?\n", CPU_MAXNUM);
panic("cpuattach");
@@ -468,6 +470,7 @@ cpu_setup(device_t self, struct cpu_info
vers = (pvr >> 16) & 0xffff;
cpu_identify(model, sizeof(model));
+ aprint_naive("\n");
aprint_normal(": %s, ID %d%s\n", model, cpu_number(),
cpu_number() == 0 ? " (primary)" : "");
Index: src/sys/arch/powerpc/pci/pchb.c
diff -u src/sys/arch/powerpc/pci/pchb.c:1.8 src/sys/arch/powerpc/pci/pchb.c:1.9
--- src/sys/arch/powerpc/pci/pchb.c:1.8 Fri Jul 1 18:59:19 2011
+++ src/sys/arch/powerpc/pci/pchb.c Mon Jan 23 16:22:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.8 2011/07/01 18:59:19 dyoung Exp $ */
+/* $NetBSD: pchb.c,v 1.9 2012/01/23 16:22:57 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2011/07/01 18:59:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2012/01/23 16:22:57 phx Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -241,6 +241,7 @@ pchbattach(device_t parent, device_t sel
volatile unsigned char *python;
uint32_t v;
+ aprint_naive("\n");
aprint_normal("\n");
/*
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.14 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.15
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.14 Thu Dec 29 10:27:36 2011
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Mon Jan 23 16:22:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.14 2011/12/29 10:27:36 phx Exp $ */
+/* $NetBSD: satmgr.c,v 1.15 2012/01/23 16:22:58 phx Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -205,6 +205,7 @@ satmgr_attach(device_t parent, device_t
}
if (ops == NULL)
goto notavail;
+ aprint_naive(": button manager\n");
aprint_normal(": button manager (%s)\n", ops->family);
sc->sc_ops = ops;
