Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Use aprint_normal() in cfprint routines.
details: https://anonhg.NetBSD.org/src/rev/88722b4bb026
branches: trunk
changeset: 541053:88722b4bb026
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Jan 01 00:10:15 2003 +0000
description:
Use aprint_normal() in cfprint routines.
diffstat:
sys/dev/acpi/acpi.c | 16 ++++++++--------
sys/dev/audio.c | 6 +++---
sys/dev/bi/bi.c | 18 +++++++++---------
sys/dev/bi/kdb.c | 6 +++---
sys/dev/bluetooth/bluetooth.c | 4 ++--
sys/dev/cardbus/cardbus.c | 21 +++++++++------------
sys/dev/cardbus/cardslot.c | 9 +++++----
sys/dev/cardbus/rbus_ppb.c | 8 ++++----
sys/dev/eisa/eisa.c | 8 ++++----
sys/dev/hpc/hpcfb.c | 8 ++++----
sys/dev/i2o/iop.c | 8 ++++----
sys/dev/ic/aac.c | 8 ++++----
sys/dev/ic/cac.c | 8 ++++----
sys/dev/ic/cpc700.c | 10 +++++-----
sys/dev/ic/depca.c | 6 +++---
sys/dev/ic/i82365.c | 14 +++++++-------
sys/dev/ic/icp.c | 8 ++++----
sys/dev/ic/mlx.c | 8 ++++----
sys/dev/ic/tcic2.c | 10 +++++-----
sys/dev/ic/upc.c | 8 ++++----
sys/dev/ic/wdc.c | 8 ++++----
sys/dev/ieee1394/fwnode.c | 6 +++---
sys/dev/ieee1394/fwohci.c | 6 +++---
sys/dev/ir/ir.c | 4 ++--
sys/dev/isa/addcom_isa.c | 8 ++++----
sys/dev/isa/ast.c | 8 ++++----
sys/dev/isa/boca.c | 8 ++++----
sys/dev/isa/ioat66.c | 8 ++++----
sys/dev/isa/isa.c | 34 +++++++++++++++++-----------------
sys/dev/isa/moxa_isa.c | 8 ++++----
sys/dev/isa/rtfps.c | 8 ++++----
sys/dev/isa/tcom.c | 8 ++++----
sys/dev/isapnp/isapnp.c | 14 +++++++-------
sys/dev/mca/mca.c | 8 ++++----
sys/dev/mii/mii.c | 8 ++++----
sys/dev/mscp/mscp_subr.c | 11 ++++++-----
sys/dev/mvme/pcctwo.c | 8 ++++----
sys/dev/ofisa/ofisa.c | 8 ++++----
sys/dev/ofw/ofbus.c | 8 ++++----
sys/dev/pci/amr.c | 8 ++++----
sys/dev/pci/eso.c | 6 +++---
sys/dev/pci/pccbb.c | 6 +++---
sys/dev/pci/pci.c | 8 ++++----
sys/dev/pci/ppb.c | 8 ++++----
sys/dev/pci/puc.c | 8 ++++----
sys/dev/pci/twe.c | 8 ++++----
sys/dev/pci/viapm.c | 6 +++---
sys/dev/pcmcia/mhzc.c | 6 +++---
sys/dev/pcmcia/pcmcia.c | 8 ++++----
sys/dev/pcmcia/pcmcom.c | 8 ++++----
sys/dev/qbus/rl.c | 9 +++++----
sys/dev/qbus/uba.c | 6 +++---
sys/dev/qbus/uda.c | 6 +++---
sys/dev/radio.c | 6 +++---
sys/dev/sbus/stp4020.c | 6 +++---
sys/dev/sbus/xbox.c | 6 +++---
sys/dev/scsipi/atapiconf.c | 12 ++++++------
sys/dev/scsipi/scsiconf.c | 12 ++++++------
sys/dev/tc/ioasic_subr.c | 8 ++++----
sys/dev/tc/tc.c | 8 ++++----
sys/dev/tc/tcds.c | 8 ++++----
sys/dev/tc/zs_ioasic.c | 8 ++++----
sys/dev/usb/ucom.c | 8 ++++----
sys/dev/usb/uhidev.c | 6 +++---
sys/dev/usb/umass_isdata.c | 8 ++++----
sys/dev/usb/umass_scsipi.c | 8 ++++----
sys/dev/usb/usb.c | 6 +++---
sys/dev/usb/usb_subr.c | 18 +++++++++---------
sys/dev/vme/vme.c | 14 +++++++-------
sys/dev/wscons/wsdisplay.c | 10 +++++-----
sys/dev/wscons/wskbd.c | 8 ++++----
sys/dev/wscons/wsmouse.c | 6 +++---
sys/dev/xmi/xmi.c | 10 +++++-----
73 files changed, 324 insertions(+), 324 deletions(-)
diffs (truncated from 2352 to 300 lines):
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/acpi/acpi.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.23 2002/12/31 11:23:34 augustss Exp $ */
+/* $NetBSD: acpi.c,v 1.24 2003/01/01 00:10:16 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.23 2002/12/31 11:23:34 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.24 2003/01/01 00:10:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -561,25 +561,25 @@
#endif
if (pnp) {
- printf("%s ", aa->aa_node->ad_devinfo.HardwareId);
+ aprint_normal("%s ", aa->aa_node->ad_devinfo.HardwareId);
#if 0 /* Not until we fix acpi_eval_string */
if (acpi_eval_string(aa->aa_node->ad_handle,
"_STR", &str) == AE_OK) {
- printf("[%s] ", str);
+ aprint_normal("[%s] ", str);
AcpiOsFree(str);
}
#endif
- printf("at %s", pnp);
+ aprint_normal("at %s", pnp);
} else {
- printf(" (%s", aa->aa_node->ad_devinfo.HardwareId);
+ aprint_normal(" (%s", aa->aa_node->ad_devinfo.HardwareId);
if (aa->aa_node->ad_devinfo.Valid & ACPI_VALID_UID) {
if (aa->aa_node->ad_devinfo.UniqueId[0] == '\0')
uid = "<null>";
else
uid = aa->aa_node->ad_devinfo.UniqueId;
- printf("-%s", uid);
+ aprint_normal("-%s", uid);
}
- printf(")");
+ aprint_normal(")");
}
return (UNCONF);
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/audio.c
--- a/sys/dev/audio.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/audio.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.171 2002/12/31 00:33:10 augustss Exp $ */
+/* $NetBSD: audio.c,v 1.172 2003/01/01 00:10:15 thorpej Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.171 2002/12/31 00:33:10 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.172 2003/01/01 00:10:15 thorpej Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -3354,7 +3354,7 @@
default:
panic("audioprint: unknown type %d", arg->type);
}
- printf("%s at %s", type, pnp);
+ aprint_normal("%s at %s", type, pnp);
}
return (UNCONF);
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/bi/bi.c
--- a/sys/dev/bi/bi.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/bi/bi.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bi.c,v 1.17 2001/11/13 12:51:34 lukem Exp $ */
+/* $NetBSD: bi.c,v 1.18 2003/01/01 00:10:16 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.17 2001/11/13 12:51:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.18 2003/01/01 00:10:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,23 +89,23 @@
if (name) {
if (bl->bl_nr == 0)
- printf("unknown device 0x%x", nr);
+ aprint_normal("unknown device 0x%x", nr);
else
- printf(bl->bl_name);
- printf(" at %s", name);
+ aprint_normal(bl->bl_name);
+ aprint_normal(" at %s", name);
}
- printf(" node %d", ba->ba_nodenr);
+ aprint_normal(" node %d", ba->ba_nodenr);
if (bl->bl_havedriver & DT_VEC)
- printf(" vec %o", ba->ba_ivec & 511);
+ aprint_normal(" vec %o", ba->ba_ivec & 511);
#ifdef DEBUG
if (bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_SADR) &&
bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_EADR))
- printf(" [sadr %x eadr %x]",
+ aprint_debug(" [sadr %x eadr %x]",
bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_SADR),
bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_EADR));
#endif
if (bl->bl_havedriver & DT_QUIET)
- printf("\n");
+ aprint_normal("\n");
return bl->bl_havedriver & DT_QUIET ? QUIET :
bl->bl_havedriver & DT_HAVDRV ? UNCONF : UNSUPP;
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/bi/kdb.c
--- a/sys/dev/bi/kdb.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/bi/kdb.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kdb.c,v 1.29 2002/10/02 16:33:38 thorpej Exp $ */
+/* $NetBSD: kdb.c,v 1.30 2003/01/01 00:10:16 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.29 2002/10/02 16:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.30 2003/01/01 00:10:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -116,7 +116,7 @@
const char *name;
{
if (name)
- printf("%s: mscpbus", name);
+ aprint_normal("%s: mscpbus", name);
return UNCONF;
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/bluetooth/bluetooth.c
--- a/sys/dev/bluetooth/bluetooth.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/bluetooth/bluetooth.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bluetooth.c,v 1.1 2002/08/24 17:30:13 augustss Exp $ */
+/* $NetBSD: bluetooth.c,v 1.2 2003/01/01 00:10:17 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
/*struct bt_attach_args *bt = aux;*/
if (pnp != NULL)
- printf("bthci at %s", pnp);
+ aprint_normal("bthci at %s", pnp);
return (UNCONF);
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/cardbus/cardbus.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.46 2002/10/02 16:33:40 thorpej Exp $ */
+/* $NetBSD: cardbus.c,v 1.47 2003/01/01 00:10:17 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.46 2002/10/02 16:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.47 2003/01/01 00:10:17 thorpej Exp $");
#include "opt_cardbus.h"
@@ -596,18 +596,15 @@
if (ca->ca_cis.cis1_info[i] == NULL)
break;
if (i)
- printf(", ");
- printf("%s", ca->ca_cis.cis1_info[i]);
+ aprint_normal(", ");
+ aprint_normal("%s", ca->ca_cis.cis1_info[i]);
}
- if (bootverbose) {
- if (i)
- printf(" ");
- printf("(manufacturer 0x%x, product 0x%x)",
- ca->ca_cis.manufacturer, ca->ca_cis.product);
- }
- printf(" %s at %s", devinfo, pnp);
+ aprint_verbose("%s(manufacturer 0x%x, product 0x%x)",
+ i ? " " : "",
+ ca->ca_cis.manufacturer, ca->ca_cis.product);
+ aprint_normal(" %s at %s", devinfo, pnp);
}
- printf(" dev %d function %d", ca->ca_device, ca->ca_function);
+ aprint_normal(" dev %d function %d", ca->ca_device, ca->ca_function);
return (UNCONF);
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/cardbus/cardslot.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.21 2002/10/02 16:33:40 thorpej Exp $ */
+/* $NetBSD: cardslot.c,v 1.22 2003/01/01 00:10:17 thorpej Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.21 2002/10/02 16:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.22 2003/01/01 00:10:17 thorpej Exp $");
#include "opt_cardslot.h"
@@ -169,7 +169,8 @@
struct cbslot_attach_args *cba = aux;
if (pnp) {
- printf("cardbus at %s subordinate bus %d", pnp, cba->cba_bus);
+ aprint_normal("cardbus at %s subordinate bus %d",
+ pnp, cba->cba_bus);
}
return UNCONF;
@@ -204,7 +205,7 @@
{
if (pnp) {
- printf("pcmciabus at %s", pnp);
+ aprint_normal("pcmciabus at %s", pnp);
}
return UNCONF;
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/cardbus/rbus_ppb.c
--- a/sys/dev/cardbus/rbus_ppb.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/cardbus/rbus_ppb.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.8 2002/10/02 16:33:43 thorpej Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.9 2003/01/01 00:10:17 thorpej Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.8 2002/10/02 16:33:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.9 2003/01/01 00:10:17 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,8 +170,8 @@
/* only PCIs can attach to PPBs; easy. */
if (pnp)
- printf("pci at %s", pnp);
- printf(" bus %d (rbus)", pba->pba_bus);
+ aprint_normal("pci at %s", pnp);
+ aprint_normal(" bus %d (rbus)", pba->pba_bus);
return (UNCONF);
}
diff -r 04774bb2cdd5 -r 88722b4bb026 sys/dev/eisa/eisa.c
--- a/sys/dev/eisa/eisa.c Wed Jan 01 00:00:13 2003 +0000
+++ b/sys/dev/eisa/eisa.c Wed Jan 01 00:10:15 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa.c,v 1.30 2002/10/02 16:33:47 thorpej Exp $ */
+/* $NetBSD: eisa.c,v 1.31 2003/01/01 00:10:17 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.30 2002/10/02 16:33:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.31 2003/01/01 00:10:17 thorpej Exp $");
#include "opt_eisaverbose.h"
@@ -84,9 +84,9 @@
Home |
Main Index |
Thread Index |
Old Index