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

Use aprint_normal() in cfprint routines.

This commit is contained in:
thorpej 2003-01-01 00:10:15 +00:00
parent d73e77b28c
commit 72a7af27b0
73 changed files with 324 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/acpi/acpi.c
View File

@ -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 @@ acpi_print(void *aux, const char *pnp)
#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);

6
sys/dev/audio.c
View File

@ -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 @@ audioprint(void *aux, const char *pnp)
default:
panic("audioprint: unknown type %d", arg->type);
}
printf("%s at %s", type, pnp);
aprint_normal("%s at %s", type, pnp);
}
return (UNCONF);
}

18
sys/dev/bi/bi.c
View File

@ -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 @@ bi_print(aux, name)
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;
}

6
sys/dev/bi/kdb.c
View File

@ -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 @@ kdbprint(aux, name)
const char *name;
{
if (name)
printf("%s: mscpbus", name);
aprint_normal("%s: mscpbus", name);
return UNCONF;
}

4
sys/dev/bluetooth/bluetooth.c
View File

@ -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 @@ bt_print(void *aux, const char *pnp)
/*struct bt_attach_args *bt = aux;*/
if (pnp != NULL)
printf("bthci at %s", pnp);
aprint_normal("bthci at %s", pnp);
return (UNCONF);
}

21
sys/dev/cardbus/cardbus.c
View File

@ -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 @@ cardbusprint(void *aux, const char *pnp)
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);
}

9
sys/dev/cardbus/cardslot.c
View File

