 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootbus.c,v 1.16 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,126 +24,125 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Autoconfiguration support for Sun4d "bootbus".
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.16 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.17 2009/09/20 16:18:21 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <sparc/sparc/cpuunitvar.h>
 #include <sparc/dev/bootbusvar.h>
 #include "locators.h"
 struct bootbus_softc {
 	struct device sc_dev;
 	int sc_node;				/* our OBP node */
 	bus_space_tag_t sc_st;			/* ours */
 	bus_space_tag_t sc_bustag;		/* passed on to children */
 };
-static int bootbus_match(struct device *, struct cfdata *, void *);
+static int bootbus_match(device_t, cfdata_t, void *);
-static void bootbus_attach(struct device *, struct device *, void *);
+static void bootbus_attach(device_t, device_t, void *);
 CFATTACH_DECL(bootbus, sizeof(struct bootbus_softc),
     bootbus_match, bootbus_attach, NULL, NULL);
 static int bootbus_submatch(struct device *, struct cfdata *,
 			    const int *, void *);
 static int bootbus_print(void *, const char *);
 static int bootbus_setup_attach_args(struct bootbus_softc *, bus_space_tag_t,
     int, struct bootbus_attach_args *);
 static void bootbus_destroy_attach_args(struct bootbus_attach_args *);
 static int
-bootbus_match(struct device *parent, struct cfdata *cf, void *aux)
+bootbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct cpuunit_attach_args *cpua = aux;
 	if (strcmp(cpua->cpua_name, cf->cf_name) == 0)
 		return (1);
 	return (0);
+}
 static void
-bootbus_attach(struct device *parent, struct device *self, void *aux)
+bootbus_attach(device_t parent, device_t self, void *aux)
+{
-	struct bootbus_softc *sc = (void *) self;
+	struct bootbus_softc *sc = device_private(self);
 	struct cpuunit_attach_args *cpua = aux;
 	int node, error;
 	sc->sc_node = cpua->cpua_node;
 	sc->sc_st = cpua->cpua_bustag;
 	printf("\n");
 	/*
 	 * Initialize the bus space tag we pass on to our children.
 	 */
 	sc->sc_bustag = malloc(sizeof(*sc->sc_bustag), M_DEVBUF,
 	    M_WAITOK|M_ZERO);
 	sc->sc_bustag->cookie = sc;
 	sc->sc_bustag->parent = sc->sc_st;
 	sc->sc_bustag->sparc_bus_map = sc->sc_st->sparc_bus_map;
 	sc->sc_bustag->sparc_bus_mmap = sc->sc_st->sparc_bus_mmap;
 	/*
 	 * Collect address translations from the OBP.
 	 */
 	error = prom_getprop(sc->sc_node, "ranges",
 	    sizeof(struct openprom_range), &sc->sc_bustag->nranges,
 	    &sc->sc_bustag->ranges);
 	if (error) {
 		printf("%s: error %d getting \"ranges\" property\n",
-		    sc->sc_dev.dv_xname, error);
+		    device_xname(self), error);
 		panic("bootbus_attach");
+	}
 	/* Attach the CPU (and possibly bootbus) child nodes. */
 	for (node = firstchild(sc->sc_node); node != 0;
 	     node = nextsibling(node)) {
 		struct bootbus_attach_args baa;
 		if (bootbus_setup_attach_args(sc, sc->sc_bustag, node, &baa))
 			panic("bootbus_attach: failed to set up attach args");
-		(void) config_found_sm_loc(&sc->sc_dev, "bootbus", NULL, &baa,
+		(void) config_found_sm_loc(self, "bootbus", NULL, &baa,
 					   bootbus_print, bootbus_submatch);
 		bootbus_destroy_attach_args(&baa);
+	}
+}
 static int
-bootbus_submatch(struct device *parent, struct cfdata *cf,
+bootbus_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
 		 const int *ldesc, void *aux)
