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

Use aprint_normal() for cfprint routines.

Browse Source
This commit is contained in:
thorpej 2003-01-01 01:34:45 +00:00
parent 1132348b98
commit 72a2c87923
30 changed files with 111 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/hp300/dev/dio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dio.c,v 1.20 2002/12/22 00:17:15 gmcgarry Exp $ */
/* $NetBSD: dio.c,v 1.21 2003/01/01 01:34:45 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.20 2002/12/22 00:17:15 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: dio.c,v 1.21 2003/01/01 01:34:45 thorpej Exp $");
#define _HP300_INTR_H_PRIVATE
@ -194,8 +194,9 @@ dioprint(aux, pnp)
char buf[128];
if (pnp)
printf("%s at %s", dio_devinfo(da, buf, sizeof(buf)), pnp);
printf(" scode %d", da->da_scode);
aprint_normal("%s at %s",
dio_devinfo(da, buf, sizeof(buf)), pnp);
aprint_normal(" scode %d", da->da_scode);
return (UNCONF);
}

8
sys/arch/hp300/dev/frodo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: frodo.c,v 1.13 2002/10/02 05:15:49 thorpej Exp $ */
/* $NetBSD: frodo.c,v 1.14 2003/01/01 01:34:45 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.13 2002/10/02 05:15:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: frodo.c,v 1.14 2003/01/01 01:34:45 thorpej Exp $");
#define _HP300_INTR_H_PRIVATE
@ -228,8 +228,8 @@ frodoprint(aux, pnp)
struct frodo_attach_args *fa = aux;
if (pnp)
printf("%s at %s", fa->fa_name, pnp);
printf(" offset 0x%x", fa->fa_offset);
aprint_normal("%s at %s", fa->fa_name, pnp);
aprint_normal(" offset 0x%x", fa->fa_offset);
return (UNCONF);
}

6
sys/arch/hp300/dev/grf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf.c,v 1.48 2002/10/23 09:11:05 jdolecek Exp $ */
/* $NetBSD: grf.c,v 1.49 2003/01/01 01:34:45 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.48 2002/10/23 09:11:05 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.49 2003/01/01 01:34:45 thorpej Exp $");
#include "opt_compat_hpux.h"
@ -158,7 +158,7 @@ grfprint(aux, pnp)
/* Only ITEs can attach to GRFs, easy... */
if (pnp)
printf("ite at %s", pnp);
aprint_normal("ite at %s", pnp);
return (UNCONF);
}

6
sys/arch/hp300/dev/grf_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_subr.c,v 1.8 2002/03/15 05:52:54 gmcgarry Exp $ */
/* $NetBSD: grf_subr.c,v 1.9 2003/01/01 01:34:46 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.8 2002/03/15 05:52:54 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: grf_subr.c,v 1.9 2003/01/01 01:34:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -116,7 +116,7 @@ grfdevprint(aux, pnp)
/* Only grf's can attach to grfdev's... easy. */
if (pnp)
printf("grf at %s", pnp);
aprint_normal("grf at %s", pnp);
return (UNCONF);
}

8
sys/arch/hp300/dev/hpib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpib.c,v 1.23 2002/10/02 05:15:52 thorpej Exp $ */
/* $NetBSD: hpib.c,v 1.24 2003/01/01 01:34:46 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.23 2002/10/02 05:15:52 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.24 2003/01/01 01:34:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -264,7 +264,7 @@ hpibbusprint(aux, pnp)
{
struct hpibbus_attach_args *ha = aux;
printf(" slave %d punit %d", ha->ha_slave, ha->ha_punit);
aprint_normal(" slave %d punit %d", ha->ha_slave, ha->ha_punit);
return (UNCONF);
}
@ -276,7 +276,7 @@ hpibdevprint(aux, pnp)
/* only hpibbus's can attach to hpibdev's -- easy. */
if (pnp != NULL)
printf("hpibbus at %s", pnp);
aprint_normal("hpibbus at %s", pnp);
return (UNCONF);
}