@ -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 @@ cardslot_cb_print(aux, pnp)
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 @@ cardslot_16_print(arg, pnp)
{
if (pnp) {
printf("pcmciabus at %s", pnp);
aprint_normal("pcmciabus at %s", pnp);
}
return UNCONF;

8
sys/dev/cardbus/rbus_ppb.c
View File

@ -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 @@ rppbprint(aux, pnp)
/* 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);
}

8
sys/dev/eisa/eisa.c
View File

@ -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 @@ eisaprint(void *aux, const char *pnp)
if (pnp) {
eisa_devinfo(ea->ea_idstring, devinfo);
printf("%s at %s", devinfo, pnp);
aprint_normal("%s at %s", devinfo, pnp);
}
printf(" slot %d", ea->ea_slot);
aprint_normal(" slot %d", ea->ea_slot);
return (UNCONF);
}

8
sys/dev/hpc/hpcfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcfb.c,v 1.27 2002/10/02 16:33:49 thorpej Exp $ */
/* $NetBSD: hpcfb.c,v 1.28 2003/01/01 00:10:17 thorpej Exp $ */
/*-
* Copyright (c) 1999
@ -43,13 +43,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.27 2002/10/02 16:33:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.28 2003/01/01 00:10:17 thorpej Exp $");
#define FBDEBUG
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
"$NetBSD: hpcfb.c,v 1.27 2002/10/02 16:33:49 thorpej Exp $";
"$NetBSD: hpcfb.c,v 1.28 2003/01/01 00:10:17 thorpej Exp $";
#include <sys/param.h>
#include <sys/systm.h>
@ -383,7 +383,7 @@ int
hpcfbprint(void *aux, const char *pnp)
{
if (pnp)
printf("hpcfb at %s", pnp);
aprint_normal("hpcfb at %s", pnp);
return (UNCONF);
}

8
sys/dev/i2o/iop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iop.c,v 1.32 2002/12/11 13:02:31 ad Exp $ */
/* $NetBSD: iop.c,v 1.33 2003/01/01 00:10:18 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.32 2002/12/11 13:02:31 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.33 2003/01/01 00:10:18 thorpej Exp $");
#include "opt_i2o.h"
#include "iop.h"
@ -880,9 +880,9 @@ iop_print(void *aux, const char *pnp)
if (pnp != NULL) {
iop_devinfo(ia->ia_class, devinfo);
printf("%s at %s", devinfo, pnp);
aprint_normal("%s at %s", devinfo, pnp);
}
printf(" tid %d", ia->ia_tid);
aprint_normal(" tid %d", ia->ia_tid);
return (UNCONF);
}

8
sys/dev/ic/aac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aac.c,v 1.6 2002/11/25 20:29:14 fvdl Exp $ */
/* $NetBSD: aac.c,v 1.7 2003/01/01 00:10:18 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.6 2002/11/25 20:29:14 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.7 2003/01/01 00:10:18 thorpej Exp $");
#include "locators.h"
@ -291,8 +291,8 @@ aac_print(void *aux, const char *pnp)
aaca = aux;
if (pnp != NULL)
printf("block device at %s", pnp);
printf(" unit %d", aaca->aaca_unit);
aprint_normal("block device at %s", pnp);
aprint_normal(" unit %d", aaca->aaca_unit);
return (UNCONF);
}

8
sys/dev/ic/cac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cac.c,v 1.22 2002/09/27 03:18:11 thorpej Exp $ */
/* $NetBSD: cac.c,v 1.23 2003/01/01 00:10:18 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.22 2002/09/27 03:18:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.23 2003/01/01 00:10:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -222,8 +222,8 @@ cac_print(void *aux, const char *pnp)
caca = (struct cac_attach_args *)aux;
if (pnp != NULL)
printf("block device at %s", pnp);
printf(" unit %d", caca->caca_unit);
aprint_normal("block device at %s", pnp);
aprint_normal(" unit %d", caca->caca_unit);
return (UNCONF);
}

10
sys/dev/ic/cpc700.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpc700.c,v 1.4 2002/09/27 03:18:11 thorpej Exp $ */
/* $NetBSD: cpc700.c,v 1.5 2003/01/01 00:10:18 thorpej Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -99,11 +99,11 @@ cpc_print(void *aux, const char *pnp)
struct cpcbus_attach_args *caa = aux;
if (pnp)
printf("%s at %s", caa->cpca_name, pnp);
aprint_normal("%s at %s", caa->cpca_name, pnp);
printf(" addr 0x%08x", caa->cpca_addr);
aprint_normal(" addr 0x%08x", caa->cpca_addr);
if (caa->cpca_irq != CPCBUSCF_IRQ_DEFAULT)
printf(" irq %d", caa->cpca_irq);
aprint_normal(" irq %d", caa->cpca_irq);
return (UNCONF);
}
@ -114,7 +114,7 @@ cpcpci_print(void *aux, const char *pnp)
union attach_args *aa = aux;
if (pnp)
printf("%s at %s", aa->busname, pnp);
aprint_normal("%s at %s", aa->busname, pnp);
return (UNCONF);
}

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

@ -1,4 +1,4 @@
/* $NetBSD: depca.c,v 1.8 2002/10/02 16:33:32 thorpej Exp $ */
/* $NetBSD: depca.c,v 1.9 2003/01/01 00:10:18 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.8 2002/10/02 16:33:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.9 2003/01/01 00:10:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -141,7 +141,7 @@ depca_print(void *aux, const char *pnp)
struct depca_attach_args *da = aux;
if (pnp)
printf("%s at %s", da->da_name, pnp);
aprint_normal("%s at %s", da->da_name, pnp);
return (UNCONF);
}

14
sys/dev/ic/i82365.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.69 2002/11/24 02:46:55 takemura Exp $ */
/* $NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.69 2002/11/24 02:46:55 takemura Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.70 2003/01/01 00:10:18 thorpej Exp $");
#define PCICDEBUG
@ -690,20 +690,20 @@ pcic_print(arg, pnp)
/* Only "pcmcia"s can attach to "pcic"s... easy. */
if (pnp)
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
switch (h->sock) {
case C0SA:
printf(" controller 0 socket 0");
aprint_normal(" controller 0 socket 0");
break;
case C0SB:
printf(" controller 0 socket 1");
aprint_normal(" controller 0 socket 1");
break;
case C1SA:
printf(" controller 1 socket 0");
aprint_normal(" controller 1 socket 0");
break;
case C1SB:
printf(" controller 1 socket 1");
aprint_normal(" controller 1 socket 1");
break;
default:
panic("unknown pcic socket");

8
sys/dev/ic/icp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icp.c,v 1.5 2002/10/22 01:25:28 simonb Exp $ */
/* $NetBSD: icp.c,v 1.6 2003/01/01 00:10:18 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.5 2002/10/22 01:25:28 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.6 2003/01/01 00:10:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -429,9 +429,9 @@ icp_print(void *aux, const char *pnp)
str = "block device";
else
str = "SCSI channel";
printf("%s at %s", str, pnp);
aprint_normal("%s at %s", str, pnp);
}
printf(" unit %d", icpa->icpa_unit);
aprint_normal(" unit %d", icpa->icpa_unit);
return (UNCONF);
}

8
sys/dev/ic/mlx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mlx.c,v 1.25 2002/10/23 09:13:17 jdolecek Exp $ */
/* $NetBSD: mlx.c,v 1.26 2003/01/01 00:10:19 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.25 2002/10/23 09:13:17 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.26 2003/01/01 00:10:19 thorpej Exp $");
#include "ld.h"
@ -661,8 +661,8 @@ mlx_print(void *aux, const char *pnp)
mlxa = (struct mlx_attach_args *)aux;
if (pnp != NULL)
printf("block device at %s", pnp);
printf(" unit %d", mlxa->mlxa_unit);
aprint_normal("block device at %s", pnp);
aprint_normal(" unit %d", mlxa->mlxa_unit);
return (UNCONF);
}

10
sys/dev/ic/tcic2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcic2.c,v 1.11 2002/09/27 03:18:13 thorpej Exp $ */
/* $NetBSD: tcic2.c,v 1.12 2003/01/01 00:10:19 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.11 2002/09/27 03:18:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.12 2003/01/01 00:10:19 thorpej Exp $");
#undef TCICDEBUG
@ -580,14 +580,14 @@ tcic_print(arg, pnp)
/* Only "pcmcia"s can attach to "tcic"s... easy. */
if (pnp)
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
switch (h->sock) {
case 0:
printf(" socket 0");
aprint_normal(" socket 0");
break;
case 1:
printf(" socket 1");
aprint_normal(" socket 1");
break;
default:
panic("unknown tcic socket");

8
sys/dev/ic/upc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: upc.c,v 1.4 2002/09/27 03:18:13 thorpej Exp $ */
/* $NetBSD: upc.c,v 1.5 2003/01/01 00:10:19 thorpej Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.4 2002/09/27 03:18:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.5 2003/01/01 00:10:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -211,8 +211,8 @@ upc_print(void *aux, char const *pnp)
struct upc_attach_args *ua = aux;
if (pnp)
printf("%s at %s", ua->ua_devtype, pnp);
printf(" offset 0x%x", ua->ua_offset);
aprint_normal("%s at %s", ua->ua_devtype, pnp);
aprint_normal(" offset 0x%x", ua->ua_offset);
return UNCONF;
}

8
sys/dev/ic/wdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc.c,v 1.119 2002/12/06 14:05:34 drochner Exp $ */
/* $NetBSD: wdc.c,v 1.120 2003/01/01 00:10:19 thorpej Exp $ */
/*
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.119 2002/12/06 14:05:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.120 2003/01/01 00:10:19 thorpej Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
@ -162,8 +162,8 @@ wdprint(aux, pnp)
{
struct ata_device *adev = aux;
if (pnp)
printf("wd at %s", pnp);
printf(" channel %d drive %d", adev->adev_channel,
aprint_normal("wd at %s", pnp);
aprint_normal(" channel %d drive %d", adev->adev_channel,
adev->adev_drv_data->drive);
return (UNCONF);
}

6
sys/dev/ieee1394/fwnode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwnode.c,v 1.18 2002/11/22 16:20:17 jmc Exp $ */
/* $NetBSD: fwnode.c,v 1.19 2003/01/01 00:10:19 thorpej Exp $ */
/*
* Copyright (c) 2001,2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fwnode.c,v 1.18 2002/11/22 16:20:17 jmc Exp $");
__KERNEL_RCSID(0, "$NetBSD: fwnode.c,v 1.19 2003/01/01 00:10:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -289,7 +289,7 @@ static int
fwnode_print(void *aux, const char *pnp)
{
if (pnp)
printf("Unknown device at %s", pnp);
aprint_normal("Unknown device at %s", pnp);
return UNCONF;
}

6
sys/dev/ieee1394/fwohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohci.c,v 1.68 2002/12/19 02:15:31 jmc Exp $ */
/* $NetBSD: fwohci.c,v 1.69 2003/01/01 00:10:19 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.68 2002/12/19 02:15:31 jmc Exp $");
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.69 2003/01/01 00:10:19 thorpej Exp $");
#define FWOHCI_WAIT_DEBUG 1
@ -738,7 +738,7 @@ fwohci_print(void *aux, const char *pnp)
char *name = aux;
if (pnp)
printf("%s at %s", name, pnp);
aprint_normal("%s at %s", name, pnp);
return UNCONF;
}

4
sys/dev/ir/ir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ir.c,v 1.1 2001/12/02 10:44:43 augustss Exp $ */
/* $NetBSD: ir.c,v 1.2 2003/01/01 00:10:20 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -58,7 +58,7 @@ ir_print(void *aux, const char *pnp)
type = "cir";
break;
}
printf("%s at %s", type, pnp);
aprint_normal("%s at %s", type, pnp);
}
return (UNCONF);

8
sys/dev/isa/addcom_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: addcom_isa.c,v 1.7 2002/10/02 03:10:45 thorpej Exp $ */
/* $NetBSD: addcom_isa.c,v 1.8 2003/01/01 00:10:20 thorpej Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.7 2002/10/02 03:10:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.8 2003/01/01 00:10:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -190,8 +190,8 @@ addcomprint(void *aux, const char *pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

8
sys/dev/isa/ast.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.51 2002/10/02 03:10:45 thorpej Exp $ */
/* $NetBSD: ast.c,v 1.52 2003/01/01 00:10:20 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.51 2002/10/02 03:10:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.52 2003/01/01 00:10:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -153,8 +153,8 @@ astprint(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

8
sys/dev/isa/boca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boca.c,v 1.40 2002/11/17 22:49:56 chs Exp $ */
/* $NetBSD: boca.c,v 1.41 2003/01/01 00:10:20 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.40 2002/11/17 22:49:56 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.41 2003/01/01 00:10:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -158,8 +158,8 @@ bocaprint(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

8
sys/dev/isa/ioat66.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioat66.c,v 1.5 2002/10/02 03:10:48 thorpej Exp $ */
/* $NetBSD: ioat66.c,v 1.6 2003/01/01 00:10:20 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.5 2002/10/02 03:10:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.6 2003/01/01 00:10:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -140,8 +140,8 @@ ioat66print(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

34
sys/dev/isa/isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isa.c,v 1.115 2002/10/02 03:10:48 thorpej Exp $ */
/* $NetBSD: isa.c,v 1.116 2003/01/01 00:10:20 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.115 2002/10/02 03:10:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.116 2003/01/01 00:10:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -268,27 +268,27 @@ isaprint(void *aux, const char *isa)
struct isa_pnpname *ipn;
if (ia->ia_pnpname != NULL)
printf("%s", ia->ia_pnpname);
aprint_normal("%s", ia->ia_pnpname);
if ((ipn = ia->ia_pnpcompatnames) != NULL) {
printf(" ("); /* ) */
aprint_normal(" ("); /* ) */
for (sep = ""; ipn != NULL;
ipn = ipn->ipn_next, sep = " ") {
printf("%s%s", sep, ipn->ipn_name);
aprint_normal("%s%s", sep, ipn->ipn_name);
}
/* ( */ printf(")");
/* ( */ aprint_normal(")");
}
printf(" at %s", isa);
aprint_normal(" at %s", isa);
}
if (ia->ia_nio) {
sep = "";
printf(" port ");
aprint_normal(" port ");
for (i = 0; i < ia->ia_nio; i++) {
if (ia->ia_io[i].ir_size == 0)
continue;
printf("%s0x%x", sep, ia->ia_io[i].ir_addr);
aprint_normal("%s0x%x", sep, ia->ia_io[i].ir_addr);
if (ia->ia_io[i].ir_size > 1)
printf("-0x%x", ia->ia_io[i].ir_addr +
aprint_normal("-0x%x", ia->ia_io[i].ir_addr +
ia->ia_io[i].ir_size - 1);
sep = ",";
}
@ -296,13 +296,13 @@ isaprint(void *aux, const char *isa)
if (ia->ia_niomem) {
sep = "";
printf(" iomem ");
aprint_normal(" iomem ");
for (i = 0; i < ia->ia_niomem; i++) {
if (ia->ia_iomem[i].ir_size == 0)
continue;
printf("%s0x%x", sep, ia->ia_iomem[i].ir_addr);
aprint_normal("%s0x%x", sep, ia->ia_iomem[i].ir_addr);
if (ia->ia_iomem[i].ir_size > 1)
printf("-0x%x", ia->ia_iomem[i].ir_addr +
aprint_normal("-0x%x", ia->ia_iomem[i].ir_addr +
ia->ia_iomem[i].ir_size - 1);
sep = ",";
}
@ -310,22 +310,22 @@ isaprint(void *aux, const char *isa)
if (ia->ia_nirq) {
sep = "";
printf(" irq ");
aprint_normal(" irq ");
for (i = 0; i < ia->ia_nirq; i++) {
if (ia->ia_irq[i].ir_irq == ISACF_IRQ_DEFAULT)
continue;
printf("%s%d", sep, ia->ia_irq[i].ir_irq);
aprint_normal("%s%d", sep, ia->ia_irq[i].ir_irq);
sep = ",";
}
}
if (ia->ia_ndrq) {
sep = "";
printf(" drq ");
aprint_normal(" drq ");
for (i = 0; i < ia->ia_ndrq; i++) {
if (ia->ia_drq[i].ir_drq == ISACF_DRQ_DEFAULT)
continue;
printf("%s%d", sep, ia->ia_drq[i].ir_drq);
aprint_normal("%s%d", sep, ia->ia_drq[i].ir_drq);
sep = ",";
}
}

8
sys/dev/isa/moxa_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: moxa_isa.c,v 1.6 2002/10/02 03:10:49 thorpej Exp $ */
/* $NetBSD: moxa_isa.c,v 1.7 2003/01/01 00:10:21 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.6 2002/10/02 03:10:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.7 2003/01/01 00:10:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -152,8 +152,8 @@ moxa_isaprint(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

8
sys/dev/isa/rtfps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtfps.c,v 1.45 2002/10/02 03:10:50 thorpej Exp $ */
/* $NetBSD: rtfps.c,v 1.46 2003/01/01 00:10:21 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.45 2002/10/02 03:10:50 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.46 2003/01/01 00:10:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -151,8 +151,8 @@ rtfpsprint(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

8
sys/dev/isa/tcom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcom.c,v 1.6 2002/10/02 03:10:50 thorpej Exp $ */
/* $NetBSD: tcom.c,v 1.7 2003/01/01 00:10:21 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.6 2002/10/02 03:10:50 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.7 2003/01/01 00:10:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -198,8 +198,8 @@ tcomprint(aux, pnp)
struct commulti_attach_args *ca = aux;
if (pnp)
printf("com at %s", pnp);
printf(" slave %d", ca->ca_slave);
aprint_normal("com at %s", pnp);
aprint_normal(" slave %d", ca->ca_slave);
return (UNCONF);
}

14
sys/dev/isapnp/isapnp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isapnp.c,v 1.40 2002/10/02 16:34:03 thorpej Exp $ */
/* $NetBSD: isapnp.c,v 1.41 2003/01/01 00:10:21 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.40 2002/10/02 16:34:03 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.41 2003/01/01 00:10:21 thorpej Exp $");
#include "isadma.h"
@ -538,13 +538,13 @@ isapnp_print_region(str, r, n)
if (n == 0)
return;
printf(" %s ", str);
aprint_normal(" %s ", str);
for (i = 0; i < n; i++, r++) {
printf("0x%x", r->base);
aprint_normal("0x%x", r->base);
if (r->length)
printf("/%d", r->length);
aprint_normal("/%d", r->length);
if (i != n - 1)
printf(",");
aprint_normal(",");
}
}
@ -583,7 +583,7 @@ isapnp_print(aux, str)
struct isapnp_attach_args *ipa = aux;
if (str != NULL)
printf("%s: <%s, %s, %s, %s>",
aprint_normal("%s: <%s, %s, %s, %s>",
str, ipa->ipa_devident, ipa->ipa_devlogic,
ipa->ipa_devcompat, ipa->ipa_devclass);

8
sys/dev/mca/mca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mca.c,v 1.12 2002/10/02 16:34:13 thorpej Exp $ */
/* $NetBSD: mca.c,v 1.13 2003/01/01 00:10:21 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.12 2002/10/02 16:34:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.13 2003/01/01 00:10:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,7 +93,7 @@ mca_print(aux, pnp)
if (pnp) {
mca_devinfo(ma->ma_id, devinfo);
printf("%s slot %d: %s", pnp, ma->ma_slot + 1, devinfo);
aprint_normal("%s slot %d: %s", pnp, ma->ma_slot + 1, devinfo);
}
/*
@ -110,7 +110,7 @@ mca_print(aux, pnp)
case MCA_PRODUCT_IBMRAM2: case MCA_PRODUCT_IBMRAM3:
case MCA_PRODUCT_IBMRAM4: case MCA_PRODUCT_IBMRAM5:
case MCA_PRODUCT_IBMRAM6: case MCA_PRODUCT_IBMRAM7:
printf(": memory configured\n");
aprint_normal(": memory configured\n");
return (QUIET);
default:
return (UNCONF);

8
sys/dev/mii/mii.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mii.c,v 1.32 2002/11/07 07:41:22 thorpej Exp $ */
/* $NetBSD: mii.c,v 1.33 2003/01/01 00:10:21 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.32 2002/11/07 07:41:22 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.33 2003/01/01 00:10:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -220,11 +220,11 @@ mii_print(void *aux, const char *pnp)
struct mii_attach_args *ma = aux;
if (pnp != NULL)
printf("OUI 0x%06x model 0x%04x rev %d at %s",
aprint_normal("OUI 0x%06x model 0x%04x rev %d at %s",
MII_OUI(ma->mii_id1, ma->mii_id2), MII_MODEL(ma->mii_id2),
MII_REV(ma->mii_id2), pnp);
printf(" phy %d", ma->mii_phyno);
aprint_normal(" phy %d", ma->mii_phyno);
return (UNCONF);
}

11
sys/dev/mscp/mscp_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mscp_subr.c,v 1.22 2002/10/02 16:34:24 thorpej Exp $ */
/* $NetBSD: mscp_subr.c,v 1.23 2003/01/01 00:10:22 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.22 2002/10/02 16:34:24 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.23 2003/01/01 00:10:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -466,10 +466,11 @@ mscp_print(aux, name)
int type = mp->mscp_guse.guse_mediaid;
if (name) {
printf("%c%c", MSCP_MID_CHAR(2, type), MSCP_MID_CHAR(1, type));
aprint_normal("%c%c", MSCP_MID_CHAR(2, type),
MSCP_MID_CHAR(1, type));
if (MSCP_MID_ECH(0, type))
printf("%c", MSCP_MID_CHAR(0, type));
printf("%d at %s drive %d", MSCP_MID_NUM(type), name,
aprint_normal("%c", MSCP_MID_CHAR(0, type));
aprint_normal("%d at %s drive %d", MSCP_MID_NUM(type), name,
mp->mscp_unit);
}
return UNCONF;

8
sys/dev/mvme/pcctwo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcctwo.c,v 1.1 2002/02/12 20:38:49 scw Exp $ */
/* $NetBSD: pcctwo.c,v 1.2 2003/01/01 00:10:22 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@ -124,11 +124,11 @@ pcctwoprint(aux, cp)
pa = aux;
if (cp)
printf("%s at %s", pa->pa_name, cp);
aprint_normal("%s at %s", pa->pa_name, cp);
printf(" offset 0x%lx", pa->pa_offset - pa->_pa_base);
aprint_normal(" offset 0x%lx", pa->pa_offset - pa->_pa_base);
if (pa->pa_ipl != -1)
printf(" ipl %d", pa->pa_ipl);
aprint_normal(" ipl %d", pa->pa_ipl);
return (UNCONF);
}

8
sys/dev/ofisa/ofisa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofisa.c,v 1.12 2002/10/02 16:34:30 thorpej Exp $ */
/* $NetBSD: ofisa.c,v 1.13 2003/01/01 00:10:22 thorpej Exp $ */
/*
* Copyright 1997, 1998
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.12 2002/10/02 16:34:30 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.13 2003/01/01 00:10:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,9 +71,9 @@ ofisaprint(aux, pnp)
(void)of_packagename(oba->oba_phandle, name, sizeof name);
if (pnp)
printf("%s at %s", name, pnp);
aprint_normal("%s at %s", name, pnp);
else
printf(" (%s)", name);
aprint_normal(" (%s)", name);
return UNCONF;
}

8
sys/dev/ofw/ofbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ofbus.c,v 1.16 2002/10/02 16:34:32 thorpej Exp $ */
/* $NetBSD: ofbus.c,v 1.17 2003/01/01 00:10:22 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.16 2002/10/02 16:34:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.17 2003/01/01 00:10:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -55,9 +55,9 @@ ofbus_print(aux, pnp)
struct ofbus_attach_args *oba = aux;
if (pnp)
printf("%s at %s", oba->oba_ofname, pnp);
aprint_normal("%s at %s", oba->oba_ofname, pnp);
else
printf(" (%s)", oba->oba_ofname);
aprint_normal(" (%s)", oba->oba_ofname);
return UNCONF;
}

8
sys/dev/pci/amr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amr.c,v 1.6 2002/10/02 16:51:02 thorpej Exp $ */
/* $NetBSD: amr.c,v 1.7 2003/01/01 00:10:22 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.6 2002/10/02 16:51:02 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.7 2003/01/01 00:10:22 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -444,8 +444,8 @@ amr_print(void *aux, const char *pnp)
amra = (struct amr_attach_args *)aux;
if (pnp != NULL)
printf("block device at %s", pnp);
printf(" unit %d", amra->amra_unit);
aprint_normal("block device at %s", pnp);
aprint_normal(" unit %d", amra->amra_unit);
return (UNCONF);
}

6
sys/dev/pci/eso.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eso.c,v 1.27 2002/10/02 16:51:14 thorpej Exp $ */
/* $NetBSD: eso.c,v 1.28 2003/01/01 00:10:22 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Klaus J. Klein
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.27 2002/10/02 16:51:14 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.28 2003/01/01 00:10:22 thorpej Exp $");
#include "mpu.h"
@ -427,7 +427,7 @@ eso_print(aux, pnp)
/* Only joys can attach via this; easy. */
if (pnp)
printf("joy at %s:", pnp);
aprint_normal("joy at %s:", pnp);
return (UNCONF);
}

6
sys/dev/pci/pccbb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccbb.c,v 1.85 2002/12/23 02:58:38 tsutsui Exp $ */
/* $NetBSD: pccbb.c,v 1.86 2003/01/01 00:10:23 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.85 2002/12/23 02:58:38 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.86 2003/01/01 00:10:23 thorpej Exp $");
/*
#define CBB_DEBUG
@ -1542,7 +1542,7 @@ cbbprint(aux, pcic)
struct cbslot_attach_args *cba = aux;
if (cba->cba_slot >= 0) {
printf(" slot %d", cba->cba_slot);
aprint_normal(" slot %d", cba->cba_slot);
}
*/
return UNCONF;

8
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.74 2002/10/23 01:50:12 perry Exp $ */
/* $NetBSD: pci.c,v 1.75 2003/01/01 00:10:23 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.74 2002/10/23 01:50:12 perry Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.75 2003/01/01 00:10:23 thorpej Exp $");
#include "opt_pci.h"
@ -188,9 +188,9 @@ pciprint(aux, pnp)
if (pnp) {
pci_devinfo(pa->pa_id, pa->pa_class, 1, devinfo);
printf("%s at %s", devinfo, pnp);
aprint_normal("%s at %s", devinfo, pnp);
}
printf(" dev %d function %d", pa->pa_device, pa->pa_function);
aprint_normal(" dev %d function %d", pa->pa_device, pa->pa_function);
if (pci_config_dump) {
printf(": ");
pci_conf_print(pa->pa_pc, pa->pa_tag, NULL);

8
sys/dev/pci/ppb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppb.c,v 1.24 2002/10/02 16:51:54 thorpej Exp $ */
/* $NetBSD: ppb.c,v 1.25 2003/01/01 00:10:23 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.24 2002/10/02 16:51:54 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.25 2003/01/01 00:10:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,7 +143,7 @@ ppbprint(aux, pnp)
/* only PCIs can attach to PPBs; easy. */
if (pnp)
printf("pci at %s", pnp);
printf(" bus %d", pba->pba_bus);
aprint_normal("pci at %s", pnp);
aprint_normal(" bus %d", pba->pba_bus);
return (UNCONF);
}

8
sys/dev/pci/puc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: puc.c,v 1.16 2002/10/02 16:51:54 thorpej Exp $ */
/* $NetBSD: puc.c,v 1.17 2003/01/01 00:10:23 thorpej Exp $ */
/*
* Copyright (c) 1996, 1998, 1999
@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.16 2002/10/02 16:51:54 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.17 2003/01/01 00:10:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -321,8 +321,8 @@ puc_print(aux, pnp)
struct puc_attach_args *paa = aux;
if (pnp)
printf("%s at %s", puc_port_type_name(paa->type), pnp);
printf(" port %d", paa->port);
aprint_normal("%s at %s", puc_port_type_name(paa->type), pnp);
aprint_normal(" port %d", paa->port);
return (UNCONF);
}

8
sys/dev/pci/twe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: twe.c,v 1.34 2002/12/16 18:27:20 fvdl Exp $ */
/* $NetBSD: twe.c,v 1.35 2003/01/01 00:10:23 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.34 2002/12/16 18:27:20 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.35 2003/01/01 00:10:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -480,8 +480,8 @@ twe_print(void *aux, const char *pnp)
twea = aux;
if (pnp != NULL)
printf("block device at %s", pnp);
printf(" unit %d", twea->twea_unit);
aprint_normal("block device at %s", pnp);
aprint_normal(" unit %d", twea->twea_unit);
return (UNCONF);
}

6
sys/dev/pci/viapm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: viapm.c,v 1.8 2002/10/02 16:52:00 thorpej Exp $ */
/* $NetBSD: viapm.c,v 1.9 2003/01/01 00:10:23 thorpej Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.8 2002/10/02 16:52:00 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.9 2003/01/01 00:10:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -94,7 +94,7 @@ viapm_print(void *aux, const char *pnp)
struct viapm_attach_args *vaa = aux;
if (pnp)
printf("%s at %s", viapm_device_name(vaa->va_type), pnp);
aprint_normal("%s at %s", viapm_device_name(vaa->va_type), pnp);
return UNCONF;
}

6
sys/dev/pcmcia/mhzc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mhzc.c,v 1.13 2002/10/02 16:52:19 thorpej Exp $ */
/* $NetBSD: mhzc.c,v 1.14 2003/01/01 00:10:23 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.13 2002/10/02 16:52:19 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.14 2003/01/01 00:10:23 thorpej Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@ -341,7 +341,7 @@ mhzc_print(aux, pnp)
const char *name = aux;
if (pnp)
printf("%s at %s(*)", name, pnp);
aprint_normal("%s at %s(*)", name, pnp);
return (UNCONF);
}

8
sys/dev/pcmcia/pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmcia.c,v 1.34 2002/10/02 16:52:20 thorpej Exp $ */
/* $NetBSD: pcmcia.c,v 1.35 2003/01/01 00:10:24 thorpej Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.34 2002/10/02 16:52:20 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.35 2003/01/01 00:10:24 thorpej Exp $");
#include "opt_pcmciaverbose.h"
@ -291,9 +291,9 @@ pcmcia_print(arg, pnp)
if (pnp) {
pcmcia_devinfo(card, 1, devinfo, sizeof devinfo);
printf("%s at %s, ", devinfo, pnp);
aprint_normal("%s at %s, ", devinfo, pnp);
}
printf(" function %d", pa->pf->number);
aprint_normal(" function %d", pa->pf->number);
return (UNCONF);
}

8
sys/dev/pcmcia/pcmcom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmcom.c,v 1.13 2002/10/02 16:52:21 thorpej Exp $ */
/* $NetBSD: pcmcom.c,v 1.14 2003/01/01 00:10:24 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.13 2002/10/02 16:52:21 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.14 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -344,9 +344,9 @@ pcmcom_print(aux, pnp)
/* only com's can attach to pcmcom's; easy... */
if (pnp)
printf("com at %s", pnp);
aprint_normal("com at %s", pnp);
printf(" slave %d", pca->pca_slave);
aprint_normal(" slave %d", pca->pca_slave);
return (UNCONF);
}

9
sys/dev/qbus/rl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rl.c,v 1.17 2002/10/23 09:13:37 jdolecek Exp $ */
/* $NetBSD: rl.c,v 1.18 2003/01/01 00:10:24 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.17 2002/10/23 09:13:37 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.18 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -156,8 +156,9 @@ rlcprint(void *aux, const char *name)
struct rlc_attach_args *ra = aux;
if (name)
printf("RL0%d at %s", ra->type & RLMP_DT ? '2' : '1', name);
printf(" drive %d", ra->hwid);
aprint_normal("RL0%d at %s",
ra->type & RLMP_DT ? '2' : '1', name);
aprint_normal(" drive %d", ra->hwid);
return UNCONF;
}

6
sys/dev/qbus/uba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uba.c,v 1.63 2002/09/27 03:18:18 thorpej Exp $ */
/* $NetBSD: uba.c,v 1.64 2003/01/01 00:10:24 thorpej Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.63 2002/09/27 03:18:18 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.64 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/time.h>
@ -301,7 +301,7 @@ ubaprint(void *aux, const char *uba)
{
struct uba_attach_args *ua = aux;
printf(" csr %o vec %o ipl %x", ua->ua_iaddr,
aprint_normal(" csr %o vec %o ipl %x", ua->ua_iaddr,
ua->ua_cvec & 511, ua->ua_br);
return UNCONF;
}

6
sys/dev/qbus/uda.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uda.c,v 1.47 2002/10/02 16:52:31 thorpej Exp $ */
/* $NetBSD: uda.c,v 1.48 2003/01/01 00:10:24 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.47 2002/10/02 16:52:31 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.48 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -108,7 +108,7 @@ int
udaprint(void *aux, const char *name)
{
if (name)
printf("%s: mscpbus", name);
aprint_normal("%s: mscpbus", name);
return UNCONF;
}

6
sys/dev/radio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: radio.c,v 1.8 2002/10/23 09:13:04 jdolecek Exp $ */
/* $NetBSD: radio.c,v 1.9 2003/01/01 00:10:15 thorpej Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.8 2002/10/23 09:13:04 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.9 2003/01/01 00:10:15 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -169,7 +169,7 @@ int
radioprint(void *aux, const char *pnp)
{
if (pnp != NULL)
printf("radio at %s", pnp);
aprint_normal("radio at %s", pnp);
return (UNCONF);
}

6
sys/dev/sbus/stp4020.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stp4020.c,v 1.29 2002/12/10 13:44:48 pk Exp $ */
/* $NetBSD: stp4020.c,v 1.30 2003/01/01 00:10:24 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.29 2002/12/10 13:44:48 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.30 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -255,7 +255,7 @@ stp4020print(aux, busname)
struct pcmciabus_attach_args *paa = aux;
struct stp4020_socket *h = paa->pch;
printf(" socket %d", h->sock);
aprint_normal(" socket %d", h->sock);
return (UNCONF);
}

6
sys/dev/sbus/xbox.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xbox.c,v 1.9 2002/10/02 16:52:45 thorpej Exp $ */
/* $NetBSD: xbox.c,v 1.10 2003/01/01 00:10:24 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.9 2002/10/02 16:52:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.10 2003/01/01 00:10:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -113,7 +113,7 @@ xbox_print(args, busname)
struct xbox_attach_args *xa = args;
if (busname)
printf("%s at %s", xa->xa_name, busname);
aprint_normal("%s at %s", xa->xa_name, busname);
return (UNCONF);
}

12
sys/dev/scsipi/atapiconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atapiconf.c,v 1.54 2002/10/04 18:58:45 soren Exp $ */
/* $NetBSD: atapiconf.c,v 1.55 2003/01/01 00:10:25 thorpej Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.54 2002/10/04 18:58:45 soren Exp $");
__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.55 2003/01/01 00:10:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -126,8 +126,8 @@ atapiprint(aux, pnp)
{
struct scsipi_channel *chan = aux;
if (pnp)
printf("atapibus at %s", pnp);
printf(" channel %d", chan->chan_channel);
aprint_normal("atapibus at %s", pnp);
aprint_normal(" channel %d", chan->chan_channel);
return (UNCONF);
}
@ -340,12 +340,12 @@ atapibusprint(aux, pnp)
char *dtype;
if (pnp != NULL)
printf("%s", pnp);
aprint_normal("%s", pnp);
inqbuf = &sa->sa_inqbuf;
dtype = scsipi_dtype(inqbuf->type & SID_TYPE);
printf(" drive %d: <%s, %s, %s> %s %s",
aprint_normal(" drive %d: <%s, %s, %s> %s %s",
sa->sa_periph->periph_target, inqbuf->vendor,
inqbuf->product, inqbuf->revision, dtype,
inqbuf->removable ? "removable" : "fixed");

12
sys/dev/scsipi/scsiconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsiconf.c,v 1.195 2002/12/05 10:39:58 jdolecek Exp $ */
/* $NetBSD: scsiconf.c,v 1.196 2003/01/01 00:10:25 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.195 2002/12/05 10:39:58 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.196 2003/01/01 00:10:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -136,11 +136,11 @@ scsiprint(aux, pnp)
/* only "scsibus"es can attach to "scsi"s; easy. */
if (pnp)
printf("scsibus at %s", pnp);
aprint_normal("scsibus at %s", pnp);
/* don't print channel if the controller says there can be only one. */
if (adapt->adapt_nchannels != 1)
printf(" channel %d", chan->chan_channel);
aprint_normal(" channel %d", chan->chan_channel);
return (UNCONF);
}
@ -403,7 +403,7 @@ scsibusprint(aux, pnp)
int target, lun;
if (pnp != NULL)
printf("%s", pnp);
aprint_normal("%s", pnp);
inqbuf = &sa->sa_inqbuf;
@ -417,7 +417,7 @@ scsibusprint(aux, pnp)
scsipi_strvis(product, 65, inqbuf->product, 16);
scsipi_strvis(revision, 17, inqbuf->revision, 4);
printf(" target %d lun %d: <%s, %s, %s> %s %s",
aprint_normal(" target %d lun %d: <%s, %s, %s> %s %s",
target, lun, vendor, product, revision, dtype,
inqbuf->removable ? "removable" : "fixed");

8
sys/dev/tc/ioasic_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioasic_subr.c,v 1.3 2001/11/13 06:26:10 lukem Exp $ */
/* $NetBSD: ioasic_subr.c,v 1.4 2003/01/01 00:10:25 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.3 2001/11/13 06:26:10 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.4 2003/01/01 00:10:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -47,8 +47,8 @@ ioasicprint(aux, pnp)
struct ioasicdev_attach_args *d = aux;
if (pnp)
printf("%s at %s", d->iada_modname, pnp);
printf(" offset 0x%lx", (long)d->iada_offset);
aprint_normal("%s at %s", d->iada_modname, pnp);
aprint_normal(" offset 0x%lx", (long)d->iada_offset);
return (UNCONF);
}

8
sys/dev/tc/tc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc.c,v 1.34 2002/10/02 16:53:08 thorpej Exp $ */
/* $NetBSD: tc.c,v 1.35 2003/01/01 00:10:25 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.34 2002/10/02 16:53:08 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.35 2003/01/01 00:10:25 thorpej Exp $");
#include "opt_tcverbose.h"
@ -191,9 +191,9 @@ tcprint(aux, pnp)
if (pnp) {
tc_devinfo(ta->ta_modname, devinfo);
printf("%s at %s", devinfo, pnp);
aprint_normal("%s at %s", devinfo, pnp);
}
printf(" slot %d offset 0x%lx", ta->ta_slot,
aprint_normal(" slot %d offset 0x%lx", ta->ta_slot,
(long)ta->ta_offset);
return (UNCONF);
}

8
sys/dev/tc/tcds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcds.c,v 1.9 2002/10/02 16:53:08 thorpej Exp $ */
/* $NetBSD: tcds.c,v 1.10 2003/01/01 00:10:25 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.9 2002/10/02 16:53:08 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.10 2003/01/01 00:10:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -342,9 +342,9 @@ tcdsprint(aux, pnp)
/* Only ASCs can attach to TCDSs; easy. */
if (pnp)
printf("asc at %s", pnp);
aprint_normal("asc at %s", pnp);
printf(" chip %d", tcdsdev->tcdsda_chip);
aprint_normal(" chip %d", tcdsdev->tcdsda_chip);
return (UNCONF);
}

8
sys/dev/tc/zs_ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_ioasic.c,v 1.19 2002/10/02 16:53:10 thorpej Exp $ */
/* $NetBSD: zs_ioasic.c,v 1.20 2003/01/01 00:10:25 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.19 2002/10/02 16:53:10 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.20 2003/01/01 00:10:25 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -379,10 +379,10 @@ zs_ioasic_print(aux, name)
struct zsc_attach_args *args = aux;
if (name != NULL)
printf("%s:", name);
aprint_normal("%s:", name);
if (args->channel != -1)
printf(" channel %d", args->channel);
aprint_normal(" channel %d", args->channel);
return (UNCONF);
}

8
sys/dev/usb/ucom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ucom.c,v 1.48 2002/11/25 02:28:56 thorpej Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.48 2002/11/25 02:28:56 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1130,9 +1130,9 @@ ucomprint(void *aux, const char *pnp)
struct ucom_attach_args *uca = aux;
if (pnp)
printf("ucom at %s", pnp);
aprint_normal("ucom at %s", pnp);
if (uca->portno != UCOM_UNK_PORTNO)
printf(" portno %d", uca->portno);
aprint_normal(" portno %d", uca->portno);
return (UNCONF);
}

6
sys/dev/usb/uhidev.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhidev.c,v 1.11 2002/11/08 22:03:50 kristerw Exp $ */
/* $NetBSD: uhidev.c,v 1.12 2003/01/01 00:10:26 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -267,9 +267,9 @@ uhidevprint(void *aux, const char *pnp)
struct uhidev_attach_arg *uha = aux;
if (pnp)
printf("uhid at %s", pnp);
aprint_normal("uhid at %s", pnp);
if (uha->reportid != 0)
printf(" reportid %d", uha->reportid);
aprint_normal(" reportid %d", uha->reportid);
return (UNCONF);
}

8
sys/dev/usb/umass_isdata.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umass_isdata.c,v 1.3 2002/07/11 21:14:32 augustss Exp $ */
/* $NetBSD: umass_isdata.c,v 1.4 2003/01/01 00:10:26 thorpej Exp $ */
/*
* TODO:
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.3 2002/07/11 21:14:32 augustss Exp $");
__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.4 2003/01/01 00:10:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -568,9 +568,9 @@ uwdprint(void *aux, const char *pnp)
{
//struct ata_device *adev = aux;
if (pnp)
printf("wd at %s", pnp);
aprint_normal("wd at %s", pnp);
#if 0
printf(" channel %d drive %d", adev->adev_channel,
aprint_normal(" channel %d drive %d", adev->adev_channel,
adev->adev_drv_data->drive);
#endif
return (UNCONF);

8
sys/dev/usb/umass_scsipi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umass_scsipi.c,v 1.6 2002/09/27 15:37:38 provos Exp $ */
/* $NetBSD: umass_scsipi.c,v 1.7 2003/01/01 00:10:26 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.6 2002/09/27 15:37:38 provos Exp $");
__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.7 2003/01/01 00:10:26 thorpej Exp $");
#include "atapibus.h"
#include "scsibus.h"
@ -212,7 +212,7 @@ scsipiprint(void *aux, const char *pnp)
return (scsiprint(aux, pnp));
#else
if (pnp)
printf("scsibus at %s", pnp);
aprint_normal("scsibus at %s", pnp);
return (UNCONF);
#endif
} else {
@ -220,7 +220,7 @@ scsipiprint(void *aux, const char *pnp)
return (atapiprint(aux, pnp));
#else
if (pnp)
printf("atapibus at %s", pnp);
aprint_normal("atapibus at %s", pnp);
return (UNCONF);
#endif
}

6
sys/dev/usb/usb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb.c,v 1.76 2002/12/30 02:44:32 dsainty Exp $ */
/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.76 2002/12/30 02:44:32 dsainty Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $");
#include "ohci.h"
#include "uhci.h"
@ -374,7 +374,7 @@ usbctlprint(void *aux, const char *pnp)
{
/* only "usb"es can attach to host controllers */
if (pnp)
printf("usb at %s", pnp);
aprint_normal("usb at %s", pnp);
return (UNCONF);
}

18
sys/dev/usb/usb_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_subr.c,v 1.100 2002/09/27 03:18:22 thorpej Exp $ */
/* $NetBSD: usb_subr.c,v 1.101 2003/01/01 00:10:26 thorpej Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.100 2002/09/27 03:18:22 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.101 2003/01/01 00:10:26 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1144,14 +1144,14 @@ usbd_print(void *aux, const char *pnp)
if (!uaa->usegeneric)
return (QUIET);
usbd_devinfo(uaa->device, 1, devinfo);
printf("%s, %s", devinfo, pnp);
aprint_normal("%s, %s", devinfo, pnp);
}
if (uaa->port != 0)
printf(" port %d", uaa->port);
aprint_normal(" port %d", uaa->port);
if (uaa->configno != UHUB_UNK_CONFIGURATION)
printf(" configuration %d", uaa->configno);
aprint_normal(" configuration %d", uaa->configno);
if (uaa->ifaceno != UHUB_UNK_INTERFACE)
printf(" interface %d", uaa->ifaceno);
aprint_normal(" interface %d", uaa->ifaceno);
#if 0
/*
* It gets very crowded with these locators on the attach line.
@ -1159,11 +1159,11 @@ usbd_print(void *aux, const char *pnp)
* by each driver.
*/
if (uaa->vendor != UHUB_UNK_VENDOR)
printf(" vendor 0x%04x", uaa->vendor);
aprint_normal(" vendor 0x%04x", uaa->vendor);
if (uaa->product != UHUB_UNK_PRODUCT)
printf(" product 0x%04x", uaa->product);
aprint_normal(" product 0x%04x", uaa->product);
if (uaa->release != UHUB_UNK_RELEASE)
printf(" release 0x%04x", uaa->release);
aprint_normal(" release 0x%04x", uaa->release);
#endif
return (UNCONF);
}