+{
 	struct bootbus_attach_args *baa = aux;
 	if (cf->cf_loc[BOOTBUSCF_SLOT] != BOOTBUSCF_SLOT_DEFAULT &&
 	    cf->cf_loc[BOOTBUSCF_SLOT] != baa->ba_slot)
 		return (0);
 	if (cf->cf_loc[BOOTBUSCF_OFFSET] != BOOTBUSCF_OFFSET_DEFAULT &&
 	    cf->cf_loc[BOOTBUSCF_OFFSET] != baa->ba_offset)
 		return (0);
 	return (config_match(parent, cf, aux));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ebus.c,v 1.30 2008/05/29 14:51:26 mrg Exp $ */
+/*	$NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $ */
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * EBus support for PCI based SPARC systems (ms-IIep, Ultra).
  * EBus is documented in PCIO manual (Sun Part#: 802-7837-01).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.30 2008/05/29 14:51:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.31 2009/09/20 16:18:21 tsutsui Exp $");
 #if defined(DEBUG) && !defined(EBUS_DEBUG)
 #define EBUS_DEBUG
 #endif
 #ifdef EBUS_DEBUG
 #define	EDB_PROM	0x01
 #define EDB_CHILD	0x02
 #define	EDB_INTRMAP	0x04
 #define EDB_BUSMAP	0x08
 #define EDB_BUSDMA	0x10
 #define EDB_INTR	0x20
 int ebus_debug = 0;
 @@ -73,42 +73,42 @@ int ebus_debug = 0;
 #include <dev/ebus/ebusvar.h>
 #include "opt_blink.h"
 volatile uint32_t *ebus_LED = NULL;
 #ifdef BLINK
 static callout_t ebus_blink_ch;
 static void ebus_blink(void *);
 #endif
 struct ebus_softc {
 	struct device			sc_dev;
-	struct device			*sc_parent;	/* PCI bus */
+	device_t			sc_parent;	/* PCI bus */
 	int				sc_node;	/* PROM node */
 	bus_space_tag_t			sc_bustag;	/* mem tag from pci */
 	/*
 	 * "reg" contains exactly the info we'd get by processing
 	 * "ranges", so don't bother with "ranges" and use "reg" directly.
 	 */
 	struct ofw_pci_register		*sc_reg;
 	int				sc_nreg;
 };
-static int	ebus_match(struct device *, struct cfdata *, void *);
+static int	ebus_match(device_t, cfdata_t, void *);
-static void	ebus_attach(struct device *, struct device *, void *);
+static void	ebus_attach(device_t, device_t, void *);
 CFATTACH_DECL(ebus, sizeof(struct ebus_softc),
     ebus_match, ebus_attach, NULL, NULL);
 static int	ebus_setup_attach_args(struct ebus_softc *, bus_space_tag_t,
 				bus_dma_tag_t, int, struct ebus_attach_args *);
 static void	ebus_destroy_attach_args(struct ebus_attach_args *);
 static int	ebus_print(void *, const char *);
 /*
  * here are our bus space and bus DMA routines.
  */
 static paddr_t	ebus_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
 @@ -171,27 +171,27 @@ static const struct msiiep_known_ebus_wi
  * XXX: This assumes single EBus.  However I don't think any ms-IIep
  * system ever used more than one.  In any case, without looking at a
  * system with multiple PCIO chips I don't know how to correctly
  * program the driver to handle PROM glitches in them, so for the time
  * being just use globals.
  */
 static const struct msiiep_ebus_intr_wiring *wiring_map;
 static int wiring_map_size;
 static int ebus_init_wiring_table(struct ebus_softc *);
 static int
-ebus_match(struct device *parent, struct cfdata *match, void *aux)
+ebus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	char name[10];
 	int node;
 	/* Only attach if there's a PROM node. */
 	node = PCITAG_NODE(pa->pa_tag);
 	if (node == -1)
 		return (0);
 	prom_getpropstringA(node, "name", name, sizeof name);
 	if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE
 	    && PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SUN
 @@ -202,75 +202,75 @@ ebus_match(struct device *parent, struct
 	return (0);
+}
 static int
 ebus_init_wiring_table(struct ebus_softc *sc)
+{
 	const struct msiiep_known_ebus_wiring *p;
 	char buf[32];
 	char *model;
 	if (wiring_map != NULL) {
 		printf("%s: global ebus wiring map already initalized\n",
-		       sc->sc_dev.dv_xname);
+		    device_xname(&sc->sc_dev));
 		return (0);
+	}
 	model = prom_getpropstringA(prom_findroot(), "model",
 				    buf, sizeof(buf));
 	if (model == NULL)
 		panic("ebus_init_wiring_table: no \"model\" property");
 	for (p = known_models; p->model != NULL; ++p)
 		if (strcmp(model, p->model) == 0) {
 			wiring_map = p->map;
 			wiring_map_size = p->mapsize;
 			return (1);
+		}
 	/* not found?  we should have failed in pci_attach_hook then. */
 	panic("ebus_init_wiring_table: unknown model %s", model);
+}
 /*
  * attach an ebus and all it's children.  this code is modeled
  * after the sbus code which does similar things.
  */
 static void
-ebus_attach(struct device *parent, struct device *self, void *aux)
+ebus_attach(device_t parent, device_t self, void *aux)
+{
-	struct ebus_softc *sc = (struct ebus_softc *)self;
+	struct ebus_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct ebus_attach_args ea;
 	bus_space_tag_t sbt;
 	bus_dma_tag_t dmatag;
 	bus_space_handle_t hLED;
 	pcireg_t base14;
 	int node, error;
 	char devinfo[256];
 #ifdef BLINK
 	callout_init(&ebus_blink_ch, 0);
 #endif
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	printf(": %s, revision 0x%02x\n",
 	       devinfo, PCI_REVISION(pa->pa_class));
 	node = PCITAG_NODE(pa->pa_tag);
 	if (node == -1)
-		panic("%s: unable to find ebus node", self->dv_xname);
+		panic("%s: unable to find ebus node", device_xname(self));
 	if (ebus_init_wiring_table(sc) == 0)
 		return;
 	/* map the LED register */
 	base14 = pci_conf_read(pa->pa_pc, pa->pa_tag, 0x14);
 	if (bus_space_map(pa->pa_memt, base14 + 0x726000, 4, 0, &hLED) == 0) {
 		ebus_LED = bus_space_vaddr(pa->pa_memt, hLED);
 #ifdef BLINK
 		ebus_blink((void *)0);
 #endif
 	} else {
 		printf("unable to map the LED register\n");
 @@ -288,27 +288,27 @@ ebus_attach(struct device *parent, struc
 	sbt->sparc_intr_establish = ebus_intr_establish;
 	dmatag = ebus_alloc_dma_tag(sc, pa->pa_dmat);
 	/*
 	 * Setup ranges.  The interesting thing is that we use "reg"
 	 * not "ranges", since "reg" on ebus has exactly the data we'd
 	 * get by processing "ranges".
 	 */
 	error = prom_getprop(node, "reg", sizeof(struct ofw_pci_register),
 			     &sc->sc_nreg, &sc->sc_reg);
 	if (error)
 		panic("%s: unable to read ebus registers (error %d)",
-		      self->dv_xname, error);
+		    device_xname(self), error);
 	/*
 	 * now attach all our children
 	 */
 	DPRINTF(EDB_CHILD, ("ebus node %08x, searching children...\n", node));
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		char *name = prom_getpropstring(node, "name");
 		if (ebus_setup_attach_args(sc, sbt, dmatag, node, &ea) != 0) {
 			printf("ebus_attach: %s: incomplete\n", name);
 			continue;
+		}
 		DPRINTF(EDB_CHILD,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ie_obio.c,v 1.36 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -68,27 +68,27 @@
  *		October 1994, January 1995.
  */
 /*
  * The i82586 is a very painful chip, found in sun3's, sun-4/100's
  * sun-4/200's, and VME based suns.  The byte order is all wrong for a
  * SUN, making life difficult.  Programming this chip is mostly the same,
  * but certain details differ from system to system.  This driver is
  * written so that different "ie" interfaces can be controled by the same
  * driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.36 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.37 2009/09/20 16:18:21 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 @@ -115,28 +115,28 @@ struct ieob {
 #define IEOB_IENAB  0x10	/* interrupt enable */
 #define IEOB_XXXXX  0x08	/* free bit */
 #define IEOB_XCVRL2 0x04	/* level 2 transceiver? */
 #define IEOB_BUSERR 0x02	/* bus error */
 #define IEOB_INT    0x01	/* interrupt */
 #define IEOB_ADBASE 0xff000000  /* KVA base addr of 24 bit address space */
 static void ie_obreset(struct ie_softc *, int);
 static void ie_obattend(struct ie_softc *, int);
 static void ie_obrun(struct ie_softc *);
-int ie_obio_match(struct device *, struct cfdata *, void *);
+int ie_obio_match(device_t, cfdata_t, void *);
-void ie_obio_attach(struct device *, struct device *, void *);
+void ie_obio_attach(device_t, device_t, void *);
 CFATTACH_DECL(ie_obio, sizeof(struct ie_softc),
     ie_obio_match, ie_obio_attach, NULL, NULL);
 /* Supported media */
 static int media[] = {
 	IFM_ETHER | IFM_10_2,
 };
 #define NMEDIA	(sizeof(media) / sizeof(media[0]))
 /*
  * OBIO ie support routines
 @@ -221,48 +221,48 @@ ie_obio_write24(struct ie_softc *sc, int
 	uint16_t v0, v1;
 	u_char *t;
 	t = (u_char *)&v0;
 	t[0] = f[3]; t[1] = f[2];
 	bus_space_write_2(sc->bt, sc->bh, offset, v0);
 	t = (u_char *)&v1;
 	t[0] = f[1]; t[1] = 0;
 	bus_space_write_2(sc->bt, sc->bh, offset+2, v1);
+}
 int
-ie_obio_match(struct device *parent, struct cfdata *cf, void *aux)
+ie_obio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct obio4_attach_args *oba;
 	if (uoba->uoba_isobio4 == 0)
 		return (0);
 	oba = &uoba->uoba_oba4;
 	return (bus_space_probe(oba->oba_bustag, oba->oba_paddr,
 ,	/* probe size */
 ,	/* offset */
 ,	/* flags */
 				NULL, NULL));
+}
 void
-ie_obio_attach(struct device *parent, struct device *self, void *aux)
+ie_obio_attach(device_t parent, device_t self, void *aux)
+{
 	union obio_attach_args *uoba = aux;
 	struct obio4_attach_args *oba = &uoba->uoba_oba4;
-	struct ie_softc *sc = (void *) self;
+	struct ie_softc *sc = device_private(self);
 	bus_dma_tag_t dmatag = oba->oba_dmatag;
 	bus_space_handle_t bh;
 	bus_dma_segment_t seg;
 	int rseg;
 	int error;
 	paddr_t pa;
 	struct intrhand *ih;
 	bus_size_t memsize;
 	u_long iebase;
 	uint8_t myaddr[ETHER_ADDR_LEN];
 	sc->bt = oba->oba_bustag;
 @@ -272,65 +272,65 @@ ie_obio_attach(struct device *parent, st
 	sc->memcopyout = ie_obio_memcopyout;
 	sc->memcopyin = ie_obio_memcopyin;
 	sc->ie_bus_barrier = NULL;
 	sc->ie_bus_read16 = ie_obio_read16;
 	sc->ie_bus_write16 = ie_obio_write16;
 	sc->ie_bus_write24 = ie_obio_write24;
 	sc->sc_msize = memsize = 65536; /* XXX */
 	if (bus_space_map(oba->oba_bustag, oba->oba_paddr,
 			  sizeof(struct ieob),
 			  BUS_SPACE_MAP_LINEAR,
 			  &bh) != 0) {
-		printf("%s: cannot map registers\n", self->dv_xname);
+		printf("%s: cannot map registers\n", device_xname(self));
 		return;
+	}
 	sc->sc_reg = (void *)bh;
 	/*
 	 * Allocate control & buffer memory.
 	 */
 	if ((error = bus_dmamap_create(dmatag, memsize, 1, memsize, 0,
 					BUS_DMA_NOWAIT|BUS_DMA_24BIT,
 					&sc->sc_dmamap)) != 0) {
 		printf("%s: DMA map create error %d\n",
-			sc->sc_dev.dv_xname, error);
+		    device_xname(self), error);
 		return;
+	}
 	if ((error = bus_dmamem_alloc(dmatag, memsize, 64*1024, 0,
 			     &seg, 1, &rseg,
 			     BUS_DMA_NOWAIT | BUS_DMA_24BIT)) != 0) {
 		printf("%s: DMA memory allocation error %d\n",
-			self->dv_xname, error);
+		    device_xname(self), error);
 		return;
+	}
 	/* Map DMA buffer in CPU addressable space */
 	if ((error = bus_dmamem_map(dmatag, &seg, rseg, memsize,
 				    (void **)&sc->sc_maddr,
 				    BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) != 0) {
 		printf("%s: DMA buffer map error %d\n",
-			sc->sc_dev.dv_xname, error);
+		    device_xname(self), error);
 		bus_dmamem_free(dmatag, &seg, rseg);
 		return;
+	}
 	/* Load the segment */
 	if ((error = bus_dmamap_load(dmatag, sc->sc_dmamap,
 				     sc->sc_maddr, memsize, NULL,
 				     BUS_DMA_NOWAIT)) != 0) {
 		printf("%s: DMA buffer map load error %d\n",
-			sc->sc_dev.dv_xname, error);
+		    device_xname(self), error);
 		bus_dmamem_unmap(dmatag, sc->sc_maddr, memsize);
 		bus_dmamem_free(dmatag, &seg, rseg);
 		return;
+	}
 	wzero(sc->sc_maddr, memsize);
 	sc->bh = (bus_space_handle_t)(sc->sc_maddr);
 	/*
 	 * The i82586's 24-bit address space maps to the last 16MB of
 	 * KVA space ().  In addition, the SCP must appear
 	 * at IE_SCP_ADDR within the 24-bit address space,
 	 * i.e. at KVA  IEOB_ADBASE+IE_SCP_ADDR, at the very top of

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtc.c,v 1.14 2006/09/04 23:45:30 gdamore Exp $ */
+/*	$NetBSD: rtc.c,v 1.15 2009/09/20 16:18:21 tsutsui Exp $ */
 /*
  * Copyright (c) 2001 Valeriy E. Ushakov
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,55 +24,55 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * `rtc' is a DS1287A (== MC146818A) time-of-day clock at EBus.
  * In Krups it's not used to store idprom so this driver doesn't
  * support it.  Don't know about other ms-IIep systems.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.14 2006/09/04 23:45:30 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.15 2009/09/20 16:18:21 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #ifdef GPROF
 #include <sys/gmon.h>
 #endif
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <dev/clock_subr.h>
 #include <dev/ic/mc146818reg.h>
 #include <dev/ebus/ebusreg.h>
 #include <dev/ebus/ebusvar.h>
 struct rtc_ebus_softc {
 	struct device		sc_dev;
 	bus_space_tag_t		sc_bt;	/* parent bus tag */
 	bus_space_handle_t	sc_bh;	/* handle for registers */
 };
