 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $	*/
+/*	$NetBSD: if_hme_sbus.c,v 1.29 2009/05/17 00:28:35 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1999 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * SBus front-end device driver for the HME ethernet device.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.29 2009/05/17 00:28:35 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 @@ -75,26 +75,27 @@ hmematch_sbus(device_t parent, cfdata_t
 	struct sbus_attach_args *sa = aux;
 	return (strcmp(cf->cf_name, sa->sa_name) == 0 ||
 	    strcmp("SUNW,qfe", sa->sa_name) == 0 ||
 	    strcmp("SUNW,hme", sa->sa_name) == 0);
+}
 void
 hmeattach_sbus(device_t parent, device_t self, void *aux)
+{
 	struct sbus_attach_args *sa = aux;
 	struct hmesbus_softc *hsc = (void *)self;
 	struct hme_softc *sc = &hsc->hsc_hme;
 	struct sbus_softc *sbsc = device_private(parent);
 	struct sbusdev *sd = &hsc->hsc_sbus;
 	u_int32_t burst, sbusburst;
 	int node;
 	node = sa->sa_node;
 	/* Pass on the bus tags */
 	sc->sc_bustag = sa->sa_bustag;
 	sc->sc_dmatag = sa->sa_dmatag;
 	printf(": Sun Happy Meal Ethernet (%s)\n",
 	    sa->sa_name);
 @@ -154,27 +155,27 @@ hmeattach_sbus(device_t parent, device_t
 		aprint_error_dev(self, "cannot map MIF registers\n");
 		return;
+	}
 	sd->sd_reset = (void *)hme_reset;
 	sbus_establish(sd, self);
 	prom_getether(node, sc->sc_enaddr);
 	/*
 	 * Get transfer burst size from PROM and pass it on
 	 * to the back-end driver.
 	 */
-	sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+	sbusburst = sbsc->sc_burst;
 	if (sbusburst == 0)
 		sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
 	burst = prom_getpropint(node, "burst-sizes", -1);
 	if (burst == -1)
 		/* take SBus burst sizes */
 		burst = sbusburst;
 	/* Clamp at parent's burst sizes */
 	burst &= sbusburst;
 	/* Translate into plain numerical format */
 	sc->sc_burst =  (burst & SBUS_BURST_32) ? 32 :

 @@ -1,14 +1,14 @@
-/* $NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.76 2009/05/17 00:28:35 tsutsui Exp $ */
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
+ *
  * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * Additional Copyright (C) 2000-2007 by Matthew Jacob
  * 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
 @@ -23,27 +23,27 @@
  * 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 AUTHOR 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: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.76 2009/05/17 00:28:35 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <dev/ic/isp_netbsd.h>
 #include <sys/intr.h>
 #include <machine/autoconf.h>
 #include <dev/sbus/sbusvar.h>
 #include <sys/reboot.h>
 @@ -112,26 +112,27 @@ isp_match(device_t parent, cfdata_t cf,
 		strcmp("SUNW,isp", sa->sa_name) == 0 ||
 		strcmp("QLGC,isp", sa->sa_name) == 0);
 	return (rv);
+}
 static void
 isp_sbus_attach(device_t parent, device_t self, void *aux)
