[src/trunk]: src/sys/arch Use aprint_normal() for cfprint routines.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d887681d2c8
branches:  trunk
changeset: 541056:9d887681d2c8
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jan 01 00:25:01 2003 +0000

description:
Use aprint_normal() for cfprint routines.

diffstat:

 sys/arch/acorn32/acorn32/hydra.c       |   8 ++++----
 sys/arch/acorn32/mainbus/fd.c          |   4 ++--
 sys/arch/acorn32/mainbus/pioc.c        |  11 ++++++-----
 sys/arch/acorn32/podulebus/amps.c      |   4 ++--
 sys/arch/acorn32/podulebus/podulebus.c |  11 ++++++-----
 sys/arch/amiga/amiga/autoconf.c        |   6 +++---
 sys/arch/amiga/dev/aster.c             |   6 +++---
 sys/arch/amiga/dev/drsupio.c           |   6 +++---
 sys/arch/amiga/dev/fd.c                |   6 +++---
 sys/arch/amiga/dev/grf.c               |   6 +++---
 sys/arch/amiga/dev/grf_cc.c            |   6 +++---
 sys/arch/amiga/dev/grf_cl.c            |   6 +++---
 sys/arch/amiga/dev/grf_cv.c            |   6 +++---
 sys/arch/amiga/dev/grf_cv3d.c          |   6 +++---
 sys/arch/amiga/dev/grf_et.c            |   6 +++---
 sys/arch/amiga/dev/grf_rh.c            |   6 +++---
 sys/arch/amiga/dev/grf_rt.c            |   6 +++---
 sys/arch/amiga/dev/grf_ul.c            |   6 +++---
 sys/arch/amiga/dev/gvpbus.c            |   8 ++++----
 sys/arch/amiga/dev/gvpio.c             |   6 +++---
 sys/arch/amiga/dev/hyper.c             |   6 +++---
 sys/arch/amiga/dev/ioblix_zbus.c       |   6 +++---
 22 files changed, 72 insertions(+), 70 deletions(-)

diffs (truncated from 589 to 300 lines):

diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/acorn32/acorn32/hydra.c
--- a/sys/arch/acorn32/acorn32/hydra.c  Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/acorn32/acorn32/hydra.c  Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hydra.c,v 1.13 2002/10/13 12:24:57 bjh21 Exp $ */
+/*     $NetBSD: hydra.c,v 1.14 2003/01/01 00:25:01 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2002 Ben Harris
@@ -29,7 +29,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.13 2002/10/13 12:24:57 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hydra.c,v 1.14 2003/01/01 00:25:01 thorpej Exp $");
 
 #include <sys/device.h>
 #include <sys/systm.h>
@@ -239,8 +239,8 @@
        struct hydra_attach_args *ha = aux;
 
        if (pnp)
-               printf("cpu at %s", pnp);
-       printf(" slave %d", ha->ha_slave);
+               aprint_normal("cpu at %s", pnp);
+       aprint_normal(" slave %d", ha->ha_slave);
        return UNCONF;
 }
 
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.12 2002/11/01 11:31:50 mrg Exp $      */
+/*     $NetBSD: fd.c,v 1.13 2003/01/01 00:25:02 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -369,7 +369,7 @@
        register struct fdc_attach_args *fa = aux;
 
        if (!fdc)
-               printf(" drive %d", fa->fa_drive);
+               aprint_normal(" drive %d", fa->fa_drive);
        return QUIET;
 }
 
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c   Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c   Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pioc.c,v 1.5 2002/10/02 03:31:59 thorpej Exp $ */     
+/*     $NetBSD: pioc.c,v 1.6 2003/01/01 00:25:02 thorpej Exp $ */     
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -193,13 +193,14 @@
 
        if (!name) {
                if (pa->pa_offset)
-                       printf(" offset 0x%x", pa->pa_offset >> 2);
+                       aprint_normal(" offset 0x%x", pa->pa_offset >> 2);
                if (pa->pa_iosize > 1)
-                       printf("-0x%x", ((pa->pa_offset >> 2) + pa->pa_iosize) - 1);
+                       aprint_normal("-0x%x",
+                           ((pa->pa_offset >> 2) + pa->pa_iosize) - 1);
                if (pa->pa_irq != -1)
-                       printf(" irq %d", pa->pa_irq);
+                       aprint_normal(" irq %d", pa->pa_irq);
                if (pa->pa_drq != -1)
-                       printf(" drq 0x%08x", pa->pa_drq);
+                       aprint_normal(" drq 0x%08x", pa->pa_drq);
        }
 
 /* XXX print flags */
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amps.c,v 1.7 2002/10/05 17:16:34 chs Exp $     */
+/*     $NetBSD: amps.c,v 1.8 2003/01/01 00:25:02 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
        struct amps_attach_args *aa = aux;
 
        if (!name)
-               printf(", port %d", aa->aa_port);
+               aprint_normal(", port %d", aa->aa_port);
 
        return(QUIET);
 }
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c    Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c    Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.14 2002/10/02 03:31:59 thorpej Exp $ */
+/* $NetBSD: podulebus.c,v 1.15 2003/01/01 00:25:02 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.14 2002/10/02 03:31:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.15 2003/01/01 00:25:02 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -111,11 +111,12 @@
        struct podule_attach_args *pa = aux;
 
        if (name)
-               printf("podule at %s", name);
+               aprint_normal("podule at %s", name);
        if (pa->pa_podule->slottype == SLOT_POD)
-               printf(" slot %d", pa->pa_podule_number);
+               aprint_normal(" slot %d", pa->pa_podule_number);
        else if (pa->pa_podule->slottype == SLOT_NET)
-               printf(" [ netslot %d ]", pa->pa_podule_number - MAX_PODULES);
+               aprint_normal(" [ netslot %d ]",
+                   pa->pa_podule_number - MAX_PODULES);
 #ifdef DIAGNOSTIC
        else
                panic("Invalid slot type");
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c   Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c   Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.86 2002/10/04 01:50:54 thorpej Exp $    */
+/*     $NetBSD: autoconf.c,v 1.87 2003/01/01 00:28:56 thorpej Exp $    */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.86 2002/10/04 01:50:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.87 2003/01/01 00:28:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -313,7 +313,7 @@
        const char *pnp;
 {
        if (pnp)
-               printf("%s at %s", (char *)auxp, pnp);
+               aprint_normal("%s at %s", (char *)auxp, pnp);
        return(UNCONF);
 }
 
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/aster.c
--- a/sys/arch/amiga/dev/aster.c        Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/aster.c        Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aster.c,v 1.19 2002/10/02 04:55:48 thorpej Exp $ */
+/*     $NetBSD: aster.c,v 1.20 2003/01/01 00:28:57 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998,2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.19 2002/10/02 04:55:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aster.c,v 1.20 2003/01/01 00:28:57 thorpej Exp $");
 
 /*
  * zbus ISDN Blaster, ISDN Master driver.
@@ -161,7 +161,7 @@
        if (pnp == NULL)
                return(QUIET);
 
-       printf("%s at %s port 0x%04x",
+       aprint_normal("%s at %s port 0x%04x",
            supa->supio_name, pnp, supa->supio_iobase);
 
        return(UNCONF);
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/drsupio.c
--- a/sys/arch/amiga/dev/drsupio.c      Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/drsupio.c      Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drsupio.c,v 1.13 2002/10/02 04:55:49 thorpej Exp $ */
+/*     $NetBSD: drsupio.c,v 1.14 2003/01/01 00:28:57 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.13 2002/10/02 04:55:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drsupio.c,v 1.14 2003/01/01 00:28:57 thorpej Exp $");
 
 /*
  * DraCo multi-io chip bus space stuff
@@ -151,7 +151,7 @@
        if (pnp == NULL)
                return(QUIET);
 
-       printf("%s at %s port 0x%02x",
+       aprint_normal("%s at %s port 0x%02x",
            supa->supio_name, pnp, supa->supio_iobase);
 
        return(UNCONF);
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/fd.c
--- a/sys/arch/amiga/dev/fd.c   Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/fd.c   Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.56 2002/11/01 11:31:51 mrg Exp $ */
+/*     $NetBSD: fd.c,v 1.57 2003/01/01 00:28:57 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2002/11/01 11:31:51 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.57 2003/01/01 00:28:57 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -365,7 +365,7 @@
 
        fcp = auxp;
        if (pnp)
-               printf("fd%d at %s unit %d:", fcp->unit, pnp,
+               aprint_normal("fd%d at %s unit %d:", fcp->unit, pnp,
                        fcp->type->driveid);
        return(UNCONF);
 }
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/grf.c
--- a/sys/arch/amiga/dev/grf.c  Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/grf.c  Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf.c,v 1.46 2002/10/23 09:10:32 jdolecek Exp $ */
+/*     $NetBSD: grf.c,v 1.47 2003/01/01 00:28:57 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.46 2002/10/23 09:10:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.47 2003/01/01 00:28:57 thorpej Exp $");
 
 /*
  * Graphics display driver for the Amiga
@@ -166,7 +166,7 @@
 grfprint(void *auxp, const char *pnp)
 {
        if (pnp)
-               printf("ite at %s", pnp);
+               aprint_normal("ite at %s", pnp);
        return(UNCONF);
 }
 
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/grf_cc.c
--- a/sys/arch/amiga/dev/grf_cc.c       Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/grf_cc.c       Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cc.c,v 1.34 2002/10/02 04:55:49 thorpej Exp $ */
+/*     $NetBSD: grf_cc.c,v 1.35 2003/01/01 00:28:57 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.34 2002/10/02 04:55:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.35 2003/01/01 00:28:57 thorpej Exp $");
 
 #include "grfcc.h"
 #if NGRFCC > 0
@@ -152,7 +152,7 @@
 grfccprint(void *auxp, const char *pnp)
 {
        if (pnp)
-               printf("grf%d at %s", ((struct grf_softc *)auxp)->g_unit,
+               aprint_normal("grf%d at %s", ((struct grf_softc *)auxp)->g_unit,
                        pnp);
        return(UNCONF);
 }
diff -r ff898832ba9a -r 9d887681d2c8 sys/arch/amiga/dev/grf_cl.c
--- a/sys/arch/amiga/dev/grf_cl.c       Wed Jan 01 00:16:46 2003 +0000
+++ b/sys/arch/amiga/dev/grf_cl.c       Wed Jan 01 00:25:01 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cl.c,v 1.33 2002/10/02 04:55:49 thorpej Exp $ */
+/*     $NetBSD: grf_cl.c,v 1.34 2003/01/01 00:28:58 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"