10
sys/arch/hp300/dev/intio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intio.c,v 1.13 2002/12/22 00:17:15 gmcgarry Exp $ */
/* $NetBSD: intio.c,v 1.14 2003/01/01 01:34:46 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998, 2001 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.13 2002/12/22 00:17:15 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.14 2003/01/01 01:34:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -162,11 +162,11 @@ intioprint(aux, pnp)
struct intio_attach_args *ia = aux;
if (pnp != NULL)
printf("%s at %s", ia->ia_modname, pnp);
aprint_normal("%s at %s", ia->ia_modname, pnp);
if (ia->ia_iobase != 0) {
printf(" addr 0x%lx", INTIOBASE + ia->ia_iobase);
aprint_normal(" addr 0x%lx", INTIOBASE + ia->ia_iobase);
if (ia->ia_ipl != -1 && pnp != NULL)
printf(" ipl %d", ia->ia_ipl);
aprint_normal(" ipl %d", ia->ia_ipl);
}
return (UNCONF);
}

15
sys/arch/hp300/dev/scsi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi.c,v 1.33 2002/10/02 05:15:55 thorpej Exp $ */
/* $NetBSD: scsi.c,v 1.34 2003/01/01 01:34:46 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: scsi.c,v 1.33 2002/10/02 05:15:55 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: scsi.c,v 1.34 2003/01/01 01:34:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -480,7 +480,8 @@ scsi_print(aux, pnp)
char vendor[9], product[17], revision[5];
if (pnp == NULL)
printf(" targ %d lun %d: ", osa->osa_target, osa->osa_lun);
aprint_normal(" targ %d lun %d: ", osa->osa_target,
osa->osa_lun);
memset(vendor, 0, sizeof(vendor));
memset(product, 0, sizeof(product));
@ -493,16 +494,16 @@ scsi_print(aux, pnp)
scsi_str(inqbuf->product_id, product,
sizeof(inqbuf->product_id));
scsi_str(inqbuf->rev, revision, sizeof(inqbuf->rev));
printf("<%s, %s, %s>", vendor, product, revision);
aprint_normal("<%s, %s, %s>", vendor, product, revision);
if (inqbuf->version >= 2)
printf(" (SCSI-%d)", inqbuf->version);
aprint_normal(" (SCSI-%d)", inqbuf->version);
break;
default:
printf("type 0x%x, qual 0x%x, ver %d",
aprint_normal("type 0x%x, qual 0x%x, ver %d",
inqbuf->type, inqbuf->qual, inqbuf->version);
}
if (pnp != NULL)
printf(" at %s targ %d lun %d",
aprint_normal(" at %s targ %d lun %d",
pnp, osa->osa_target, osa->osa_lun);
return (UNCONF);

4
sys/arch/hp700/dev/mongoose.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mongoose.c,v 1.4 2002/10/02 05:17:48 thorpej Exp $ */
/* $NetBSD: mongoose.c,v 1.5 2003/01/01 01:35:42 thorpej Exp $ */
/* $OpenBSD: mongoose.c,v 1.7 2000/08/15 19:42:56 mickey Exp $ */
@ -696,7 +696,7 @@ mgprint(aux, pnp)
union mongoose_attach_args *ea = aux;
if (pnp)
printf ("%s at %s", ea->mongoose_name, pnp);
aprint_normal ("%s at %s", ea->mongoose_name, pnp);
return (UNCONF);
}