14
sys/dev/vme/vme.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vme.c,v 1.9 2002/10/02 16:53:13 thorpej Exp $ */
/* $NetBSD: vme.c,v 1.10 2003/01/01 00:10:27 thorpej Exp $ */
/*
* Copyright (c) 1999
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.9 2002/10/02 16:53:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.10 2003/01/01 00:10:27 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,16 +93,16 @@ vmeprint(v, dummy)
int i;
for (i = 0; i < v->numcfranges; i++) {
printf(" addr %x", v->r[i].offset);
aprint_normal(" addr %x", v->r[i].offset);
if (v->r[i].size != -1)
printf("-%x", v->r[i].offset + v->r[i].size - 1);
aprint_normal("-%x", v->r[i].offset + v->r[i].size - 1);
if (v->r[i].am != -1)
printf(" am %02x", v->r[i].am);
aprint_normal(" am %02x", v->r[i].am);
}
if (v->ilevel != -1) {
printf(" irq %d", v->ilevel);
aprint_normal(" irq %d", v->ilevel);
if (v->ivector != -1)
printf(" vector %x", v->ivector);
aprint_normal(" vector %x", v->ivector);
}
return (UNCONF);
}

10
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.70 2002/10/23 09:14:06 jdolecek Exp $ */
/* $NetBSD: wsdisplay.c,v 1.71 2003/01/01 00:10:27 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.70 2002/10/23 09:14:06 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.71 2003/01/01 00:10:27 thorpej Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_compat_netbsd.h"
@ -514,9 +514,9 @@ wsemuldisplaydevprint(void *aux, const char *pnp)
#endif
if (pnp)
printf("wsdisplay at %s", pnp);
aprint_normal("wsdisplay at %s", pnp);
#if 0 /* don't bother; it's ugly */
printf(" console %d", ap->console);
aprint_normal(" console %d", ap->console);
#endif
return (UNCONF);
@ -553,7 +553,7 @@ wsdisplaydevprint(void *aux, const char *pnp)
#endif
if (pnp)
printf("wsdisplay at %s", pnp);
aprint_normal("wsdisplay at %s", pnp);
return (UNCONF);
}