-static int	rtcmatch_ebus(struct device *, struct cfdata *, void *);
+static int	rtcmatch_ebus(device_t, cfdata_t, void *);
-static void	rtcattach_ebus(struct device *, struct device *, void *);
+static void	rtcattach_ebus(device_t, device_t, void *);
 CFATTACH_DECL(rtc_ebus, sizeof(struct rtc_ebus_softc),
     rtcmatch_ebus, rtcattach_ebus, NULL, NULL);
 /* XXX: global TOD clock handle (sparc/clock.c) */
 extern todr_chip_handle_t todr_handle;
 /* todr(9) methods */
 static int rtc_gettime(todr_chip_handle_t, volatile struct timeval *);
 static int rtc_settime(todr_chip_handle_t, volatile struct timeval *);
 int rtc_auto_century_adjust = 1; /* XXX: do we ever want not to? */
 @@ -93,39 +93,38 @@ mc146818_read(void *cookie, u_int reg)
+}
 void
 mc146818_write(void *cookie, u_int reg, u_int datum)
+{
 	struct rtc_ebus_softc *sc = cookie;
 	bus_space_write_1(sc->sc_bt, sc->sc_bh, RTC_ADDR, reg);
 	bus_space_write_1(sc->sc_bt, sc->sc_bh, RTC_DATA, datum);
+}
 static int