11
sys/arch/hp700/hp700/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.8 2002/10/02 05:17:51 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.9 2003/01/01 01:35:43 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -1324,14 +1324,15 @@ mbprint(aux, pnp)
struct confargs *ca = aux;
if (pnp)
printf("\"%s\" at %s (type %x, sv %x)", ca->ca_name, pnp,
aprint_normal("\"%s\" at %s (type %x, sv %x)", ca->ca_name, pnp,
ca->ca_type.iodc_type, ca->ca_type.iodc_sv_model);
if (ca->ca_hpa) {
printf(" hpa %lx", ca->ca_hpa);
aprint_normal(" hpa %lx", ca->ca_hpa);
if (!pnp && ca->ca_irq >= 0) {
printf(" irq %d", ca->ca_irq);
aprint_normal(" irq %d", ca->ca_irq);
if (ca->ca_type.iodc_type != HPPA_TYPE_BHA)
printf(" ipl %d", _hp700_intr_ipl_next());
aprint_normal(" ipl %d",
_hp700_intr_ipl_next());
}
}

4
sys/arch/hpcmips/dev/apm/apmdev.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apmdev.c,v 1.14 2002/11/26 19:50:24 christos Exp $ */
/* $NetBSD: apmdev.c,v 1.15 2003/01/01 01:40:25 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -721,7 +721,7 @@ int
apmprint(void *aux, const char *pnp)
{
if (pnp)
printf("apm at %s", pnp);
aprint_normal("apm at %s", pnp);
return (UNCONF);
}

4
sys/arch/hpcmips/dev/it8368.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: it8368.c,v 1.16 2002/10/02 05:26:45 thorpej Exp $ */
/* $NetBSD: it8368.c,v 1.17 2003/01/01 01:40:26 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -371,7 +371,7 @@ int
it8368_print(void *arg, const char *pnp)
{
if (pnp)
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
return (UNCONF);
}

4
sys/arch/hpcmips/dev/plumpcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: plumpcmcia.c,v 1.14 2002/10/02 05:26:46 thorpej Exp $ */
/* $NetBSD: plumpcmcia.c,v 1.15 2003/01/01 01:40:26 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@ -286,7 +286,7 @@ int
plumpcmcia_print(void *arg, const char *pnp)
{
if (pnp) {
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
}
return (UNCONF);

4
sys/arch/hpcmips/tx/tx39sib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tx39sib.c,v 1.12 2002/10/02 05:26:51 thorpej Exp $ */
/* $NetBSD: tx39sib.c,v 1.13 2003/01/01 01:40:27 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -303,7 +303,7 @@ tx39sib_print(void *aux, const char *pnp)
{
struct txsib_attach_args *sa = aux;
printf(" slot %d", sa->sa_slot);
aprint_normal(" slot %d", sa->sa_slot);
return (QUIET);
}

4
sys/arch/hpcmips/tx/tx39uart.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tx39uart.c,v 1.8 2002/10/02 05:26:51 thorpej Exp $ */
/* $NetBSD: tx39uart.c,v 1.9 2003/01/01 01:40:27 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@ -111,7 +111,7 @@ tx39uart_print(void *aux, const char *pnp)
{
struct tx39uart_attach_args *ua = aux;
printf(" slot %d", ua->ua_slot);
aprint_normal(" slot %d", ua->ua_slot);
return QUIET;
}

14
sys/arch/hpcmips/tx/txcsbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: txcsbus.c,v 1.13 2002/10/02 05:26:51 thorpej Exp $ */
/* $NetBSD: txcsbus.c,v 1.14 2003/01/01 01:40:27 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -147,7 +147,7 @@ txcsbus_print(void *aux, const char *pnp)
struct cs_attach_args *ca = aux;
if (ca->ca_csreg.cs != TXCSBUSCF_REGCS_DEFAULT) {
printf(" regcs %s %dbit %#x+%#x",
aprint_normal(" regcs %s %dbit %#x+%#x",
__csmap[ca->ca_csreg.cs].cs_name,
ca->ca_csreg.cswidth,
ca->ca_csreg.csbase,
@ -155,7 +155,7 @@ txcsbus_print(void *aux, const char *pnp)
}
if (ca->ca_csio.cs != TXCSBUSCF_IOCS_DEFAULT) {
printf(" iocs %s %dbit %#x+%#x",
aprint_normal(" iocs %s %dbit %#x+%#x",
__csmap[ca->ca_csio.cs].cs_name,
ca->ca_csio.cswidth,
ca->ca_csio.csbase,
@ -163,7 +163,7 @@ txcsbus_print(void *aux, const char *pnp)
}
if (ca->ca_csmem.cs != TXCSBUSCF_MEMCS_DEFAULT) {
printf(" memcs %s %dbit %#x+%#x",
aprint_normal(" memcs %s %dbit %#x+%#x",
__csmap[ca->ca_csmem.cs].cs_name,
ca->ca_csmem.cswidth,
ca->ca_csmem.csbase,
@ -171,15 +171,15 @@ txcsbus_print(void *aux, const char *pnp)
}
if (ca->ca_irq1 != TXCSBUSCF_IRQ1_DEFAULT) {
printf(" irq1 %d(%d:%d)", PRINTIRQ(ca->ca_irq1));
aprint_normal(" irq1 %d(%d:%d)", PRINTIRQ(ca->ca_irq1));
}
if (ca->ca_irq2 != TXCSBUSCF_IRQ2_DEFAULT) {
printf(" irq2 %d(%d:%d)", PRINTIRQ(ca->ca_irq2));
aprint_normal(" irq2 %d(%d:%d)", PRINTIRQ(ca->ca_irq2));
}
if (ca->ca_irq3 != TXCSBUSCF_IRQ3_DEFAULT) {
printf(" irq3 %d(%d:%d)", PRINTIRQ(ca->ca_irq3));
aprint_normal(" irq3 %d(%d:%d)", PRINTIRQ(ca->ca_irq3));
}
return (UNCONF);

6
sys/arch/hpcmips/vr/vrc4172pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vrc4172pci.c,v 1.7 2002/10/02 05:26:54 thorpej Exp $ */
/* $NetBSD: vrc4172pci.c,v 1.8 2003/01/01 01:40:28 thorpej Exp $ */
/*-
* Copyright (c) 2002 TAKEMURA Shin
@ -213,9 +213,9 @@ vrc4172pci_print(void *aux, const char *pnp)
struct pcibus_attach_args *pba = aux;
if (pnp != NULL)
printf("%s at %s", pba->pba_busname, pnp);
aprint_normal("%s at %s", pba->pba_busname, pnp);
else
printf(" bus %d", pba->pba_bus);
aprint_normal(" bus %d", pba->pba_bus);
return (UNCONF);
}

12
sys/arch/hpcmips/vr/vrc4173bcu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vrc4173bcu.c,v 1.11 2002/10/02 05:26:54 thorpej Exp $ */
/* $NetBSD: vrc4173bcu.c,v 1.12 2003/01/01 01:40:27 thorpej Exp $ */
/*-
* Copyright (c) 2001,2002 Enami Tsugutomo.
@ -430,13 +430,15 @@ vrc4173bcu_print(void *aux, const char *hoge)
struct vrip_attach_args *va = (struct vrip_attach_args*)aux;
if (va->va_addr != VRIPIFCF_ADDR_DEFAULT)
printf(" addr 0x%04lx", va->va_addr);
aprint_normal(" addr 0x%04lx", va->va_addr);
if (va->va_size != VRIPIFCF_SIZE_DEFAULT)
printf("-%04lx", (va->va_addr + va->va_size - 1) & 0xffff);
aprint_normal("-%04lx",
(va->va_addr + va->va_size - 1) & 0xffff);
if (va->va_addr2 != VRIPIFCF_ADDR2_DEFAULT)
printf(", 0x%04lx", va->va_addr2);
aprint_normal(", 0x%04lx", va->va_addr2);
if (va->va_size2 != VRIPIFCF_SIZE2_DEFAULT)
printf("-%04lx", (va->va_addr2 + va->va_size2 - 1) & 0xffff);
aprint_normal("-%04lx",
(va->va_addr2 + va->va_size2 - 1) & 0xffff);
return (UNCONF);
}

11
sys/arch/hpcmips/vr/vrip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vrip.c,v 1.27 2002/10/02 05:26:55 thorpej Exp $ */
/* $NetBSD: vrip.c,v 1.28 2003/01/01 01:40:28 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002
@ -254,16 +254,17 @@ vrip_print(void *aux, const char *hoge)
bus_addr_t endaddr, mask;
if (va->va_addr != VRIPIFCF_ADDR_DEFAULT)
printf(" addr 0x%08lx", va->va_addr);
aprint_normal(" addr 0x%08lx", va->va_addr);
if (va->va_size != VRIPIFCF_SIZE_DEFAULT) {
endaddr = (va->va_addr + va->va_size - 1);
mask = ((va->va_addr ^ endaddr) & 0xff0000) ? 0xffffff:0xffff;
printf("-%04lx", endaddr & mask);
aprint_normal("-%04lx", endaddr & mask);
}
if (va->va_addr2 != VRIPIFCF_ADDR2_DEFAULT)
printf(", 0x%08lx", va->va_addr2);
aprint_normal(", 0x%08lx", va->va_addr2);
if (va->va_size2 != VRIPIFCF_SIZE2_DEFAULT)
printf("-%04lx", (va->va_addr2 + va->va_size2 - 1) & 0xffff);
aprint_normal("-%04lx",
(va->va_addr2 + va->va_size2 - 1) & 0xffff);
return (UNCONF);
}

6
sys/arch/hpcmips/vr/vrpciu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vrpciu.c,v 1.11 2002/10/02 05:26:56 thorpej Exp $ */
/* $NetBSD: vrpciu.c,v 1.12 2003/01/01 01:40:28 thorpej Exp $ */
/*-
* Copyright (c) 2001 Enami Tsugutomo.
@ -333,9 +333,9 @@ vrpciu_print(void *aux, const char *pnp)
struct pcibus_attach_args *pba = aux;
if (pnp != NULL)
printf("%s at %s", pba->pba_busname, pnp);
aprint_normal("%s at %s", pba->pba_busname, pnp);
else
printf(" bus %d", pba->pba_bus);
aprint_normal(" bus %d", pba->pba_bus);
return (UNCONF);
}

4
sys/arch/hpcsh/dev/hd64461/hd64461.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd64461.c,v 1.11 2002/10/02 15:45:19 thorpej Exp $ */
/* $NetBSD: hd64461.c,v 1.12 2003/01/01 01:41:33 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -122,7 +122,7 @@ hd64461_print(void *aux, const char *pnp)
struct hd64461_attach_args *ha = aux;
if (pnp)
printf("%s at %s",
aprint_normal("%s at %s",
hd64461_modules[ha->ha_module_id].name, pnp);
return (UNCONF);

4
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd64461pcmcia.c,v 1.20 2002/10/02 15:45:20 thorpej Exp $ */
/* $NetBSD: hd64461pcmcia.c,v 1.21 2003/01/01 01:41:33 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -321,7 +321,7 @@ hd64461pcmcia_print(void *arg, const char *pnp)
{
if (pnp)
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
return (UNCONF);
}

5
sys/arch/hpcsh/dev/hd64465/hd64465.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd64465.c,v 1.8 2002/10/21 17:07:36 uch Exp $ */
/* $NetBSD: hd64465.c,v 1.9 2003/01/01 01:41:34 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -135,7 +135,8 @@ hd64465_print(void *aux, const char *pnp)
struct hd64465_attach_args *ha = aux;
if (pnp)
printf("%s at %s", hd64465_modules[ha->ha_module_id].name, pnp);
aprint_normal("%s at %s",
hd64465_modules[ha->ha_module_id].name, pnp);
return (UNCONF);
}

4
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hd64465pcmcia.c,v 1.10 2002/10/02 15:45:21 thorpej Exp $ */
/* $NetBSD: hd64465pcmcia.c,v 1.11 2003/01/01 01:41:34 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -293,7 +293,7 @@ hd64465pcmcia_print(void *arg, const char *pnp)
{
if (pnp)
printf("pcmcia at %s", pnp);
aprint_normal("pcmcia at %s", pnp);
return (UNCONF);
}

8
sys/arch/luna68k/dev/sio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sio.c,v 1.2 2002/10/02 05:31:46 thorpej Exp $ */
/* $NetBSD: sio.c,v 1.3 2003/01/01 01:42:13 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.2 2002/10/02 05:31:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.3 2003/01/01 01:42:13 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -108,10 +108,10 @@ sio_print(aux, name)
struct sio_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;
}

6
sys/arch/luna68k/luna68k/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.3 2002/10/02 05:31:47 thorpej Exp $ */
/* $NetBSD: mainbus.c,v 1.4 2003/01/01 01:42:14 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2002/10/02 05:31:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2003/01/01 01:42:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -101,7 +101,7 @@ mainbus_print(aux, pnp)
struct mainbus_attach_args *ma = aux;
if (pnp)
printf("%s at %s", ma->ma_name, pnp);
aprint_normal("%s at %s", ma->ma_name, pnp);
return (UNCONF);
}

4
sys/arch/mac68k/dev/grf_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: grf_subr.c,v 1.15 2000/02/14 07:01:46 scottr Exp $ */
/* $NetBSD: grf_subr.c,v 1.16 2003/01/01 01:44:29 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -81,7 +81,7 @@ grfbusprint(aux, name)
struct grfbus_attach_args *ga = aux;
if (name)
printf("%s at %s", ga->ga_name, name);
aprint_normal("%s at %s", ga->ga_name, name);
return (UNCONF);
}

6
sys/arch/mac68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.39 2002/10/02 05:36:37 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.40 2003/01/01 01:44:29 thorpej Exp $ */
/*
* Copyright (c) 1996-1998 Bill Studenmund
@ -426,10 +426,10 @@ zsc_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;
}

18
sys/arch/mac68k/nubus/nubus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nubus.c,v 1.55 2002/10/02 05:36:38 thorpej Exp $ */
/* $NetBSD: nubus.c,v 1.56 2003/01/01 01:44:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Allen Briggs. All rights reserved.
@ -268,24 +268,26 @@ nubus_print(aux, pnp)
bus_space_handle_t bsh;
if (pnp) {
printf("%s slot %x", pnp, na->slot);
aprint_normal("%s slot %x", pnp, na->slot);
if (bus_space_map(bst,
NUBUS_SLOT2PA(na->slot), NBMEMSIZE, 0, &bsh) == 0) {
printf(": %s", nubus_get_card_name(bst, bsh, na->fmt));
printf(" (Vendor: %s,", nubus_get_vendor(bst, bsh,
aprint_normal(": %s",
nubus_get_card_name(bst, bsh, na->fmt));
aprint_normal(" (Vendor: %s,",
nubus_get_vendor(bst, bsh,
na->fmt, NUBUS_RSRC_VEND_ID));
printf(" Part: %s)", nubus_get_vendor(bst, bsh,
aprint_normal(" Part: %s)", nubus_get_vendor(bst, bsh,
na->fmt, NUBUS_RSRC_VEND_PART));
bus_space_unmap(bst, bsh, NBMEMSIZE);
}
#ifdef DIAGNOSTIC
else
printf(":");
printf(" Type: %04x %04x %04x %04x",
aprint_normal(":");
aprint_normal(" Type: %04x %04x %04x %04x",
na->category, na->type, na->drsw, na->drhw);
#endif
} else {
printf(" slot %x", na->slot);
aprint_normal(" slot %x", na->slot);
}
return (UNCONF);
}

4
sys/arch/mac68k/obio/iwm_fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iwm_fd.c,v 1.19 2002/11/01 11:31:53 mrg Exp $ */
/* $NetBSD: iwm_fd.c,v 1.20 2003/01/01 01:44:30 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@ -515,7 +515,7 @@ fd_print(auxp, controller)
ia = (iwmAttachArgs_t *)auxp;
if (NULL != controller)
printf("fd%d at %s", ia->unit, controller);
aprint_normal("fd%d at %s", ia->unit, controller);
return UNCONF;
}

4
sys/arch/mac68k/obio/obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: obio.c,v 1.14 2002/10/02 05:36:39 thorpej Exp $ */
/* $NetBSD: obio.c,v 1.15 2003/01/01 01:44:30 thorpej Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@ obio_print(args, name)
struct obio_attach_args *oa = (struct obio_attach_args *)args;
if (oa->oa_addr != (-1))
printf(" addr %x", oa->oa_addr);
aprint_normal(" addr %x", oa->oa_addr);
return (UNCONF);
}