Module Name: src
Committed By: mrg
Date: Thu Mar 11 03:54:56 UTC 2010
Modified Files:
src/sys/arch/sparc64/dev: ebus.c iommu.c rtc.c schizo.c
src/sys/arch/sparc64/sparc64: autoconf.c clock.c cpu.c
Log Message:
various aprint_* fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/dev/rtc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.172 -r1.173 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sparc64/sparc64/clock.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc64/sparc64/cpu.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/sparc64/dev/ebus.c
diff -u src/sys/arch/sparc64/dev/ebus.c:1.53 src/sys/arch/sparc64/dev/ebus.c:1.54
--- src/sys/arch/sparc64/dev/ebus.c:1.53 Mon Oct 13 12:25:22 2008
+++ src/sys/arch/sparc64/dev/ebus.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.53 2008/10/13 12:25:22 nakayama Exp $ */
+/* $NetBSD: ebus.c,v 1.54 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.53 2008/10/13 12:25:22 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.54 2010/03/11 03:54:56 mrg Exp $");
#include "opt_ddb.h"
@@ -168,10 +168,11 @@
int node, nmapmask, error;
char devinfo[256];
- printf("\n");
+ aprint_normal("\n");
+ aprint_naive("\n");
pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
- printf("%s: %s, revision 0x%02x\n", device_xname(self), devinfo,
+ aprint_normal_dev(self, "%s, revision 0x%02x\n", devinfo,
PCI_REVISION(pa->pa_class));
sc->sc_memtag = pa->pa_memt;
@@ -227,7 +228,7 @@
char *name = prom_getpropstring(node, "name");
if (ebus_setup_attach_args(sc, node, &eba) != 0) {
- printf("ebus_attach: %s: incomplete\n", name);
+ aprint_error("ebus_attach: %s: incomplete\n", name);
continue;
} else {
DPRINTF(EDB_CHILD, ("- found child `%s', attaching\n",
Index: src/sys/arch/sparc64/dev/iommu.c
diff -u src/sys/arch/sparc64/dev/iommu.c:1.97 src/sys/arch/sparc64/dev/iommu.c:1.98
--- src/sys/arch/sparc64/dev/iommu.c:1.97 Wed Feb 24 06:34:55 2010
+++ src/sys/arch/sparc64/dev/iommu.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.97 2010/02/24 06:34:55 skrll Exp $ */
+/* $NetBSD: iommu.c,v 1.98 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.97 2010/02/24 06:34:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.98 2010/03/11 03:54:56 mrg Exp $");
#include "opt_ddb.h"
@@ -204,10 +204,10 @@
/*
* Now all the hardware's working we need to allocate a dvma map.
*/
- printf("DVMA map: %x to %x\n",
+ aprint_debug("DVMA map: %x to %x\n",
(unsigned int)is->is_dvmabase,
(unsigned int)is->is_dvmaend);
- printf("IOTSB: %llx to %llx\n",
+ aprint_debug("IOTSB: %llx to %llx\n",
(unsigned long long)is->is_ptsb,
(unsigned long long)(is->is_ptsb + size - 1));
is->is_dvmamap = extent_create(name,
@@ -415,7 +415,7 @@
/* Bypass non-coherent D$ */
while ((!ldxa(sb->sb_flushpa, ASI_PHYS_CACHED)) &&
- timercmp(&cur, &flushtimeout, <=))
+ timercmp(&cur, &flushtimeout, <=))
microtime(&cur);
#ifdef DIAGNOSTIC
Index: src/sys/arch/sparc64/dev/rtc.c
diff -u src/sys/arch/sparc64/dev/rtc.c:1.6 src/sys/arch/sparc64/dev/rtc.c:1.7
--- src/sys/arch/sparc64/dev/rtc.c:1.6 Sun Dec 14 23:13:18 2008
+++ src/sys/arch/sparc64/dev/rtc.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.6 2008/12/14 23:13:18 mrg Exp $ */
+/* $NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.6 2008/12/14 23:13:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7 2010/03/11 03:54:56 mrg Exp $");
/*
* Clock driver for 'rtc' - mc146818 driver.
@@ -166,6 +166,7 @@
mc146818_attach(sc);
aprint_normal(": %s\n", model);
+ aprint_naive(": Clock\n");
/*
* Turn interrupts off, just in case. (Although they shouldn't
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.15 src/sys/arch/sparc64/dev/schizo.c:1.16
--- src/sys/arch/sparc64/dev/schizo.c:1.15 Thu Mar 11 03:30:16 2010
+++ src/sys/arch/sparc64/dev/schizo.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.15 2010/03/11 03:30:16 mrg Exp $ */
+/* $NetBSD: schizo.c,v 1.16 2010/03/11 03:54:56 mrg Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -142,7 +142,7 @@
int *busranges = NULL, nranges;
char *str;
- printf(": addr %" PRIx64, ma->ma_reg[0].ur_paddr);
+ aprint_normal(": addr %" PRIx64, ma->ma_reg[0].ur_paddr);
str = prom_getpropstring(ma->ma_node, "compatible");
if (strcmp(str, "pci108e,a801") == 0)
sc->sc_tomatillo = 1;
@@ -154,7 +154,7 @@
if (bus_space_map(sc->sc_bustag, ma->ma_reg[1].ur_paddr - 0x10000UL,
sizeof(struct schizo_regs), 0,
&sc->sc_ctrlh)) {
- printf(": failed to map registers\n");
+ aprint_error(": failed to map registers\n");
return;
}
@@ -185,7 +185,7 @@
if (bus_space_map(sc->sc_bustag, ma->ma_reg[0].ur_paddr,
ma->ma_reg[0].ur_len,
BUS_SPACE_MAP_LINEAR, &pbm->sp_intrh)) {
- printf(": failed to interrupt map registers\n");
+ aprint_error(": failed to interrupt map registers\n");
return;
}
@@ -197,10 +197,11 @@
(void **)&busranges))
panic("schizo: can't get bus-range");
- printf(": \"%s\", version %d, ign %x, bus %c %d to %d\n",
+ aprint_normal(": \"%s\", version %d, ign %x, bus %c %d to %d\n",
sc->sc_tomatillo ? "Tomatillo" : "Schizo",
prom_getpropint(sc->sc_node, "version#", 0), sc->sc_ign,
pbm->sp_bus_a ? 'A' : 'B', busranges[0], busranges[1]);
+ aprint_naive("\n");
if (bus_space_subregion(pbm->sp_regt, sc->sc_ctrlh,
pbm->sp_bus_a ? offsetof(struct schizo_regs, pbm_a) :
@@ -230,7 +231,7 @@
aprint_debug("%s: no streaming buffers\n", sc->sc_dv.dv_xname);
}
- printf("%s: ", sc->sc_dv.dv_xname);
+ aprint_normal("%s: ", sc->sc_dv.dv_xname);
schizo_init_iommu(sc, pbm);
pbm->sp_memt = schizo_alloc_mem_tag(pbm);
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.172 src/sys/arch/sparc64/sparc64/autoconf.c:1.173
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.172 Sat Mar 6 08:08:29 2010
+++ src/sys/arch/sparc64/sparc64/autoconf.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.172 2010/03/06 08:08:29 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.173 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.172 2010/03/06 08:08:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.173 2010/03/11 03:54:56 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -566,10 +566,11 @@
OF_getprop(findroot(), "name", machine_model, sizeof machine_model);
prom_getidprom();
if (i)
- printf(": %s (%s): hostid %lx\n", machine_model,
+ aprint_normal(": %s (%s): hostid %lx\n", machine_model,
machine_banner, hostid);
else
- printf(": %s: hostid %lx\n", machine_model, hostid);
+ aprint_normal(": %s: hostid %lx\n", machine_model, hostid);
+ aprint_naive("\n");
/*
* Locate and configure the ``early'' devices. These must be
Index: src/sys/arch/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.100 src/sys/arch/sparc64/sparc64/clock.c:1.101
--- src/sys/arch/sparc64/sparc64/clock.c:1.100 Sat May 16 19:15:34 2009
+++ src/sys/arch/sparc64/sparc64/clock.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.100 2009/05/16 19:15:34 nakayama Exp $ */
+/* $NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.100 2009/05/16 19:15:34 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.101 2010/03/11 03:54:56 mrg Exp $");
#include "opt_multiprocessor.h"
@@ -327,10 +327,7 @@
/* set the next interrupt time */
ci->ci_tick_increment = ci->ci_cpu_clockrate[0] / hz;
-#ifdef DEBUG
- printf("Using %%tick -- intr in %ld cycles\n",
- ci->ci_tick_increment);
-#endif
+
s = intr_disable();
next_tick(ci->ci_tick_increment);
intr_restore(s);
@@ -386,7 +383,7 @@
if (!timerreg_4u.t_timer || !timerreg_4u.t_clrintr) {
- printf("No counter-timer -- using %%tick at %luMHz as "
+ aprint_normal("No counter-timer -- using %%tick at %luMHz as "
"system clock.\n",
(unsigned long)curcpu()->ci_cpu_clockrate[1]);
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.92 src/sys/arch/sparc64/sparc64/cpu.c:1.93
--- src/sys/arch/sparc64/sparc64/cpu.c:1.92 Thu Mar 11 03:12:42 2010
+++ src/sys/arch/sparc64/sparc64/cpu.c Thu Mar 11 03:54:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.92 2010/03/11 03:12:42 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.93 2010/03/11 03:54:56 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.92 2010/03/11 03:12:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.93 2010/03/11 03:54:56 mrg Exp $");
#include "opt_multiprocessor.h"
@@ -299,8 +299,9 @@
prom_getpropstring(node, "name"), clockfreq(clk));
snprintf(cpu_model, sizeof cpu_model, "%s (%s)", machine_model, buf);
- printf(": %s, UPA id %d\n", buf, ci->ci_cpuid);
- printf("%s:", device_xname(dev));
+ aprint_normal(": %s, UPA id %d\n", buf, ci->ci_cpuid);
+ aprint_naive("\n");
+ aprint_normal_dev(dev, "");
bigcache = 0;
@@ -327,7 +328,7 @@
sep = " ";
if (totalsize > 0) {
- printf("%s%ldK instruction (%ld b/l)", sep,
+ aprint_normal("%s%ldK instruction (%ld b/l)", sep,
(long)totalsize/1024,
(long)linesize);
sep = ", ";
@@ -356,7 +357,7 @@
bigcache = cachesize;
if (totalsize > 0) {
- printf("%s%ldK data (%ld b/l)", sep,
+ aprint_normal("%s%ldK data (%ld b/l)", sep,
(long)totalsize/1024,
(long)linesize);
sep = ", ";
@@ -380,11 +381,11 @@
bigcache = cachesize;
if (totalsize > 0) {
- printf("%s%ldK external (%ld b/l)", sep,
+ aprint_normal("%s%ldK external (%ld b/l)", sep,
(long)totalsize/1024,
(long)linesize);
}
- printf("\n");
+ aprint_normal("\n");
if (ecache_min_line_size == 0 ||
linesize < ecache_min_line_size)