-rtcmatch_ebus(struct device *parent, struct cfdata *cf, void *aux)
+rtcmatch_ebus(device_t parent, cfdata_t cf, void *aux)
+{
 	struct ebus_attach_args *ea = aux;
 	return (strcmp(cf->cf_name, ea->ea_name) == 0);
+}
 static void
-rtcattach_ebus(struct device *parent, struct device *self, void *aux)
+rtcattach_ebus(device_t parent, device_t self, void *aux)
+{
-	struct rtc_ebus_softc *sc = (void *)self;
+	struct rtc_ebus_softc *sc = device_private(self);
 	struct ebus_attach_args *ea = aux;
 	todr_chip_handle_t handle;
 	sc->sc_bt = ea->ea_bustag;
 	if (bus_space_map(sc->sc_bt, EBUS_ADDR_FROM_REG(&ea->ea_reg[0]),
 			  ea->ea_reg[0].size, 0, &sc->sc_bh) != 0)
+	{
 		printf(": unable to map registers\n");
 		return;
+	}
 	/* XXX: no "model" property in Krups */
 	printf(": time-of-day clock\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vme_machdep.c,v 1.59 2008/12/19 18:49:38 cegger Exp $	*/
+/*	$NetBSD: vme_machdep.c,v 1.60 2009/09/20 16:18:21 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.59 2008/12/19 18:49:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.60 2009/09/20 16:18:21 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/syslog.h>
 #include <uvm/uvm_extern.h>
 @@ -66,30 +66,30 @@ struct sparcvme_softc {
 	bus_space_tag_t	 sc_bustag;
 	bus_dma_tag_t	 sc_dmatag;
 	struct vmebusreg *sc_reg; 	/* VME control registers */
 	struct vmebusvec *sc_vec;	/* VME interrupt vector */
 	struct rom_range *sc_range;	/* ROM range property */
 	int		 sc_nrange;
 	volatile uint32_t *sc_ioctags;	/* VME IO-cache tag registers */
 	volatile uint32_t *sc_iocflush;/* VME IO-cache flush registers */
 	int 		 (*sc_vmeintr)(void *);
 };
 struct  sparcvme_softc *sparcvme_sc;/*XXX*/
 /* autoconfiguration driver */
-static int	vmematch_iommu(struct device *, struct cfdata *, void *);
+static int	vmematch_iommu(device_t, cfdata_t, void *);
-static void	vmeattach_iommu(struct device *, struct device *, void *);
+static void	vmeattach_iommu(device_t, device_t, void *);
-static int	vmematch_mainbus(struct device *, struct cfdata *, void *);
+static int	vmematch_mainbus(device_t, cfdata_t, void *);
-static void	vmeattach_mainbus(struct device *, struct device *, void *);
+static void	vmeattach_mainbus(device_t, device_t, void *);
 #if defined(SUN4)
 int 		vmeintr4(void *);
 #endif
 #if defined(SUN4M)
 int 		vmeintr4m(void *);
 static int	sparc_vme_error(void);
 #endif
 static int	sparc_vme_probe(void *, vme_addr_t, vme_size_t,
 				vme_am_t, vme_datasize_t,
 				int (*)(void *,
 					bus_space_tag_t, bus_space_handle_t),
 @@ -253,68 +253,68 @@ struct sparc_bus_dma_tag sparc_vme_iommu
 	sparc_vme_iommu_dmamap_unload,
 	sparc_vme_iommu_dmamap_sync,
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	sparc_vme_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };
 #endif
 static int
-vmematch_mainbus(struct device *parent, struct cfdata *cf, void *aux)
+vmematch_mainbus(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (!CPU_ISSUN4 || vme_attached)
 		return (0);
 	return (strcmp("vme", ma->ma_name) == 0);
+}
 static int
-vmematch_iommu(struct device *parent, struct cfdata *cf, void *aux)
+vmematch_iommu(device_t parent, cfdata_t cf, void *aux)
+{
 	struct iommu_attach_args *ia = aux;
 	if (vme_attached)
 		return 0;
 	return (strcmp("vme", ia->iom_name) == 0);
+}
 static void
-vmeattach_mainbus(struct device *parent, struct device *self, void *aux)
+vmeattach_mainbus(device_t parent, device_t self, void *aux)
+{
 #if defined(SUN4)
 	struct mainbus_attach_args *ma = aux;
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)self;
+	struct sparcvme_softc *sc = device_private(self);
 	struct vmebus_attach_args vba;
 	vme_attached = 1;
 	sc->sc_bustag = ma->ma_bustag;
 	sc->sc_dmatag = ma->ma_dmatag;
 	/* VME interrupt entry point */
 	sc->sc_vmeintr = vmeintr4;
-/*XXX*/	sparc_vme_chipset_tag.cookie = self;
+/*XXX*/	sparc_vme_chipset_tag.cookie = sc;
 /*XXX*/	sparc_vme_chipset_tag.vct_dmamap_create = sparc_vct4_dmamap_create;
 /*XXX*/	sparc_vme_chipset_tag.vct_dmamap_destroy = sparc_vct_dmamap_destroy;
-/*XXX*/	sparc_vme4_dma_tag._cookie = self;
+/*XXX*/	sparc_vme4_dma_tag._cookie = sc;
 	vba.va_vct = &sparc_vme_chipset_tag;
 	vba.va_bdt = &sparc_vme4_dma_tag;
 	vba.va_slaveconfig = 0;
 	/* Fall back to our own `range' construction */
 	sc->sc_range = vmebus_translations;
 	sc->sc_nrange =
 		sizeof(vmebus_translations)/sizeof(vmebus_translations[0]);
 	vme_dvmamap = extent_create("vmedvma", VME4_DVMA_BASE, VME4_DVMA_END,
 				    M_DEVBUF, 0, 0, EX_NOWAIT);
 	if (vme_dvmamap == NULL)
 @@ -322,110 +322,110 @@ vmeattach_mainbus(struct device *parent,
 	printf("\n");
 	(void)config_found(self, &vba, 0);
 #endif /* SUN4 */
 	return;
+}
 /* sun4m vmebus */
 static void
 vmeattach_iommu(struct device *parent, struct device *self, void *aux)
+{
 #if defined(SUN4M)
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)self;
+	struct sparcvme_softc *sc = device_private(self);
 	struct iommu_attach_args *ia = aux;
 	struct vmebus_attach_args vba;
 	bus_space_handle_t bh;
 	int node;
 	int cline;
 	sc->sc_bustag = ia->iom_bustag;
 	sc->sc_dmatag = ia->iom_dmatag;
 	/* VME interrupt entry point */
 	sc->sc_vmeintr = vmeintr4m;
-/*XXX*/	sparc_vme_chipset_tag.cookie = self;
+/*XXX*/	sparc_vme_chipset_tag.cookie = sc;
 /*XXX*/	sparc_vme_chipset_tag.vct_dmamap_create = sparc_vct_iommu_dmamap_create;
 /*XXX*/	sparc_vme_chipset_tag.vct_dmamap_destroy = sparc_vct_dmamap_destroy;
-/*XXX*/	sparc_vme_iommu_dma_tag._cookie = self;
+/*XXX*/	sparc_vme_iommu_dma_tag._cookie = sc;
 	vba.va_vct = &sparc_vme_chipset_tag;
 	vba.va_bdt = &sparc_vme_iommu_dma_tag;
 	vba.va_slaveconfig = 0;
 	node = ia->iom_node;
 	/*
 	 * Map VME control space
 	 */
 	if (ia->iom_nreg < 2) {
-		printf("%s: only %d register sets\n", self->dv_xname,
+		printf("%s: only %d register sets\n", device_xname(self),
 			ia->iom_nreg);
 		return;
+	}
 	if (bus_space_map(ia->iom_bustag,
 			  (bus_addr_t) BUS_ADDR(ia->iom_reg[0].oa_space,
 						ia->iom_reg[0].oa_base),
 			  (bus_size_t)ia->iom_reg[0].oa_size,
 			  BUS_SPACE_MAP_LINEAR,
 			  &bh) != 0) {
-		panic("%s: can't map vmebusreg", self->dv_xname);
+		panic("%s: can't map vmebusreg", device_xname(self));
+	}
 	sc->sc_reg = (struct vmebusreg *)bh;
 	if (bus_space_map(ia->iom_bustag,
 			  (bus_addr_t) BUS_ADDR(ia->iom_reg[1].oa_space,
 						ia->iom_reg[1].oa_base),
 			  (bus_size_t)ia->iom_reg[1].oa_size,
 			  BUS_SPACE_MAP_LINEAR,
 			  &bh) != 0) {
-		panic("%s: can't map vmebusvec", self->dv_xname);
+		panic("%s: can't map vmebusvec", device_xname(self));
+	}
 	sc->sc_vec = (struct vmebusvec *)bh;
 	/*
 	 * Map VME IO cache tags and flush control.
 	 */
 	if (bus_space_map(ia->iom_bustag,
 			  (bus_addr_t) BUS_ADDR(
 				ia->iom_reg[1].oa_space,
 				ia->iom_reg[1].oa_base + VME_IOC_TAGOFFSET),
 			  VME_IOC_SIZE,
 			  BUS_SPACE_MAP_LINEAR,
 			  &bh) != 0) {
-		panic("%s: can't map IOC tags", self->dv_xname);
+		panic("%s: can't map IOC tags", device_xname(self));
+	}
 	sc->sc_ioctags = (uint32_t *)bh;
 	if (bus_space_map(ia->iom_bustag,
 			  (bus_addr_t) BUS_ADDR(
 				ia->iom_reg[1].oa_space,
 				ia->iom_reg[1].oa_base + VME_IOC_FLUSHOFFSET),
 			  VME_IOC_SIZE,
 			  BUS_SPACE_MAP_LINEAR,
 			  &bh) != 0) {
-		panic("%s: can't map IOC flush registers", self->dv_xname);
+		panic("%s: can't map IOC flush registers", device_xname(self));
+	}
 	sc->sc_iocflush = (uint32_t *)bh;
 	/*
 	 * Get "range" property.
 	 */
 	if (prom_getprop(node, "ranges", sizeof(struct rom_range),
 		    &sc->sc_nrange, &sc->sc_range) != 0) {
-		panic("%s: can't get ranges property", self->dv_xname);
+		panic("%s: can't get ranges property", device_xname(self));
+	}
 	sparcvme_sc = sc;
 	vmeerr_handler = sparc_vme_error;
 	/*
 	 * Invalidate all IO-cache entries.
 	 */
 	for (cline = VME_IOC_SIZE/VME_IOC_LINESZ; cline > 0;) {
 		sc->sc_ioctags[--cline] = 0;
+	}
 	/* Enable IO-cache */
 @@ -488,27 +488,27 @@ vmeprobe_mycb(void *bh, void *arg)
+{
 	struct vmeprobe_myarg *a = arg;
 	a->res = (*a->cb)(a->cbarg, a->tag, (bus_space_handle_t)bh);
 	return (!a->res);
+}
 static int
 sparc_vme_probe(void *cookie, vme_addr_t addr, vme_size_t len, vme_am_t mod,
 		vme_datasize_t datasize,
 		int (*callback)(void *, bus_space_tag_t, bus_space_handle_t),
 		void *arg)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	bus_addr_t paddr;
 	bus_size_t size;
 	struct vmeprobe_myarg myarg;
 	int res, i;
 	if (vmebus_translate(sc, mod, addr, &paddr) != 0)
 		return (EINVAL);
 	size = (datasize == VME_D8 ? 1 : (datasize == VME_D16 ? 2 : 4));
 	if (callback) {
 		myarg.cb = callback;
 		myarg.cbarg = arg;
 @@ -525,27 +525,27 @@ sparc_vme_probe(void *cookie, vme_addr_t
 , 0, 0);
 		if (res == 0)
 			return (EIO);
 		paddr += size;
+	}
 	return (0);
+}
 static int
 sparc_vme_map(void *cookie, vme_addr_t addr, vme_size_t size, vme_am_t mod,
 	      vme_datasize_t datasize, vme_swap_t swap,
 	      bus_space_tag_t *tp, bus_space_handle_t *hp, vme_mapresc_t *rp)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	bus_addr_t paddr;
 	int error;
 	error = vmebus_translate(sc, mod, addr, &paddr);
 	if (error != 0)
 		return (error);
 	*tp = sc->sc_bustag;
 	return (bus_space_map(sc->sc_bustag, paddr, size, 0, hp));
+}
 int
 sparc_vme_mmap_cookie(vme_addr_t addr, vme_am_t mod, bus_space_handle_t *hp)
 @@ -559,27 +559,27 @@ sparc_vme_mmap_cookie(vme_addr_t addr, v
 		return (error);
 	return (bus_space_mmap(sc->sc_bustag, paddr, 0,
 /*prot is ignored*/, 0));
+}
 #ifdef notyet
 #if defined(SUN4M)
 static void
 sparc_vme_iommu_barrier(bus_space_tag_t t, bus_space_handle_t h,
 			bus_size_t offset, bus_size_t size.
 			int flags)
