Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use aprint_normal() in cfprint routines.

Browse Source
This commit is contained in:
thorpej 2003-01-01 00:16:46 +00:00
parent da0fbadf93
commit 703e7687a9
8 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/amiga/dev/zbus.c
View File

@ -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 * Copyright (c) 1994 Christian E. Hopps
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -332,12 +332,13 @@ zbusprint(void *auxp, const char *pnp)
zap = auxp; zap = auxp;
if (pnp) { if (pnp) {
printf("%s at %s:", aconflookup(zap->manid, zap->prodid), aprint_normal("%s at %s:",
pnp); aconflookup(zap->manid, zap->prodid), pnp);
if (zap->manid == -1) if (zap->manid == -1)
rv = UNSUPP; 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); return(rv);
} }

28
sys/arch/mac68k/dev/adb.c
View File

@ -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 * Copyright (C) 1994 Bradley A. Grantham
@ -196,23 +196,25 @@ adbprint(args, name)
rv = UNSUPP; /* most ADB device types are unsupported */ rv = UNSUPP; /* most ADB device types are unsupported */
/* print out what kind of ADB device we have found */ /* 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) { switch(aa_args->origaddr) {
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
case 0: case 0:
printf("ADB event device"); aprint_normal("ADB event device");
rv = UNCONF; rv = UNCONF;
break; break;
case ADBADDR_SECURE: case ADBADDR_SECURE:
printf("security dongle (%d)", aa_args->handler_id); aprint_normal("security dongle (%d)",
aa_args->handler_id);
break; break;
#endif #endif
case ADBADDR_MAP: case ADBADDR_MAP:
printf("mapped device (%d)", aa_args->handler_id); aprint_normal("mapped device (%d)",
aa_args->handler_id);
rv = UNCONF; rv = UNCONF;
break; break;
case ADBADDR_REL: case ADBADDR_REL:
printf("relative positioning device (%d)", aprint_normal("relative positioning device (%d)",
aa_args->handler_id); aa_args->handler_id);
rv = UNCONF; rv = UNCONF;
break; break;
@ -220,37 +222,37 @@ adbprint(args, name)
case ADBADDR_ABS: case ADBADDR_ABS:
switch (aa_args->handler_id) { switch (aa_args->handler_id) {
case ADB_ARTPAD: case ADB_ARTPAD:
printf("WACOM ArtPad II"); aprint_normal("WACOM ArtPad II");
break; break;
default: default:
printf("absolute positioning device (%d)", aprint_normal("absolute positioning device (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
} }
break; break;
case ADBADDR_DATATX: case ADBADDR_DATATX:
printf("data transfer device (modem?) (%d)", aprint_normal("data transfer device (modem?) (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
case ADBADDR_MISC: case ADBADDR_MISC:
switch (aa_args->handler_id) { switch (aa_args->handler_id) {
case ADB_POWERKEY: case ADB_POWERKEY:
printf("Sophisticated Circuits PowerKey"); aprint_normal("Sophisticated Circuits PowerKey");
break; break;
default: default:
printf("misc. device (remote control?) (%d)", aprint_normal("misc. device (remote control?) (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
} }
break; break;
default: default:
printf("unknown type device, (handler %d)", aprint_normal("unknown type device, (handler %d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
#endif /* DIAGNOSTIC */ #endif /* DIAGNOSTIC */
} }
} else /* a device matched and was configured */ } else /* a device matched and was configured */
printf(" addr %d: ", aa_args->adbaddr); aprint_normal(" addr %d: ", aa_args->adbaddr);
return (rv); return (rv);
} }

28
sys/arch/macppc/dev/adb.c
View File

@ -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 * Copyright (C) 1994 Bradley A. Grantham
@ -186,23 +186,25 @@ adbprint(args, name)
rv = UNSUPP; /* most ADB device types are unsupported */ rv = UNSUPP; /* most ADB device types are unsupported */
/* print out what kind of ADB device we have found */ /* 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) { switch(aa_args->origaddr) {
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
case 0: case 0:
printf("ADB event device"); aprint_normal("ADB event device");
rv = UNCONF; rv = UNCONF;
break; break;
case ADBADDR_SECURE: case ADBADDR_SECURE:
printf("security dongle (%d)", aa_args->handler_id); aprint_normal("security dongle (%d)",
aa_args->handler_id);
break; break;
#endif #endif
case ADBADDR_MAP: case ADBADDR_MAP:
printf("mapped device (%d)", aa_args->handler_id); aprint_normal("mapped device (%d)",
aa_args->handler_id);
rv = UNCONF; rv = UNCONF;
break; break;
case ADBADDR_REL: case ADBADDR_REL:
printf("relative positioning device (%d)", aprint_normal("relative positioning device (%d)",
aa_args->handler_id); aa_args->handler_id);
rv = UNCONF; rv = UNCONF;
break; break;
@ -210,37 +212,37 @@ adbprint(args, name)
case ADBADDR_ABS: case ADBADDR_ABS:
switch (aa_args->handler_id) { switch (aa_args->handler_id) {
case ADB_ARTPAD: case ADB_ARTPAD:
printf("WACOM ArtPad II"); aprint_normal("WACOM ArtPad II");
break; break;
default: default:
printf("absolute positioning device (%d)", aprint_normal("absolute positioning device (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
} }
break; break;
case ADBADDR_DATATX: case ADBADDR_DATATX:
printf("data transfer device (modem?) (%d)", aprint_normal("data transfer device (modem?) (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
case ADBADDR_MISC: case ADBADDR_MISC:
switch (aa_args->handler_id) { switch (aa_args->handler_id) {
case ADB_POWERKEY: case ADB_POWERKEY:
printf("Sophisticated Circuits PowerKey"); aprint_normal("Sophisticated Circuits PowerKey");
break; break;
default: default:
printf("misc. device (remote control?) (%d)", aprint_normal("misc. device (remote control?) (%d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
} }
break; break;
default: default:
printf("unknown type device, (handler %d)", aprint_normal("unknown type device, (handler %d)",
aa_args->handler_id); aa_args->handler_id);
break; break;
#endif /* DIAGNOSTIC */ #endif /* DIAGNOSTIC */
} }
} else /* a device matched and was configured */ } else /* a device matched and was configured */
printf(" addr %d: ", aa_args->adbaddr); aprint_normal(" addr %d: ", aa_args->adbaddr);
return rv; return rv;
} }

