From 703e7687a9223247b59049a1b4b755e611e1ecd3 Mon Sep 17 00:00:00 2001 From: thorpej Date: Wed, 1 Jan 2003 00:16:46 +0000 Subject: [PATCH] Use aprint_normal() in cfprint routines. --- sys/arch/amiga/dev/zbus.c | 11 ++++++----- sys/arch/mac68k/dev/adb.c | 28 +++++++++++++++------------- sys/arch/macppc/dev/adb.c | 28 +++++++++++++++------------- sys/arch/vax/mba/mba.c | 10 +++++----- sys/arch/vax/vax/sbi.c | 11 ++++++----- sys/dev/hpc/hpcioman.c | 14 +++++++------- sys/dev/ic/pckbc.c | 6 +++--- sys/dev/isa/fd.c | 6 +++--- 8 files changed, 60 insertions(+), 54 deletions(-) diff --git a/sys/arch/amiga/dev/zbus.c b/sys/arch/amiga/dev/zbus.c index a0c30428c956..568a96f6b082 100644 --- a/sys/arch/amiga/dev/zbus.c +++ b/sys/arch/amiga/dev/zbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: zbus.c,v 1.49 2002/10/02 04:55:53 thorpej Exp $ */ +/* $NetBSD: zbus.c,v 1.50 2003/01/01 00:16:46 thorpej Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.49 2002/10/02 04:55:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.50 2003/01/01 00:16:46 thorpej Exp $"); #include #include @@ -332,12 +332,13 @@ zbusprint(void *auxp, const char *pnp) zap = auxp; if (pnp) { - printf("%s at %s:", aconflookup(zap->manid, zap->prodid), - pnp); + aprint_normal("%s at %s:", + aconflookup(zap->manid, zap->prodid), pnp); if (zap->manid == -1) rv = UNSUPP; } - printf(" pa %8p man/pro %d/%d", zap->pa, zap->manid, zap->prodid); + aprint_normal(" pa %8p man/pro %d/%d", zap->pa, zap->manid, + zap->prodid); return(rv); } diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c index 8af4adf5ea0b..f0152ec66f1a 100644 --- a/sys/arch/mac68k/dev/adb.c +++ b/sys/arch/mac68k/dev/adb.c @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.43 2002/10/02 05:36:37 thorpej Exp $ */ +/* $NetBSD: adb.c,v 1.44 2003/01/01 00:16:47 thorpej Exp $ */ /* * Copyright (C) 1994 Bradley A. Grantham @@ -196,23 +196,25 @@ adbprint(args, name) rv = UNSUPP; /* most ADB device types are unsupported */ /* print out what kind of ADB device we have found */ - printf("%s addr %d: ", name, aa_args->adbaddr); + aprint_normal("%s addr %d: ", name, aa_args->adbaddr); switch(aa_args->origaddr) { #ifdef DIAGNOSTIC case 0: - printf("ADB event device"); + aprint_normal("ADB event device"); rv = UNCONF; break; case ADBADDR_SECURE: - printf("security dongle (%d)", aa_args->handler_id); + aprint_normal("security dongle (%d)", + aa_args->handler_id); break; #endif case ADBADDR_MAP: - printf("mapped device (%d)", aa_args->handler_id); + aprint_normal("mapped device (%d)", + aa_args->handler_id); rv = UNCONF; break; case ADBADDR_REL: - printf("relative positioning device (%d)", + aprint_normal("relative positioning device (%d)", aa_args->handler_id); rv = UNCONF; break; @@ -220,37 +222,37 @@ adbprint(args, name) case ADBADDR_ABS: switch (aa_args->handler_id) { case ADB_ARTPAD: - printf("WACOM ArtPad II"); + aprint_normal("WACOM ArtPad II"); break; default: - printf("absolute positioning device (%d)", + aprint_normal("absolute positioning device (%d)", aa_args->handler_id); break; } break; case ADBADDR_DATATX: - printf("data transfer device (modem?) (%d)", + aprint_normal("data transfer device (modem?) (%d)", aa_args->handler_id); break; case ADBADDR_MISC: switch (aa_args->handler_id) { case ADB_POWERKEY: - printf("Sophisticated Circuits PowerKey"); + aprint_normal("Sophisticated Circuits PowerKey"); break; default: - printf("misc. device (remote control?) (%d)", + aprint_normal("misc. device (remote control?) (%d)", aa_args->handler_id); break; } break; default: - printf("unknown type device, (handler %d)", + aprint_normal("unknown type device, (handler %d)", aa_args->handler_id); break; #endif /* DIAGNOSTIC */ } } else /* a device matched and was configured */ - printf(" addr %d: ", aa_args->adbaddr); + aprint_normal(" addr %d: ", aa_args->adbaddr); return (rv); } diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index 6deaa8522701..0f45ddee49dc 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.13 2002/10/02 05:30:38 thorpej Exp $ */ +/* $NetBSD: adb.c,v 1.14 2003/01/01 00:16:47 thorpej Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -186,23 +186,25 @@ adbprint(args, name) rv = UNSUPP; /* most ADB device types are unsupported */ /* print out what kind of ADB device we have found */ - printf("%s addr %d: ", name, aa_args->adbaddr); + aprint_normal("%s addr %d: ", name, aa_args->adbaddr); switch(aa_args->origaddr) { #ifdef DIAGNOSTIC case 0: - printf("ADB event device"); + aprint_normal("ADB event device"); rv = UNCONF; break; case ADBADDR_SECURE: - printf("security dongle (%d)", aa_args->handler_id); + aprint_normal("security dongle (%d)", + aa_args->handler_id); break; #endif case ADBADDR_MAP: - printf("mapped device (%d)", aa_args->handler_id); + aprint_normal("mapped device (%d)", + aa_args->handler_id); rv = UNCONF; break; case ADBADDR_REL: - printf("relative positioning device (%d)", + aprint_normal("relative positioning device (%d)", aa_args->handler_id); rv = UNCONF; break; @@ -210,37 +212,37 @@ adbprint(args, name) case ADBADDR_ABS: switch (aa_args->handler_id) { case ADB_ARTPAD: - printf("WACOM ArtPad II"); + aprint_normal("WACOM ArtPad II"); break; default: - printf("absolute positioning device (%d)", + aprint_normal("absolute positioning device (%d)", aa_args->handler_id); break; } break; case ADBADDR_DATATX: - printf("data transfer device (modem?) (%d)", + aprint_normal("data transfer device (modem?) (%d)", aa_args->handler_id); break; case ADBADDR_MISC: switch (aa_args->handler_id) { case ADB_POWERKEY: - printf("Sophisticated Circuits PowerKey"); + aprint_normal("Sophisticated Circuits PowerKey"); break; default: - printf("misc. device (remote control?) (%d)", + aprint_normal("misc. device (remote control?) (%d)", aa_args->handler_id); break; } break; default: - printf("unknown type device, (handler %d)", + aprint_normal("unknown type device, (handler %d)", aa_args->handler_id); break; #endif /* DIAGNOSTIC */ } } else /* a device matched and was configured */ - printf(" addr %d: ", aa_args->adbaddr); + aprint_normal(" addr %d: ", aa_args->adbaddr); return rv; } diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c index 7e13cc7a8f83..02a023de11d5 100644 --- a/sys/arch/vax/mba/mba.c +++ b/sys/arch/vax/mba/mba.c @@ -1,4 +1,4 @@ -/* $NetBSD: mba.c,v 1.29 2002/10/02 16:02:33 thorpej Exp $ */ +/* $NetBSD: mba.c,v 1.30 2003/01/01 00:16:47 thorpej Exp $ */ /* * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -243,12 +243,12 @@ mbaprint(void *aux, const char *mbaname) if (mbaname) { if (ma->ma_name) - printf("%s", ma->ma_name); + aprint_normal("%s", ma->ma_name); else - printf("device type %o", ma->ma_type); - printf(" at %s", mbaname); + aprint_normal("device type %o", ma->ma_type); + aprint_normal(" at %s", mbaname); } - printf(" drive %d", ma->ma_unit); + aprint_normal(" drive %d", ma->ma_unit); return (ma->ma_name ? UNCONF : UNSUPP); } diff --git a/sys/arch/vax/vax/sbi.c b/sys/arch/vax/vax/sbi.c index bca517c28e5d..d0f82a21d6df 100644 --- a/sys/arch/vax/vax/sbi.c +++ b/sys/arch/vax/vax/sbi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbi.c,v 1.26 2002/10/02 16:02:36 thorpej Exp $ */ +/* $NetBSD: sbi.c,v 1.27 2003/01/01 00:16:47 thorpej Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -57,18 +57,19 @@ sbi_print(void *aux, const char *name) if (name) { switch (sa->sa_type) { case NEX_MBA: - printf("mba at %s", name); + aprint_normal("mba at %s", name); break; case NEX_CI: - printf("ci at %s", name); + aprint_normal("ci at %s", name); unsupp++; break; default: - printf("unknown device 0x%x at %s", sa->sa_type, name); + aprint_normal("unknown device 0x%x at %s", + sa->sa_type, name); unsupp++; } } - printf(" tr%d", sa->sa_nexnum); + aprint_normal(" tr%d", sa->sa_nexnum); return (unsupp ? UNSUPP : UNCONF); } diff --git a/sys/dev/hpc/hpcioman.c b/sys/dev/hpc/hpcioman.c index edfcdb6e043d..148f7b38e863 100644 --- a/sys/dev/hpc/hpcioman.c +++ b/sys/dev/hpc/hpcioman.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcioman.c,v 1.9 2002/10/02 16:33:50 thorpej Exp $ */ +/* $NetBSD: hpcioman.c,v 1.10 2003/01/01 00:19:31 thorpej Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.9 2002/10/02 16:33:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.10 2003/01/01 00:19:31 thorpej Exp $"); #include #include @@ -177,7 +177,7 @@ hpcioman_print(void *aux, const char *pnp) int type = hma->hma_type; if (!pnp) { - printf(" iochip %s, port %d, type %d, id %d", + aprint_normal(" iochip %s, port %d, type %d, id %d", hma->hma_hc ? hma->hma_hc->hc_name : "not found", hma->hma_port, type, hma->hma_id); if (type == CONFIG_HOOK_BUTTONEVENT || @@ -185,20 +185,20 @@ hpcioman_print(void *aux, const char *pnp) type == CONFIG_HOOK_EVENT || type == CONFIG_HOOK_PCIINTR) { if (hma->hma_intr_mode & HPCIO_INTR_EDGE) - printf (", interrupt edge [%s%s]", + aprint_normal (", interrupt edge [%s%s]", (hma->hma_intr_mode&HPCIO_INTR_POSEDGE) ? "p" : "", (hma->hma_intr_mode&HPCIO_INTR_NEGEDGE) ? "n" : ""); else - printf (", interrupt level %s", + aprint_normal (", interrupt level %s", (hma->hma_intr_mode&HPCIO_INTR_HIGH) ? "high" : "low"); } if (hma->hma_initvalue != -1) - printf(", initial value %d", hma->hma_initvalue); + aprint_normal(", initial value %d", hma->hma_initvalue); if (hma->hma_on == 0) - printf(", active low"); + aprint_normal(", active low"); } return (QUIET); diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 139fe09e736d..d756608d2d67 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc.c,v 1.23 2002/11/01 21:39:31 jdolecek Exp $ */ +/* $NetBSD: pckbc.c,v 1.24 2003/01/01 00:20:32 thorpej Exp $ */ /* * Copyright (c) 1998 @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.23 2002/11/01 21:39:31 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.24 2003/01/01 00:20:32 thorpej Exp $"); #include #include @@ -440,7 +440,7 @@ pckbcprint(aux, pnp) struct pckbc_attach_args *pa = aux; if (!pnp) - printf(" (%s slot)", pckbc_slot_names[pa->pa_slot]); + aprint_normal(" (%s slot)", pckbc_slot_names[pa->pa_slot]); return (QUIET); } diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index b6225c4dbcac..fd96c54e7a3c 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.31 2002/11/01 11:31:57 mrg Exp $ */ +/* $NetBSD: fd.c,v 1.32 2003/01/01 00:20:33 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -92,7 +92,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.31 2002/11/01 11:31:57 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.32 2003/01/01 00:20:33 thorpej Exp $"); #include "rnd.h" #include "opt_ddb.h" @@ -335,7 +335,7 @@ fdprint(aux, fdc) register struct fdc_attach_args *fa = aux; if (!fdc) - printf(" drive %d", fa->fa_drive); + aprint_normal(" drive %d", fa->fa_drive); return QUIET; }