+{
 	int freq, ispburst, sbusburst;
 	struct sbus_attach_args *sa = aux;
 	struct isp_sbussoftc *sbc = (struct isp_sbussoftc *) self;
 	struct sbus_softc *sbsc = device_private(parent);
 	ispsoftc_t *isp = &sbc->sbus_isp;
 	printf(" for %s\n", sa->sa_name);
 	isp->isp_nchan = isp->isp_osinfo.adapter.adapt_nchannels = 1;
 	sbc->sbus_bustag = sa->sa_bustag;
 	if (sa->sa_nintr != 0)
 		sbc->sbus_pri = sa->sa_pri;
 	sbc->sbus_mdvec = mdvec;
 	if (sa->sa_npromvaddrs) {
 		sbus_promaddr_to_handle(sa->sa_bustag,
 @@ -150,27 +151,27 @@ isp_sbus_attach(device_t parent, device_
 		/*
 		 * Convert from HZ to MHz, rounding up.
 		 */
 		freq = (freq + 500000)/1000000;
+	}
 	sbc->sbus_mdvec.dv_clock = freq;
 	/*
 	 * Now figure out what the proper burst sizes, etc., to use.
 	 * Unfortunately, there is no ddi_dma_burstsizes here which
 	 * walks up the tree finding the limiting burst size node (if
 	 * any).
 	 */
-	sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+	sbusburst = sbsc->sc_burst;
 	if (sbusburst == 0)
 		sbusburst = SBUS_BURST_32 - 1;
 	ispburst = prom_getpropint(sa->sa_node, "burst-sizes", -1);
 	if (ispburst == -1) {
 		ispburst = sbusburst;
+	}
 	ispburst &= sbusburst;
 	ispburst &= ~(1 << 7);
 	ispburst &= ~(1 << 6);
 	sbc->sbus_mdvec.dv_conf1 =  0;
 	if (ispburst & (1 << 5)) {
 		sbc->sbus_mdvec.dv_conf1 = BIU_SBUS_CONF1_FIFO_32;
 	} else if (ispburst & (1 << 4)) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $ */
+/*	$NetBSD: lebuffer.c,v 1.33 2009/05/17 00:28:35 tsutsui Exp $ */
 /*-
  * Copyright (c) 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: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.33 2009/05/17 00:28:35 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <sys/cpu.h>
 #include <dev/sbus/sbusvar.h>
 @@ -67,63 +67,64 @@ lebufmatch(device_t parent, cfdata_t cf,
 	struct sbus_attach_args *sa = aux;
 	return (strcmp(cf->cf_name, sa->sa_name) == 0);
+}
 /*
  * Attach all the sub-devices we can find
  */
 void
 lebufattach(device_t parent, device_t self, void *aux)
+{
 	struct sbus_attach_args *sa = aux;
 	struct lebuf_softc *sc = (void *)self;
 	struct sbus_softc *sbsc = device_private(parent);
 	int node;
 	int sbusburst;
 	bus_space_tag_t bt = sa->sa_bustag;
 	bus_dma_tag_t	dt = sa->sa_dmatag;
 	bus_space_handle_t bh;
 	if (sbus_bus_map(bt, sa->sa_slot, sa->sa_offset, sa->sa_size,
 			 BUS_SPACE_MAP_LINEAR, &bh) != 0) {
 		aprint_error_dev(self, "attach: cannot map registers\n");
 		return;
+	}
 	/*
 	 * This device's "register space" is just a buffer where the
 	 * Lance ring-buffers can be stored. Note the buffer's location
 	 * and size, so the `le' driver can pick them up.
 	 */
 	sc->sc_buffer = bus_space_vaddr(bt, bh);
 	sc->sc_bufsiz = sa->sa_size;
 	node = sc->sc_node = sa->sa_node;
 	/*
 	 * Get transfer burst size from PROM
 	 */
-	sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+	sbusburst = sbsc->sc_burst;
 	if (sbusburst == 0)
 		sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
 	sc->sc_burst = prom_getpropint(node, "burst-sizes", -1);
 	if (sc->sc_burst == -1)
 		/* take SBus burst sizes */
 		sc->sc_burst = sbusburst;
 	/* Clamp at parent's burst sizes */
 	sc->sc_burst &= sbusburst;
 	sbus_establish(&sc->sc_sd, &sc->sc_dev);
 	printf(": %dK memory\n", sc->sc_bufsiz / 1024);
 	/* search through children */
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		struct sbus_attach_args sax;
-		sbus_setup_attach_args((struct sbus_softc *)parent,
+		sbus_setup_attach_args(sbsc,
 				       bt, dt, node, &sax);
 		(void)config_found(&sc->sc_dev, (void *)&sax, lebufprint);
 		sbus_destroy_attach_args(&sax);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */
+/*	$NetBSD: qec.c,v 1.44 2009/05/17 00:28:35 tsutsui Exp $ */
 /*-
  * Copyright (c) 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: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.44 2009/05/17 00:28:35 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <machine/autoconf.h>
 #include <dev/sbus/sbusvar.h>
 @@ -89,26 +89,27 @@ qecmatch(device_t parent, cfdata_t cf, v
 	struct sbus_attach_args *sa = aux;
 	return (strcmp(cf->cf_name, sa->sa_name) == 0);
+}
 /*
  * Attach all the sub-devices we can find
  */
 void
 qecattach(device_t parent, device_t self, void *aux)
+{
 	struct sbus_attach_args *sa = aux;
 	struct qec_softc *sc = (void *)self;
 	struct sbus_softc *sbsc = device_private(parent);
 	int node;
 	int sbusburst;
 	bus_space_tag_t sbt;
 	bus_space_handle_t bh;
 	int error;
 	sc->sc_bustag = sa->sa_bustag;
 	sc->sc_dmatag = sa->sa_dmatag;
 	node = sa->sa_node;
 	if (sa->sa_nreg < 2) {
 		printf("%s: only %d register sets\n",
 			device_xname(self), sa->sa_nreg);
 @@ -140,27 +141,27 @@ qecattach(device_t parent, device_t self
 	sc->sc_buffer = (void *)bus_space_vaddr(sa->sa_bustag, bh);
 	sc->sc_bufsiz = (bus_size_t)sa->sa_reg[1].oa_size;
 	/* Get number of on-board channels */
 	sc->sc_nchannels = prom_getpropint(node, "#channels", -1);
 	if (sc->sc_nchannels == -1) {
 		printf(": no channels\n");
 		return;
+	}
 	/*
 	 * Get transfer burst size from PROM
 	 */
-	sbusburst = ((struct sbus_softc *)parent)->sc_burst;
+	sbusburst = sbsc->sc_burst;
 	if (sbusburst == 0)
 		sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
 	sc->sc_burst = prom_getpropint(node, "burst-sizes", -1);
 	if (sc->sc_burst == -1)
 		/* take SBus burst sizes */
 		sc->sc_burst = sbusburst;
 	/* Clamp at parent's burst sizes */
 	sc->sc_burst &= sbusburst;
 	sbus_establish(&sc->sc_sd, &sc->sc_dev);
 @@ -195,27 +196,27 @@ qecattach(device_t parent, device_t self
+	 *
 	 * XXX - qe.c should call bus_intr_establish() with `level = 0'..
 	 * XXX - maybe we should have our own attach args for all that.
 	 */
 	sc->sc_intr = sa->sa_intr;
 	printf(": %dK memory\n", sc->sc_bufsiz / 1024);
 	qec_init(sc);
 	/* search through children */
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		struct sbus_attach_args sax;
-		sbus_setup_attach_args((struct sbus_softc *)parent,
+		sbus_setup_attach_args(sbsc,
 				       sbt, sc->sc_dmatag, node, &sax);
 		(void)config_found(&sc->sc_dev, (void *)&sax, qecprint);
 		sbus_destroy_attach_args(&sax);
+	}
+}
 int
 qec_bus_map(bus_space_tag_t t, bus_addr_t ba, bus_size_t size, int flags, vaddr_t va, bus_space_handle_t *hp)
 	/* va:	 Ignored */
+{
 	int error;
 	if ((error = bus_space_translate_address_generic(