10
sys/arch/vax/mba/mba.c
View File

@ -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. * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
* All rights reserved. * All rights reserved.
@ -243,12 +243,12 @@ mbaprint(void *aux, const char *mbaname)
if (mbaname) { if (mbaname) {
if (ma->ma_name) if (ma->ma_name)
printf("%s", ma->ma_name); aprint_normal("%s", ma->ma_name);
else else
printf("device type %o", ma->ma_type); aprint_normal("device type %o", ma->ma_type);
printf(" at %s", mbaname); aprint_normal(" at %s", mbaname);
} }
printf(" drive %d", ma->ma_unit); aprint_normal(" drive %d", ma->ma_unit);
return (ma->ma_name ? UNCONF : UNSUPP); return (ma->ma_name ? UNCONF : UNSUPP);
} }

11
sys/arch/vax/vax/sbi.c
View File

@ -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. * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved. * All rights reserved.
@ -57,18 +57,19 @@ sbi_print(void *aux, const char *name)
if (name) { if (name) {
switch (sa->sa_type) { switch (sa->sa_type) {
case NEX_MBA: case NEX_MBA:
printf("mba at %s", name); aprint_normal("mba at %s", name);
break; break;
case NEX_CI: case NEX_CI:
printf("ci at %s", name); aprint_normal("ci at %s", name);
unsupp++; unsupp++;
break; break;
default: 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++; unsupp++;
} }
} }
printf(" tr%d", sa->sa_nexnum); aprint_normal(" tr%d", sa->sa_nexnum);
return (unsupp ? UNSUPP : UNCONF); return (unsupp ? UNSUPP : UNCONF);
} }

14
sys/dev/hpc/hpcioman.c
View File

@ -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. * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -177,7 +177,7 @@ hpcioman_print(void *aux, const char *pnp)
int type = hma->hma_type; int type = hma->hma_type;
if (!pnp) { 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_hc ? hma->hma_hc->hc_name : "not found",
hma->hma_port, type, hma->hma_id); hma->hma_port, type, hma->hma_id);
if (type == CONFIG_HOOK_BUTTONEVENT || if (type == CONFIG_HOOK_BUTTONEVENT ||
@ -185,20 +185,20 @@ hpcioman_print(void *aux, const char *pnp)
type == CONFIG_HOOK_EVENT || type == CONFIG_HOOK_EVENT ||
type == CONFIG_HOOK_PCIINTR) { type == CONFIG_HOOK_PCIINTR) {
if (hma->hma_intr_mode & HPCIO_INTR_EDGE) 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) (hma->hma_intr_mode&HPCIO_INTR_POSEDGE)
? "p" : "", ? "p" : "",
(hma->hma_intr_mode&HPCIO_INTR_NEGEDGE) (hma->hma_intr_mode&HPCIO_INTR_NEGEDGE)
? "n" : ""); ? "n" : "");
else else
printf (", interrupt level %s", aprint_normal (", interrupt level %s",
(hma->hma_intr_mode&HPCIO_INTR_HIGH) ? (hma->hma_intr_mode&HPCIO_INTR_HIGH) ?
"high" : "low"); "high" : "low");
} }
if (hma->hma_initvalue != -1) 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) if (hma->hma_on == 0)
printf(", active low"); aprint_normal(", active low");
} }
return (QUIET); return (QUIET);

6
sys/dev/ic/pckbc.c
View File

@ -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 * Copyright (c) 1998
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -440,7 +440,7 @@ pckbcprint(aux, pnp)
struct pckbc_attach_args *pa = aux; struct pckbc_attach_args *pa = aux;
if (!pnp) if (!pnp)
printf(" (%s slot)", pckbc_slot_names[pa->pa_slot]); aprint_normal(" (%s slot)", pckbc_slot_names[pa->pa_slot]);
return (QUIET); return (QUIET);
} }

6
sys/dev/isa/fd.c
View File

@ -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. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -92,7 +92,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__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 "rnd.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -335,7 +335,7 @@ fdprint(aux, fdc)
register struct fdc_attach_args *fa = aux; register struct fdc_attach_args *fa = aux;
if (!fdc) if (!fdc)
printf(" drive %d", fa->fa_drive); aprint_normal(" drive %d", fa->fa_drive);
return QUIET; return QUIET;
} }