Use aprint_normal() for cfprint routines.
This commit is contained in:
parent
1eab093085
commit
359ed65495
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: footbridge.c,v 1.11 2002/11/03 21:43:30 chris Exp $ */
|
||||
/* $NetBSD: footbridge.c,v 1.12 2003/01/01 00:46:13 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997,1998 Mark Brinicombe.
|
||||
|
@ -116,9 +116,9 @@ footbridge_print(aux, pnp)
|
|||
union footbridge_attach_args *fba = aux;
|
||||
|
||||
if (pnp)
|
||||
printf("%s at %s", fba->fba_name, pnp);
|
||||
aprint_normal("%s at %s", fba->fba_name, pnp);
|
||||
if (strcmp(fba->fba_name, "pci") == 0)
|
||||
printf(" bus %d", fba->fba_pba.pba_bus);
|
||||
aprint_normal(" bus %d", fba->fba_pba.pba_bus);
|
||||
return(UNCONF);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iic.c,v 1.6 2002/10/23 09:10:42 jdolecek Exp $ */
|
||||
/* $NetBSD: iic.c,v 1.7 2003/01/01 00:46:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1996 Mark Brinicombe.
|
||||
|
@ -250,7 +250,7 @@ iicprint(aux, name)
|
|||
|
||||
if (!name) {
|
||||
if (iba->ib_addr)
|
||||
printf(" addr 0x%02x", iba->ib_addr);
|
||||
aprint_normal(" addr 0x%02x", iba->ib_addr);
|
||||
}
|
||||
|
||||
/* XXXX print flags */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ixp12x0.c,v 1.4 2002/12/02 14:08:57 ichiro Exp $ */
|
||||
/* $NetBSD: ixp12x0.c,v 1.5 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2002
|
||||
* Ichiro FUKUHARA <ichiro@ichiro.org>.
|
||||
|
@ -176,9 +176,9 @@ ixp12x0_pcibus_print(void *aux, const char *pnp)
|
|||
struct pcibus_attach_args *pba = aux;
|
||||
|
||||
if (pnp)
|
||||
printf("%s at %s", pba->pba_busname, pnp);
|
||||
aprint_normal("%s at %s", pba->pba_busname, pnp);
|
||||
|
||||
printf(" bus %d", pba->pba_bus);
|
||||
aprint_normal(" bus %d", pba->pba_bus);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ixpsip.c,v 1.4 2002/10/02 05:02:30 thorpej Exp $ */
|
||||
/* $NetBSD: ixpsip.c,v 1.5 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002
|
||||
|
@ -106,11 +106,11 @@ ixpsip_print(aux, name)
|
|||
struct ixpsip_attach_args *sa = (struct ixpsip_attach_args*)aux;
|
||||
|
||||
if (sa->sa_size)
|
||||
printf(" addr 0x%lx", sa->sa_addr);
|
||||
aprint_normal(" addr 0x%lx", sa->sa_addr);
|
||||
if (sa->sa_size > 1)
|
||||
printf("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
aprint_normal("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
if (sa->sa_intr > 1)
|
||||
printf(" intr %d", sa->sa_intr);
|
||||
aprint_normal(" intr %d", sa->sa_intr);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mainbus.c,v 1.6 2002/10/02 05:02:31 thorpej Exp $ */
|
||||
/* $NetBSD: mainbus.c,v 1.7 2003/01/01 00:46:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994,1995 Mark Brinicombe.
|
||||
|
@ -104,13 +104,13 @@ mainbusprint(aux, mainbus)
|
|||
struct mainbus_attach_args *mb = aux;
|
||||
|
||||
if (mb->mb_iobase != MAINBUSCF_BASE_DEFAULT)
|
||||
printf(" base 0x%x", mb->mb_iobase);
|
||||
aprint_normal(" base 0x%x", mb->mb_iobase);
|
||||
if (mb->mb_iosize > 1)
|
||||
printf("-0x%x", mb->mb_iobase + mb->mb_iosize - 1);
|
||||
aprint_normal("-0x%x", mb->mb_iobase + mb->mb_iosize - 1);
|
||||
if (mb->mb_irq != -1)
|
||||
printf(" irq %d", mb->mb_irq);
|
||||
aprint_normal(" irq %d", mb->mb_irq);
|
||||
if (mb->mb_drq != -1)
|
||||
printf(" drq 0x%08x", mb->mb_drq);
|
||||
aprint_normal(" drq 0x%08x", mb->mb_drq);
|
||||
|
||||
/* XXXX print flags */
|
||||
return (QUIET);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: s3c2800.c,v 1.1 2002/11/20 17:52:49 bsh Exp $ */
|
||||
/* $NetBSD: s3c2800.c,v 1.2 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 Fujitsu Component Limited
|
||||
|
@ -68,13 +68,13 @@ s3c2800_print(void *aux, const char *name)
|
|||
struct s3c2xx0_attach_args *sa = (struct s3c2xx0_attach_args *) aux;
|
||||
|
||||
if (sa->sa_size)
|
||||
printf(" addr 0x%lx", sa->sa_addr);
|
||||
aprint_normal(" addr 0x%lx", sa->sa_addr);
|
||||
if (sa->sa_size > 1)
|
||||
printf("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
aprint_normal("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
if (sa->sa_intr != SSIOCF_INTR_DEFAULT)
|
||||
printf(" intr %d", sa->sa_intr);
|
||||
aprint_normal(" intr %d", sa->sa_intr);
|
||||
if (sa->sa_index != SSIOCF_INDEX_DEFAULT)
|
||||
printf(" unit %d", sa->sa_index);
|
||||
aprint_normal(" unit %d", sa->sa_index);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: s3c2800_pci.c,v 1.1 2002/11/20 17:52:50 bsh Exp $ */
|
||||
/* $NetBSD: s3c2800_pci.c,v 1.2 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 Fujitsu Component Limited
|
||||
|
@ -224,9 +224,9 @@ sspci_print(void *aux, const char *pnp)
|
|||
struct pcibus_attach_args *pci_pba = (struct pcibus_attach_args *) aux;
|
||||
|
||||
if (pnp)
|
||||
printf("%s at %s", pci_pba->pba_busname, pnp);
|
||||
aprint_normal("%s at %s", pci_pba->pba_busname, pnp);
|
||||
if (strcmp(pci_pba->pba_busname, "pci") == 0)
|
||||
printf(" bus %d", pci_pba->pba_bus);
|
||||
aprint_normal(" bus %d", pci_pba->pba_bus);
|
||||
|
||||
return UNCONF;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sa11x0.c,v 1.9 2002/10/02 05:02:31 thorpej Exp $ */
|
||||
/* $NetBSD: sa11x0.c,v 1.10 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
|
||||
|
@ -107,17 +107,17 @@ sa11x0_print(aux, name)
|
|||
struct sa11x0_attach_args *sa = (struct sa11x0_attach_args*)aux;
|
||||
|
||||
if (sa->sa_size)
|
||||
printf(" addr 0x%lx", sa->sa_addr);
|
||||
aprint_normal(" addr 0x%lx", sa->sa_addr);
|
||||
if (sa->sa_size > 1)
|
||||
printf("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
aprint_normal("-0x%lx", sa->sa_addr + sa->sa_size - 1);
|
||||
if (sa->sa_memsize)
|
||||
printf(" membase 0x%lx", sa->sa_membase);
|
||||
aprint_normal(" membase 0x%lx", sa->sa_membase);
|
||||
if (sa->sa_memsize > 1)
|
||||
printf("-0x%lx", sa->sa_membase + sa->sa_memsize - 1);
|
||||
aprint_normal("-0x%lx", sa->sa_membase + sa->sa_memsize - 1);
|
||||
if (sa->sa_intr > 1)
|
||||
printf(" intr %d", sa->sa_intr);
|
||||
aprint_normal(" intr %d", sa->sa_intr);
|
||||
if (sa->sa_gpio != -1)
|
||||
printf(" gpio %d", sa->sa_gpio);
|
||||
aprint_normal(" gpio %d", sa->sa_gpio);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: i80312.c,v 1.12 2002/09/27 15:35:50 provos Exp $ */
|
||||
/* $NetBSD: i80312.c,v 1.13 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
|
||||
|
@ -299,9 +299,9 @@ i80312_pcibus_print(void *aux, const char *pnp)
|
|||
struct pcibus_attach_args *pba = aux;
|
||||
|
||||
if (pnp)
|
||||
printf("%s at %s", pba->pba_busname, pnp);
|
||||
aprint_normal("%s at %s", pba->pba_busname, pnp);
|
||||
|
||||
printf(" bus %d", pba->pba_bus);
|
||||
aprint_normal(" bus %d", pba->pba_bus);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pxa2x0.c,v 1.1 2002/10/19 19:31:38 bsh Exp $ */
|
||||
/* $NetBSD: pxa2x0.c,v 1.2 2003/01/01 00:46:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 Genetec Corporation. All rights reserved.
|
||||
|
@ -128,13 +128,13 @@ pxa2x0_print(void *aux, const char *name)
|
|||
struct pxa2x0_attach_args *sa = (struct pxa2x0_attach_args*)aux;
|
||||
|
||||
if (sa->pxa_size)
|
||||
printf(" addr 0x%lx", sa->pxa_addr);
|
||||
aprint_normal(" addr 0x%lx", sa->pxa_addr);
|
||||
if (sa->pxa_size > 1)
|
||||
printf("-0x%lx", sa->pxa_addr + sa->pxa_size - 1);
|
||||
aprint_normal("-0x%lx", sa->pxa_addr + sa->pxa_size - 1);
|
||||
if (sa->pxa_intr > 1)
|
||||
printf(" intr %d", sa->pxa_intr);
|
||||
aprint_normal(" intr %d", sa->pxa_intr);
|
||||
if (sa->pxa_gpio != -1)
|
||||
printf(" gpio %d", sa->pxa_gpio);
|
||||
aprint_normal(" gpio %d", sa->pxa_gpio);
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: autoconf.c,v 1.42 2002/12/08 21:31:35 leo Exp $ */
|
||||
/* $NetBSD: autoconf.c,v 1.43 2003/01/01 00:48:33 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Leo Weppelman
|
||||
|
@ -300,6 +300,6 @@ mbprint(auxp, pnp)
|
|||
const char *pnp;
|
||||
{
|
||||
if (pnp)
|
||||
printf("%s at %s", (char *)auxp, pnp);
|
||||
aprint_normal("%s at %s", (char *)auxp, pnp);
|
||||
return(UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fd.c,v 1.44 2002/11/01 11:31:52 mrg Exp $ */
|
||||
/* $NetBSD: fd.c,v 1.45 2003/01/01 00:48:33 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Leo Weppelman.
|
||||
|
@ -350,7 +350,7 @@ void *auxp;
|
|||
const char *pnp;
|
||||
{
|
||||
if (pnp != NULL)
|
||||
printf("fd%d at %s:", (int)auxp, pnp);
|
||||
aprint_normal("fd%d at %s:", (int)auxp, pnp);
|
||||
|
||||
return(UNCONF);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: hdfd.c,v 1.35 2002/11/01 11:31:52 mrg Exp $ */
|
||||
/* $NetBSD: hdfd.c,v 1.36 2003/01/01 00:48:33 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 Leo Weppelman
|
||||
|
@ -361,7 +361,7 @@ fdprint(aux, fdc)
|
|||
register struct fdc_attach_args *fa = aux;
|
||||
|
||||
if (!fdc)
|
||||
printf(" drive %d", fa->fa_drive);
|
||||
aprint_normal(" drive %d", fa->fa_drive);
|
||||
return QUIET;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ite_cc.c,v 1.20 2002/10/02 05:04:25 thorpej Exp $ */
|
||||
/* $NetBSD: ite_cc.c,v 1.21 2003/01/01 00:48:34 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Leo Weppelman
|
||||
|
@ -283,7 +283,7 @@ void *auxp;
|
|||
const char *pnp;
|
||||
{
|
||||
if(pnp)
|
||||
printf("ite at %s", pnp);
|
||||
aprint_normal("ite at %s", pnp);
|
||||
return(UNCONF);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ite_et.c,v 1.15 2002/10/02 05:04:25 thorpej Exp $ */
|
||||
/* $NetBSD: ite_et.c,v 1.16 2003/01/01 00:48:34 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Leo Weppelman.
|
||||
|
@ -260,7 +260,7 @@ void *auxp;
|
|||
const char *pnp;
|
||||
{
|
||||
if(pnp) /* XXX */
|
||||
printf("ite at %s", pnp);
|
||||
aprint_normal("ite at %s", pnp);
|
||||
return(UNCONF);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: vme.c,v 1.7 2002/10/02 05:04:27 thorpej Exp $ */
|
||||
/* $NetBSD: vme.c,v 1.8 2003/01/01 00:48:34 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
|
@ -92,15 +92,15 @@ vmeprint(aux, vme)
|
|||
struct vme_attach_args *va = aux;
|
||||
|
||||
if (va->va_iosize)
|
||||
printf(" port 0x%x", va->va_iobase);
|
||||
aprint_normal(" port 0x%x", va->va_iobase);
|
||||
if (va->va_iosize > 1)
|
||||
printf("-0x%x", va->va_iobase + va->va_iosize - 1);
|
||||
aprint_normal("-0x%x", va->va_iobase + va->va_iosize - 1);
|
||||
if (va->va_msize)
|
||||
printf(" iomem 0x%x", va->va_maddr);
|
||||
aprint_normal(" iomem 0x%x", va->va_maddr);
|
||||
if (va->va_msize > 1)
|
||||
printf("-0x%x", va->va_maddr + va->va_msize - 1);
|
||||
aprint_normal("-0x%x", va->va_maddr + va->va_msize - 1);
|
||||
if (va->va_irq != IRQUNK)
|
||||
printf(" irq %d", va->va_irq);
|
||||
aprint_normal(" irq %d", va->va_irq);
|
||||
return (UNCONF);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue