Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Use aprint*().
details: https://anonhg.NetBSD.org/src/rev/4b57815e64d9
branches: trunk
changeset: 546424:4b57815e64d9
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Apr 29 01:07:30 2003 +0000
description:
Use aprint*().
diffstat:
sys/arch/arm/arm32/cpu.c | 57 ++++++++++++++++---------------
sys/arch/arm/mainbus/mainbus.c | 5 +-
sys/arch/arm/xscale/i80321_aau.c | 15 ++++---
sys/arch/arm/xscale/i80321_pci.c | 4 +-
sys/arch/arm/xscale/i80321_timer.c | 10 ++--
sys/arch/arm/xscale/i80321_wdog.c | 7 ++-
sys/arch/arm/xscale/iopaau.c | 9 ++--
sys/arch/evbarm/iq80321/com_obio.c | 6 +-
sys/arch/evbarm/iq80321/i80321_mainbus.c | 5 +-
sys/arch/evbarm/iq80321/obio.c | 5 +-
sys/dev/pci/if_wm.c | 46 ++++++++++++++-----------
sys/dev/pci/pci.c | 24 ++++++++-----
12 files changed, 105 insertions(+), 88 deletions(-)
diffs (truncated from 657 to 300 lines):
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/arm32/cpu.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.48 2003/02/14 16:00:33 rjs Exp $ */
+/* $NetBSD: cpu.c,v 1.49 2003/04/29 01:07:30 thorpej Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -45,7 +45,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.48 2003/02/14 16:00:33 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.49 2003/04/29 01:07:30 thorpej Exp $");
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -95,7 +95,7 @@
if (curcpu()->ci_arm_cputype == CPU_ID_SA110 &&
curcpu()->ci_arm_cpurev < 3) {
- printf("%s: SA-110 with bugged STM^ instruction\n",
+ aprint_normal("%s: SA-110 with bugged STM^ instruction\n",
dv->dv_xname);
}
@@ -103,9 +103,9 @@
if ((curcpu()->ci_arm_cpuid & CPU_ID_CPU_MASK) == CPU_ID_ARM810) {
int clock = arm8_clock_config(0, 0);
char *fclk;
- printf("%s: ARM810 cp15=%02x", dv->dv_xname, clock);
- printf(" clock:%s", (clock & 1) ? " dynamic" : "");
- printf("%s", (clock & 2) ? " sync" : "");
+ aprint_normal("%s: ARM810 cp15=%02x", dv->dv_xname, clock);
+ aprint_normal(" clock:%s", (clock & 1) ? " dynamic" : "");
+ aprint_normal("%s", (clock & 2) ? " sync" : "");
switch ((clock >> 2) & 3) {
case 0:
fclk = "bus clock";
@@ -120,7 +120,7 @@
fclk = "illegal";
break;
}
- printf(" fclk source=%s\n", fclk);
+ aprint_normal(" fclk source=%s\n", fclk);
}
#endif
@@ -386,7 +386,7 @@
cpuid = ci->ci_arm_cpuid;
if (cpuid == 0) {
- printf("Processor failed probe - no CPU ID\n");
+ aprint_error("Processor failed probe - no CPU ID\n");
return;
}
@@ -404,9 +404,10 @@
if (cpuids[i].cpuid == 0)
sprintf(cpu_model, "unknown CPU (ID = 0x%x)", cpuid);
- printf(": %s\n", cpu_model);
+ aprint_naive(": %s\n", cpu_model);
+ aprint_normal(": %s\n", cpu_model);
- printf("%s:", dv->dv_xname);
+ aprint_normal("%s:", dv->dv_xname);
switch (cpu_class) {
case CPU_CLASS_ARM6:
@@ -414,54 +415,54 @@
case CPU_CLASS_ARM7TDMI:
case CPU_CLASS_ARM8:
if ((ci->ci_ctrl & CPU_CONTROL_IDC_ENABLE) == 0)
- printf(" IDC disabled");
+ aprint_normal(" IDC disabled");
else
- printf(" IDC enabled");
+ aprint_normal(" IDC enabled");
break;
case CPU_CLASS_ARM9TDMI:
case CPU_CLASS_SA1:
case CPU_CLASS_XSCALE:
if ((ci->ci_ctrl & CPU_CONTROL_DC_ENABLE) == 0)
- printf(" DC disabled");
+ aprint_normal(" DC disabled");
else
- printf(" DC enabled");
+ aprint_normal(" DC enabled");
if ((ci->ci_ctrl & CPU_CONTROL_IC_ENABLE) == 0)
- printf(" IC disabled");
+ aprint_normal(" IC disabled");
else
- printf(" IC enabled");
+ aprint_normal(" IC enabled");
break;
default:
break;
}
if ((ci->ci_ctrl & CPU_CONTROL_WBUF_ENABLE) == 0)
- printf(" WB disabled");
+ aprint_normal(" WB disabled");
else
- printf(" WB enabled");
+ aprint_normal(" WB enabled");
if (ci->ci_ctrl & CPU_CONTROL_LABT_ENABLE)
- printf(" LABT");
+ aprint_normal(" LABT");
else
- printf(" EABT");
+ aprint_normal(" EABT");
if (ci->ci_ctrl & CPU_CONTROL_BPRD_ENABLE)
- printf(" branch prediction enabled");
+ aprint_normal(" branch prediction enabled");
- printf("\n");
+ aprint_normal("\n");
/* Print cache info. */
if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0)
goto skip_pcache;
if (arm_pcache_unified) {
- printf("%s: %dKB/%dB %d-way %s unified cache\n",
+ aprint_normal("%s: %dKB/%dB %d-way %s unified cache\n",
dv->dv_xname, arm_pdcache_size / 1024,
arm_pdcache_line_size, arm_pdcache_ways,
wtnames[arm_pcache_type]);
} else {
- printf("%s: %dKB/%dB %d-way Instruction cache\n",
+ aprint_normal("%s: %dKB/%dB %d-way Instruction cache\n",
dv->dv_xname, arm_picache_size / 1024,
arm_picache_line_size, arm_picache_ways);
- printf("%s: %dKB/%dB %d-way %s Data cache\n",
+ aprint_normal("%s: %dKB/%dB %d-way %s Data cache\n",
dv->dv_xname, arm_pdcache_size / 1024,
arm_pdcache_line_size, arm_pdcache_ways,
wtnames[arm_pcache_type]);
@@ -505,12 +506,12 @@
break;
default:
if (cpu_classes[cpu_class].class_option != NULL)
- printf("%s: %s does not fully support this CPU."
+ aprint_error("%s: %s does not fully support this CPU."
"\n", dv->dv_xname, ostype);
else {
- printf("%s: This kernel does not fully support "
+ aprint_error("%s: This kernel does not fully support "
"this CPU.\n", dv->dv_xname);
- printf("%s: Recompile with \"options %s\" to "
+ aprint_normal("%s: Recompile with \"options %s\" to "
"correct this.\n", dv->dv_xname,
cpu_classes[cpu_class].class_option);
}
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/mainbus/mainbus.c
--- a/sys/arch/arm/mainbus/mainbus.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/mainbus/mainbus.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.7 2003/01/01 00:46:14 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.8 2003/04/29 01:07:30 thorpej Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -170,7 +170,8 @@
struct device *self;
void *aux;
{
- printf("\n");
+ aprint_naive("\n");
+ aprint_normal("\n");
config_search(mainbussearch, self, NULL);
}
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/xscale/i80321_aau.c
--- a/sys/arch/arm/xscale/i80321_aau.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/xscale/i80321_aau.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_aau.c,v 1.8 2002/10/02 05:02:29 thorpej Exp $ */
+/* $NetBSD: i80321_aau.c,v 1.9 2003/04/29 01:07:31 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_aau.c,v 1.8 2002/10/02 05:02:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_aau.c,v 1.9 2003/04/29 01:07:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/pool.h>
@@ -164,13 +164,14 @@
struct iopxs_attach_args *ia = aux;
int error;
- printf("\n");
+ aprint_naive("\n");
+ aprint_normal("\n");
sc->sc_st = ia->ia_st;
error = bus_space_subregion(sc->sc_st, ia->ia_sh,
ia->ia_offset, ia->ia_size, &sc->sc_sh);
if (error) {
- printf("%s: unable to subregion registers, error = %d\n",
+ aprint_error("%s: unable to subregion registers, error = %d\n",
sc->sc_dev.dv_xname, error);
return;
}
@@ -180,7 +181,7 @@
sc321->sc_error_ih = i80321_intr_establish(ICU_INT_AAUE, IPL_BIO,
iopaau_intr, sc);
if (sc321->sc_error_ih == NULL) {
- printf("%s: unable to register error interrupt handler\n",
+ aprint_error("%s: unable to register error interrupt handler\n",
sc->sc_dev.dv_xname);
return;
}
@@ -188,7 +189,7 @@
sc321->sc_eoc_ih = i80321_intr_establish(ICU_INT_AAU_EOC, IPL_BIO,
iopaau_intr, sc);
if (sc321->sc_eoc_ih == NULL) {
- printf("%s: unable to register EOC interrupt handler\n",
+ aprint_error("%s: unable to register EOC interrupt handler\n",
sc->sc_dev.dv_xname);
return;
}
@@ -196,7 +197,7 @@
sc321->sc_eot_ih = i80321_intr_establish(ICU_INT_AAU_EOT, IPL_BIO,
iopaau_intr, sc);
if (sc321->sc_eoc_ih == NULL) {
- printf("%s: unable to register EOT interrupt handler\n",
+ aprint_error("%s: unable to register EOT interrupt handler\n",
sc->sc_dev.dv_xname);
return;
}
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/xscale/i80321_pci.c
--- a/sys/arch/arm/xscale/i80321_pci.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/xscale/i80321_pci.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_pci.c,v 1.1 2002/03/27 21:45:47 thorpej Exp $ */
+/* $NetBSD: i80321_pci.c,v 1.2 2003/04/29 01:07:31 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
sc->sc_owin[0].owin_xlate_lo + VERDE_OUT_XLATE_MEM_WIN_SIZE - 1,
M_DEVBUF, NULL, 0, EX_NOWAIT);
- printf("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
+ aprint_normal("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);
pci_configure_bus(pc, ioext, memext, NULL, busno, arm_dcache_align);
extent_destroy(ioext);
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/xscale/i80321_timer.c
--- a/sys/arch/arm/xscale/i80321_timer.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/xscale/i80321_timer.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_timer.c,v 1.3 2002/10/08 23:59:41 thorpej Exp $ */
+/* $NetBSD: i80321_timer.c,v 1.4 2003/04/29 01:07:31 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -158,7 +158,7 @@
#endif
if (hz < 50 || COUNTS_PER_SEC % hz) {
- printf("Cannot get %d Hz clock; using 100 Hz\n", hz);
+ aprint_error("Cannot get %d Hz clock; using 100 Hz\n", hz);
hz = 100;
}
tick = 1000000 / hz; /* number of microseconds between interrupts */
@@ -177,15 +177,15 @@
* this situation).
*/
if (stathz != 0)
- printf("Cannot get %d Hz statclock\n", stathz);
+ aprint_error("Cannot get %d Hz statclock\n", stathz);
stathz = 0;
if (profhz != 0)
- printf("Cannot get %d Hz profclock\n", profhz);
+ aprint_error("Cannot get %d Hz profclock\n", profhz);
profhz = 0;
/* Report the clock frequency. */
- printf("clock: hz=%d stathz=%d profhz=%d\n", hz, stathz, profhz);
+ aprint_normal("clock: hz=%d stathz=%d profhz=%d\n", hz, stathz, profhz);
oldirqstate = disable_interrupts(I32_bit);
diff -r e2fb359884aa -r 4b57815e64d9 sys/arch/arm/xscale/i80321_wdog.c
--- a/sys/arch/arm/xscale/i80321_wdog.c Tue Apr 29 00:56:52 2003 +0000
+++ b/sys/arch/arm/xscale/i80321_wdog.c Tue Apr 29 01:07:30 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_wdog.c,v 1.4 2002/10/02 05:02:29 thorpej Exp $ */
+/* $NetBSD: i80321_wdog.c,v 1.5 2003/04/29 01:07:31 thorpej Exp $ */
Home |
Main Index |
Thread Index |
Old Index