Module Name: src
Committed By: cegger
Date: Tue May 12 06:54:11 UTC 2009
Modified Files:
src/sys/arch/acorn32/podulebus: asc.c cosc.c csc.c icside.c if_ie.c
podulebus.c ptsc.c sbic.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/podulebus/asc.c \
src/sys/arch/acorn32/podulebus/cosc.c \
src/sys/arch/acorn32/podulebus/csc.c \
src/sys/arch/acorn32/podulebus/ptsc.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/acorn32/podulebus/sbic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/podulebus/asc.c
diff -u src/sys/arch/acorn32/podulebus/asc.c:1.15 src/sys/arch/acorn32/podulebus/asc.c:1.16
--- src/sys/arch/acorn32/podulebus/asc.c:1.15 Thu Jun 12 23:22:36 2008
+++ src/sys/arch/acorn32/podulebus/asc.c Tue May 12 06:54:10 2009
@@ -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 @@
#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)
Index: src/sys/arch/acorn32/podulebus/cosc.c
diff -u src/sys/arch/acorn32/podulebus/cosc.c:1.15 src/sys/arch/acorn32/podulebus/cosc.c:1.16
--- src/sys/arch/acorn32/podulebus/cosc.c:1.15 Sat Mar 14 21:04:01 2009
+++ src/sys/arch/acorn32/podulebus/cosc.c Tue May 12 06:54:10 2009
@@ -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 @@
#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)
Index: src/sys/arch/acorn32/podulebus/csc.c
diff -u src/sys/arch/acorn32/podulebus/csc.c:1.15 src/sys/arch/acorn32/podulebus/csc.c:1.16
--- src/sys/arch/acorn32/podulebus/csc.c:1.15 Sat Mar 14 15:35:58 2009
+++ src/sys/arch/acorn32/podulebus/csc.c Tue May 12 06:54:10 2009
@@ -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 @@
#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)
Index: src/sys/arch/acorn32/podulebus/ptsc.c
diff -u src/sys/arch/acorn32/podulebus/ptsc.c:1.15 src/sys/arch/acorn32/podulebus/ptsc.c:1.16
--- src/sys/arch/acorn32/podulebus/ptsc.c:1.15 Sat Mar 14 15:35:59 2009
+++ src/sys/arch/acorn32/podulebus/ptsc.c Tue May 12 06:54:10 2009
@@ -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 @@
#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)
Index: src/sys/arch/acorn32/podulebus/icside.c
diff -u src/sys/arch/acorn32/podulebus/icside.c:1.27 src/sys/arch/acorn32/podulebus/icside.c:1.28
--- src/sys/arch/acorn32/podulebus/icside.c:1.27 Tue Mar 18 20:46:35 2008
+++ src/sys/arch/acorn32/podulebus/icside.c Tue May 12 06:54:10 2009
@@ -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 @@
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) {
Index: src/sys/arch/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.25 src/sys/arch/acorn32/podulebus/if_ie.c:1.26
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.25 Wed Mar 18 17:06:41 2009
+++ src/sys/arch/acorn32/podulebus/if_ie.c Tue May 12 06:54:10 2009
@@ -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 @@
/* 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 @@
{
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 @@
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 @@
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;
}
Index: src/sys/arch/acorn32/podulebus/podulebus.c
diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.24 src/sys/arch/acorn32/podulebus/podulebus.c:1.25
--- src/sys/arch/acorn32/podulebus/podulebus.c:1.24 Sun Mar 15 22:18:35 2009
+++ src/sys/arch/acorn32/podulebus/podulebus.c Tue May 12 06:54:10 2009
@@ -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 @@
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 ? */
Index: src/sys/arch/acorn32/podulebus/sbic.c
diff -u src/sys/arch/acorn32/podulebus/sbic.c:1.14 src/sys/arch/acorn32/podulebus/sbic.c:1.15
--- src/sys/arch/acorn32/podulebus/sbic.c:1.14 Wed Mar 18 10:22:22 2009
+++ src/sys/arch/acorn32/podulebus/sbic.c Tue May 12 06:54:10 2009
@@ -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 @@
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 @@
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 @@
/* 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 @@
}
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 @@
/* 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 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
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 @@
GET_SBIC_csr(regs, csr);
else
csr = 0;
- printf("%...@%p regs %p asr %x csr %x\n", dev->sc_dev.dv_xname,
+ printf("%...@%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");