+{
-	struct vmebusreg *vbp = (struct vmebusreg *)t->cookie;
+	struct vmebusreg *vbp = t->cookie;
 	/* Read async fault status to flush write-buffers */
 	(*(volatile int *)&vbp->vmebus_afsr);
+}
 #endif /* SUN4M */
 #endif
 /*
  * VME Interrupt Priority Level to sparc Processor Interrupt Level.
  */
 static int vme_ipl_to_pil[] = {
 @@ -731,27 +731,27 @@ sparc_vme_intr_map(void *cookie, int lev
 static const struct evcnt *
 sparc_vme_intr_evcnt(void *cookie, vme_intr_handle_t vih)
+{
 	/* XXX for now, no evcnt parent reported */
 	return NULL;
+}
 static void *
 sparc_vme_intr_establish(void *cookie, vme_intr_handle_t vih, int level,
 			 int (*func)(void *), void *arg)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	struct sparc_vme_intr_handle *svih =
 			(struct sparc_vme_intr_handle *)vih;
 	struct intrhand *ih;
 	int pil;
 	/* Translate VME priority to processor IPL */
 	pil = vme_ipl_to_pil[svih->pri];
 	if (level < pil)
 		panic("vme_intr_establish: class lvl (%d) < pil (%d)\n",
 			level, pil);
 	svih->ih.ih_fun = func;
 @@ -795,41 +795,41 @@ sparc_vme_intr_disestablish(void *cookie
 	panic("sparc_vme_intr_disestablish");
+}
 /*
  * VME DMA functions.
  */
 #if defined(SUN4) || defined(SUN4M)
 static void
 sparc_vct_dmamap_destroy(void *cookie, bus_dmamap_t map)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	bus_dmamap_destroy(sc->sc_dmatag, map);
+}
 #endif
 #if defined(SUN4)
 static int
 sparc_vct4_dmamap_create(void *cookie, vme_size_t size, vme_am_t am,
 			 vme_datasize_t datasize, vme_swap_t swap,
 			 int nsegments, vme_size_t maxsegsz,
 			 vme_addr_t boundary, int flags,
 			 bus_dmamap_t *dmamp)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	/* Allocate a base map through parent bus ops */
 	return (bus_dmamap_create(sc->sc_dmatag, size, nsegments, maxsegsz,
 				  boundary, flags, dmamp));
+}
 static int
 sparc_vme4_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map,
 		       void *buf, bus_size_t buflen,
 		       struct proc *p, int flags)
