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

use device_xname()

This commit is contained in:
cegger 2009-05-12 06:54:10 +00:00
parent c36dc14b18
commit 5bc6477c34
10 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/acorn32/acorn32/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.15 2009/03/15 22:18:35 cegger Exp $ */
/* $NetBSD: autoconf.c,v 1.16 2009/05/12 06:56:59 cegger Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2009/03/15 22:18:35 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2009/05/12 06:56:59 cegger Exp $");
#include "opt_md.h"
@ -135,7 +135,7 @@ cpu_rootconf(void)
set_root_device();
printf("boot device: %s\n",
booted_device != NULL ? booted_device->dv_xname : "<unknown>");
booted_device != NULL ? device_xname(booted_device) : "<unknown>");
#endif
setroot(booted_device, booted_partition);
}

10
sys/arch/acorn32/eb7500atx/if_cs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_cs.c,v 1.4 2005/12/11 12:16:05 christos Exp $ */
/* $NetBSD: if_cs.c,v 1.5 2009/05/12 06:57:51 cegger Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.4 2005/12/11 12:16:05 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.5 2009/05/12 06:57:51 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -171,7 +171,7 @@ cs_rsbus_attach(struct device *parent, struct device *self, void *aux)
iobase = 0x03010600;
if (bus_space_map(sc->sc_iot, iobase, CS8900_IOSIZE * 4,
0, &sc->sc_ioh)) {
printf("%s: unable to map i/o space\n", sc->sc_dev.dv_xname);
printf("%s: unable to map i/o space\n", device_xname(&sc->sc_dev));
return;
}
@ -179,7 +179,7 @@ cs_rsbus_attach(struct device *parent, struct device *self, void *aux)
if (bus_space_map(sc->sc_memt, iobase + 0x3A00,
CS8900_MEMSIZE * 4, 0, &sc->sc_memh)) {
printf("%s: unable to map memory space\n",
sc->sc_dev.dv_xname);
device_xname(&sc->sc_dev));
} else {
sc->sc_cfgflags |= CFGFLG_MEM_MODE | CFGFLG_USE_SA;
sc->sc_pktpgaddr = 1<<23;
@ -189,7 +189,7 @@ cs_rsbus_attach(struct device *parent, struct device *self, void *aux)
sc->sc_ih = intr_claim(IRQ_INT5, IPL_NET, "cs", cs_intr, sc);
if (sc->sc_ih == NULL) {
printf("%s: unable to establish interrupt\n",
sc->sc_dev.dv_xname);
device_xname(&sc->sc_dev));
return;
}

6
sys/arch/acorn32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $ */
/* $NetBSD: asc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@ -98,7 +98,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -268,7 +268,7 @@ ascattach(struct device *pdp, struct device *dp, void *auxp)
#endif
{
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
dp->dv_xname, "intr");
device_xname(dp), "intr");
sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
asc_intr, sc, &sc->sc_intrcnt);
if (sc->sc_ih == NULL)

6
sys/arch/acorn32/podulebus/cosc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cosc.c,v 1.15 2009/03/14 21:04:01 dsl Exp $ */
/* $NetBSD: cosc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.15 2009/03/14 21:04:01 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -271,7 +271,7 @@ coscattach(struct device *pdp, struct device *dp, void *auxp)
#endif
{
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
dp->dv_xname, "intr");
device_xname(dp), "intr");
sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
cosc_intr, sc, &sc->sc_intrcnt);
if (sc->sc_ih == NULL)

6
sys/arch/acorn32/podulebus/csc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: csc.c,v 1.15 2009/03/14 15:35:58 dsl Exp $ */
/* $NetBSD: csc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.15 2009/03/14 15:35:58 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -184,7 +184,7 @@ cscattach(struct device *pdp, struct device *dp, void *auxp)
#if CSC_POLL == 0
evcnt_attach_dynamic(&sc->sc_softc.sc_intrcnt, EVCNT_TYPE_INTR, NULL,
dp->dv_xname, "intr");
device_xname(dp), "intr");
sc->sc_softc.sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
csc_intr, &sc->sc_softc, &sc->sc_softc.sc_intrcnt);
if (sc->sc_softc.sc_ih == NULL)

6
sys/arch/acorn32/podulebus/icside.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icside.c,v 1.27 2008/03/18 20:46:35 cube Exp $ */
/* $NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@ -42,7 +42,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.27 2008/03/18 20:46:35 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: icside.c,v 1.28 2009/05/12 06:54:10 cegger Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@ -301,7 +301,7 @@ icside_attach(device_t parent, device_t self, void *aux)
icp->ic_irqaddr = pa->pa_podule->irq_addr;
icp->ic_irqmask = pa->pa_podule->irq_mask;
evcnt_attach_dynamic(&icp->ic_intrcnt, EVCNT_TYPE_INTR, NULL,
self->dv_xname, "intr");
device_xname(self), "intr");
icp->ic_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
icside_intr, icp, &icp->ic_intrcnt);
if (icp->ic_ih == NULL) {

16
sys/arch/acorn32/podulebus/if_ie.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.25 2009/03/18 17:06:41 cegger Exp $ */
/* $NetBSD: if_ie.c,v 1.26 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.25 2009/03/18 17:06:41 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.26 2009/05/12 06:54:10 cegger Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@ -450,7 +450,7 @@ void ieattach ( struct device *parent, struct device *self, void *aux )
/* Fill in my application form to attach to the inet system */
memcpy( ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
memcpy( ifp->if_xname, device_xname(&sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
ifp->if_start = iestart;
ifp->if_ioctl = ieioctl;
@ -685,7 +685,7 @@ iewatchdog(struct ifnet *ifp)
{
struct ie_softc *sc = ifp->if_softc;
log(LOG_ERR, "%s: device timeout\n", sc->sc_dev.dv_xname);
log(LOG_ERR, "%s: device timeout\n", device_xname(&sc->sc_dev));
++ifp->if_oerrors;
iereset(sc);
}
@ -873,13 +873,13 @@ ieinit(struct ie_softc *sc)
if ( command_and_wait(sc, IE_CU_START, &scb, &cmd, ptr, sizeof cmd,
IE_STAT_COMPL) )
{
printf ( "%s: command failed: timeout\n", sc->sc_dev.dv_xname );
printf ( "%s: command failed: timeout\n", device_xname(&sc->sc_dev));
return 0;
}
if ( !(cmd.com.ie_cmd_status & IE_STAT_OK) )
{
printf ( "%s: command failed: !IE_STAT_OK\n", sc->sc_dev.dv_xname );
printf ( "%s: command failed: !IE_STAT_OK\n", device_xname(&sc->sc_dev));
return 0;
}
@ -895,13 +895,13 @@ ieinit(struct ie_softc *sc)
if ( command_and_wait(sc, IE_CU_START, &scb, &iasetup_cmd, ptr, sizeof cmd,
IE_STAT_COMPL) )
{
printf ( "%s: iasetup failed : timeout\n", sc->sc_dev.dv_xname );
printf ( "%s: iasetup failed : timeout\n", device_xname(&sc->sc_dev));
return 0;
}
if ( !(cmd.com.ie_cmd_status & IE_STAT_OK) )
{
printf ( "%s: iasetup failed : !IE_STAT_OK\n", sc->sc_dev.dv_xname );
printf ( "%s: iasetup failed : !IE_STAT_OK\n", device_xname(&sc->sc_dev));
return 0;
}

8
sys/arch/acorn32/podulebus/podulebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: podulebus.c,v 1.24 2009/03/15 22:18:35 cegger Exp $ */
/* $NetBSD: podulebus.c,v 1.25 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.24 2009/03/15 22:18:35 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.25 2009/05/12 06:54:10 cegger Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -237,10 +237,10 @@ poduleexamine(podule_t *podule, struct device *dev, int slottype)
podule->slottype = slottype;
if (slottype == SLOT_NET)
printf("netslot%d at %s : ", podule->podulenum - MAX_PODULES,
dev->dv_xname);
device_xname(dev));
else
printf("podule%d at %s : ", podule->podulenum,
dev->dv_xname);
device_xname(dev));
/* Is it Acorn conformant ? */

6
sys/arch/acorn32/podulebus/ptsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptsc.c,v 1.15 2009/03/14 15:35:59 dsl Exp $ */
/* $NetBSD: ptsc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.15 2009/03/14 15:35:59 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -225,7 +225,7 @@ ptscattach(struct device *pdp, struct device *dp, void *auxp)
#if PTSC_POLL == 0
evcnt_attach_dynamic(&sc->sc_softc.sc_intrcnt, EVCNT_TYPE_INTR, NULL,
dp->dv_xname, "intr");
device_xname(dp), "intr");
sc->sc_softc.sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
ptsc_intr, &sc->sc_softc, &sc->sc_softc.sc_intrcnt);
if (sc->sc_softc.sc_ih == NULL)

30
sys/arch/acorn32/podulebus/sbic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbic.c,v 1.14 2009/03/18 10:22:22 cegger Exp $ */
/* $NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@ -114,7 +114,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.14 2009/03/18 10:22:22 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.15 2009/05/12 06:54:10 cegger Exp $");
#include <sys/systm.h>
#include <sys/callout.h>
@ -586,7 +586,7 @@ sbic_scsidone(struct sbic_acb *acb, int stat)
TAILQ_REMOVE(&dev->ready_list, acb, chain);
} else {
printf("%s: can't find matching acb\n",
dev->sc_dev.dv_xname);
device_xname(&dev->sc_dev));
#ifdef DDB
Debugger();
#endif
@ -643,7 +643,7 @@ sbicabort(struct sbic_softc *dev, sbic_regmap_p regs, const char *where)
GET_SBIC_csr(regs, csr);
printf ("%s: abort %s: csr = 0x%02x, asr = 0x%02x\n",
dev->sc_dev.dv_xname, where, csr, asr);
device_xname(&dev->sc_dev), where, csr, asr);
#if 0
@ -665,7 +665,7 @@ sbicabort(struct sbic_softc *dev, sbic_regmap_p regs, const char *where)
/* But we don't know what direction it needs to go */
GET_SBIC_data(regs, asr);
printf("%s: abort %s: clearing data buffer 0x%02x\n",
dev->sc_dev.dv_xname, where, asr);
device_xname(&dev->sc_dev), where, asr);
GET_SBIC_asr(regs, asr);
/* Not the read direction, then */
if (asr & SBIC_ASR_DBR)
@ -674,7 +674,7 @@ sbicabort(struct sbic_softc *dev, sbic_regmap_p regs, const char *where)
}
WAIT_CIP(regs);
printf("%s: sbicabort - sending ABORT command\n",
dev->sc_dev.dv_xname);
device_xname(&dev->sc_dev));
SET_SBIC_cmd(regs, SBIC_CMD_ABORT);
WAIT_CIP(regs);
@ -683,13 +683,13 @@ sbicabort(struct sbic_softc *dev, sbic_regmap_p regs, const char *where)
/* ok, get more drastic.. */
printf("%s: sbicabort - asr %x, trying to reset\n",
dev->sc_dev.dv_xname, asr);
device_xname(&dev->sc_dev), asr);
sbicreset(dev);
dev->sc_flags &= ~SBICF_SELECTED;
return -1;
}
printf("%s: sbicabort - sending DISC command\n",
dev->sc_dev.dv_xname);
device_xname(&dev->sc_dev));
SET_SBIC_cmd(regs, SBIC_CMD_DISC);
do {
@ -763,7 +763,7 @@ sbicinit(struct sbic_softc *dev)
shift_nosync += 8;
DBGPRINTF(("%s: Inhibiting synchronous transfer %02x\n",
dev->sc_dev.dv_xname, inhibit_sync), inhibit_sync);
device_xname(&dev->sc_dev), inhibit_sync), inhibit_sync);
for (i = 0; i < 8; ++i)
if (inhibit_sync & (1 << i))
@ -889,7 +889,7 @@ sbicerror(struct sbic_softc *dev, sbic_regmap_p regs, u_char csr)
if (dev->sc_nexus->xs->xs_control & XS_CTL_SILENT)
return;
printf("%s: ", dev->sc_dev.dv_xname);
printf("%s: ", device_xname(&dev->sc_dev));
printf("csr == 0x%02x\n", csr); /* XXX */
}
@ -1978,7 +1978,7 @@ sbicmsgin(struct sbic_softc *dev)
dev->sc_sync[dev->target].period));
printf("%s: target %d now synchronous,"
" period=%dns, offset=%d.\n",
dev->sc_dev.dv_xname, dev->target,
device_xname(&dev->sc_dev), dev->target,
dev->sc_msg[3] * 4, dev->sc_msg[4]);
} else {
@ -2240,7 +2240,7 @@ sbicnextstate(struct sbic_softc *dev, u_char csr, u_char asr)
if (dev->sc_nexus) {
DBGPRINTF(("%s: reselect %s with active command\n",
dev->sc_dev.dv_xname,
device_xname(&dev->sc_dev),
csr == SBIC_CSR_RSLT_NI ? "NI" : "IFY"),
reselect_debug > 1);
#if defined(DDB) && defined (DEBUG)
@ -2273,7 +2273,7 @@ sbicnextstate(struct sbic_softc *dev, u_char csr, u_char asr)
}
if (acb == NULL) {
printf("%s: reselect %s targ %d not in nexus_list %p\n",
dev->sc_dev.dv_xname,
device_xname(&dev->sc_dev),
csr == SBIC_CSR_RSLT_NI ? "NI" : "IFY", newtarget,
&dev->nexus_list.tqh_first);
panic("bad reselect in sbic");
@ -2379,7 +2379,7 @@ sbictimeout(struct sbic_softc *dev)
if (dev->sc_dmatimo) {
if (dev->sc_dmatimo > 1) {
printf("%s: DMA timeout #%d\n",
dev->sc_dev.dv_xname, dev->sc_dmatimo - 1);
device_xname(&dev->sc_dev), dev->sc_dmatimo - 1);
GET_SBIC_asr(&dev->sc_sbicp, asr);
if (asr & SBIC_ASR_INT) {
/* We need to service a missed IRQ */
@ -2536,7 +2536,7 @@ sbic_dump(struct sbic_softc *dev)
GET_SBIC_csr(regs, csr);
else
csr = 0;
printf("%s@%p regs %p asr %x csr %x\n", dev->sc_dev.dv_xname,
printf("%s@%p regs %p asr %x csr %x\n", device_xname(&dev->sc_dev),
dev, regs, asr, csr);
if ((acb = dev->free_list.tqh_first)) {
printf("Free list:\n");