8
sys/dev/wscons/wskbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.66 2002/10/23 09:14:08 jdolecek Exp $ */
/* $NetBSD: wskbd.c,v 1.67 2003/01/01 00:10:27 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.66 2002/10/23 09:14:08 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.67 2003/01/01 00:10:27 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -322,9 +322,9 @@ wskbddevprint(void *aux, const char *pnp)
#endif
if (pnp)
printf("wskbd at %s", pnp);
aprint_normal("wskbd at %s", pnp);
#if 0
printf(" console %d", ap->console);
aprint_normal(" console %d", ap->console);
#endif
return (UNCONF);

6
sys/dev/wscons/wsmouse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsmouse.c,v 1.28 2002/10/23 09:14:08 jdolecek Exp $ */
/* $NetBSD: wsmouse.c,v 1.29 2003/01/01 00:10:27 thorpej Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.28 2002/10/23 09:14:08 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.29 2003/01/01 00:10:27 thorpej Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@ -186,7 +186,7 @@ wsmousedevprint(void *aux, const char *pnp)
{
if (pnp)
printf("wsmouse at %s", pnp);
aprint_normal("wsmouse at %s", pnp);
return (UNCONF);
}

10
sys/dev/xmi/xmi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xmi.c,v 1.2 2001/11/13 06:08:32 lukem Exp $ */
/* $NetBSD: xmi.c,v 1.3 2003/01/01 00:10:27 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.2 2001/11/13 06:08:32 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.3 2003/01/01 00:10:27 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,13 +71,13 @@ xmi_print(void *aux, const char *name)
if (name) {
if (xl->xl_nr == 0)
printf("unknown device 0x%x",
aprint_normal("unknown device 0x%x",
bus_space_read_2(xa->xa_iot, xa->xa_ioh, 0));
else
printf(xl->xl_name);
printf(" at %s", name);
aprint_normal(" at %s", name);
}
printf(" node %d", xa->xa_nodenr);
aprint_normal(" node %d", xa->xa_nodenr);
return xl->xl_havedriver ? UNCONF : UNSUPP;
}