+{
 	bus_addr_t dva;
 	bus_size_t sgsize;
 @@ -946,27 +946,27 @@ sparc_vme_iommu_dmamap_create(bus_dma_ta
+{
 	printf("sparc_vme_dmamap_create: please use `vme_dmamap_create'\n");
 	return (EINVAL);
+}
 static int
 sparc_vct_iommu_dmamap_create(void *cookie, vme_size_t size, vme_am_t am,
 			      vme_datasize_t datasize, vme_swap_t swap,
 			      int nsegments, vme_size_t maxsegsz,
 			      vme_addr_t boundary, int flags,
 			      bus_dmamap_t *dmamp)
+{
-	struct sparcvme_softc *sc = (struct sparcvme_softc *)cookie;
+	struct sparcvme_softc *sc = cookie;
 	bus_dmamap_t map;
 	int error;
 	/* Allocate a base map through parent bus ops */
 	error = bus_dmamap_create(sc->sc_dmatag, size, nsegments, maxsegsz,
 				  boundary, flags, &map);
 	if (error != 0)
 		return (error);
 	/*
 	 * Each I/O cache line maps to a 8K section of VME DVMA space, so
 	 * we must ensure that DVMA alloctions are always 8K aligned.
 	 */
 @@ -986,27 +986,27 @@ sparc_vct_iommu_dmamap_create(void *cook
 		map->_dm_ex_end   = VME_IOMMU_DVMA_AM32_END;
 		break;
+	}
 	*dmamp = map;
 	return (0);
+}
 static int
 sparc_vme_iommu_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map,
 			    void *buf, bus_size_t buflen,
 			    struct proc *p, int flags)
+{
-	struct sparcvme_softc	*sc = (struct sparcvme_softc *)t->_cookie;
+	struct sparcvme_softc	*sc = t->_cookie;
 	volatile uint32_t	*ioctags;
 	int			error;
 	/* Round request to a multiple of the I/O cache size */
 	buflen = (buflen + VME_IOC_PAGESZ - 1) & -VME_IOC_PAGESZ;
 	error = bus_dmamap_load(sc->sc_dmatag, map, buf, buflen, p, flags);
 	if (error != 0)
 		return (error);
 	/* Allocate I/O cache entries for this range */
 	ioctags = sc->sc_ioctags + VME_IOC_LINE(map->dm_segs[0].ds_addr);
 	while (buflen > 0) {
 		*ioctags = VME_IOC_IC | VME_IOC_W;
 @@ -1017,27 +1017,27 @@ sparc_vme_iommu_dmamap_load(bus_dma_tag_
 	/*
 	 * Adjust DVMA address to VME view.
 	 * Note: the DVMA base address is the same for all
 	 * VME address spaces.
 	 */
 	map->dm_segs[0].ds_addr -= VME_IOMMU_DVMA_BASE;
 	return (0);
+}
 static void
 sparc_vme_iommu_dmamap_unload(bus_dma_tag_t t, bus_dmamap_t map)
+{
-	struct sparcvme_softc	*sc = (struct sparcvme_softc *)t->_cookie;
+	struct sparcvme_softc	*sc = t->_cookie;
 	volatile uint32_t	*flushregs;
 	int			len;
 	/* Go from VME to CPU view */
 	map->dm_segs[0].ds_addr += VME_IOMMU_DVMA_BASE;
 	/* Flush VME I/O cache */
 	len = map->dm_segs[0]._ds_sgsize;
 	flushregs = sc->sc_iocflush + VME_IOC_LINE(map->dm_segs[0].ds_addr);
 	while (len > 0) {
 		*flushregs = 0;
 		flushregs += VME_IOC_LINESZ/sizeof(*flushregs);
 		len -= VME_IOC_PAGESZ;
 @@ -1058,18 +1058,18 @@ sparc_vme_iommu_dmamap_sync(bus_dma_tag_
+{
 	/*
 	 * XXX Should perform cache flushes as necessary.
 	 */
+}
 #endif /* SUN4M */
 #if defined(SUN4) || defined(SUN4M)
 static int
 sparc_vme_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
 		     size_t size, void **kvap, int flags)
+{
-	struct sparcvme_softc	*sc = (struct sparcvme_softc *)t->_cookie;
+	struct sparcvme_softc	*sc = t->_cookie;
 	return (bus_dmamem_map(sc->sc_dmatag, segs, nsegs, size, kvap, flags));
+}
 #endif /* SUN4 || SUN4M */