 @@ -1,201 +1,201 @@
-/*	$NetBSD: central.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: central.c,v 1.7 2010/11/11 17:58:23 miod Exp $	*/
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net)
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <sparc64/dev/centralvar.h>
 struct central_softc {
 	bus_space_tag_t sc_bt;
 	bus_space_tag_t sc_cbt;
 	int sc_node;
 	int sc_nrange;
 	struct central_range *sc_range;
 };
 static int central_match(device_t, cfdata_t, void *);
 static void central_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(central, sizeof(struct central_softc),
     central_match, central_attach, NULL, NULL);
 static int central_print(void *, const char *);
 static int central_get_string(int, const char *, char **);
 static bus_space_tag_t central_alloc_bus_tag(struct central_softc *);
 static int _central_bus_map(
 		bus_space_tag_t,
 		bus_addr_t,		/*offset*/
 		bus_size_t,		/*size*/
 		int,			/*flags*/
 		vaddr_t,		/* XXX unused -- compat w/sparc */
 		bus_space_handle_t *);
 static int
 central_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (strcmp(ma->ma_name, "central") == 0)
 		return (1);
 	return (0);
+}
 static void
 central_attach(device_t parent, device_t self, void *aux)
+{
-	struct central_softc *sc = (struct central_softc *)self;
+	struct central_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	int node0, node;
 	sc->sc_bt = ma->ma_bustag;
 	sc->sc_node = ma->ma_node;
 	sc->sc_cbt = central_alloc_bus_tag(sc);
 	prom_getprop(sc->sc_node, "ranges", sizeof(struct central_range),
 	    &sc->sc_nrange, (void **)&sc->sc_range);
 	printf("\n");
 	node0 = firstchild(sc->sc_node);
 	for (node = node0; node; node = nextsibling(node)) {
 		struct central_attach_args ca;
 		bzero(&ca, sizeof(ca));
 		ca.ca_node = node;
 		ca.ca_bustag = sc->sc_cbt;
 		if (central_get_string(ca.ca_node, "name", &ca.ca_name)) {
 			printf("can't fetch name for node 0x%x\n", node);
 			continue;
+		}
 		prom_getprop(node, "reg", sizeof(struct central_reg),
 		    &ca.ca_nreg, (void **)&ca.ca_reg);
 		(void)config_found(self, (void *)&ca, central_print);
 		if (ca.ca_name != NULL)
 			free(ca.ca_name, M_DEVBUF);
+	}
+}
 static int
 central_get_string(int node, const char *name, char **buf)
+{
 	int len;
 	len = prom_getproplen(node, name);
 	if (len < 0)
 		return (len);
 	*buf = (char *)malloc(len + 1, M_DEVBUF, M_NOWAIT);
 	if (*buf == NULL)
 		return (-1);
 	if (len != 0)
 		prom_getpropstringA(node, name, *buf, len + 1);
 	(*buf)[len] = '\0';
 	return (0);
+}
 static int
 central_print(void *args, const char *busname)
+{
 	struct central_attach_args *ca = args;
 	char *class;
 	if (busname != NULL) {
 		printf("\"%s\" at %s", ca->ca_name, busname);
 		class = prom_getpropstring(ca->ca_node, "device_type");
 		if (*class != '\0')
 			printf(" class %s", class);
+	}
 	return (UNCONF);
+}
 static bus_space_tag_t
 central_alloc_bus_tag(struct central_softc *sc)
+{
 	struct sparc_bus_space_tag *bt;
 	bt = malloc(sizeof(*bt), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (bt == NULL)
 		panic("central: couldn't alloc bus tag");
 	bt->cookie = sc;
 	bt->parent = sc->sc_bt;
 #if 0
 	bt->asi = bt->parent->asi;
 	bt->sasi = bt->parent->sasi;
 #endif
 	bt->sparc_bus_map = _central_bus_map;
 	/* XXX bt->sparc_bus_mmap = central_bus_mmap; */
 	/* XXX bt->sparc_intr_establish = upa_intr_establish; */
 	return (bt);
+}
 static int
 _central_bus_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size, int flags,
 	vaddr_t v, bus_space_handle_t *hp)
+{
 	struct central_softc *sc = t->cookie;
 	int64_t slot = BUS_ADDR_IOSPACE(addr);
 	int64_t offset = BUS_ADDR_PADDR(addr);
 	int i;
 	if (t->parent == NULL || t->parent->sparc_bus_map == NULL) {
 		printf("\ncentral_bus_map: invalid parent");
 		return (EINVAL);
+	}
 	for (i = 0; i < sc->sc_nrange; i++) {
 		bus_addr_t paddr;
 		if (sc->sc_range[i].cspace != slot)
 			continue;
 		paddr = offset - sc->sc_range[i].coffset;
 		paddr += sc->sc_range[i].poffset;
 		paddr |= ((bus_addr_t)sc->sc_range[i].pspace << 32);
 		return bus_space_map(t->parent, paddr, size, flags, hp);
+	}
 	return (EINVAL);
+}

 @@ -1,120 +1,120 @@
-/*	$NetBSD: fhc_central.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: fhc_central.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: fhc_central.c,v 1.5 2004/09/27 18:32:35 jason Exp $	*/
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net).
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <sparc64/dev/centralvar.h>
 #include <sparc64/dev/fhcreg.h>
 #include <sparc64/dev/fhcvar.h>
 int	fhc_central_match(device_t, cfdata_t, void *);
 void	fhc_central_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(fhc_central, sizeof(struct fhc_softc),
     fhc_central_match, fhc_central_attach, NULL, NULL);
 int
 fhc_central_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct central_attach_args *ca = aux;
 	if (strcmp(ca->ca_name, "fhc") == 0)
 		return (1);
 	return (0);
+}
 void
 fhc_central_attach(device_t parent, device_t self, void *aux)
+{
-	struct fhc_softc *sc = (struct fhc_softc *)self;
+	struct fhc_softc *sc = device_private(self);
 	struct central_attach_args *ca = aux;
 	u_int32_t board;
 	sc->sc_node = ca->ca_node;
 	sc->sc_bt = ca->ca_bustag;
 	sc->sc_is_central = 1;
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[0].cbr_slot,
 	    ca->ca_reg[0].cbr_offset, ca->ca_reg[0].cbr_size, 0,
 	    &sc->sc_preg)) {
 		printf(": failed to map preg\n");
 		return;
+	}
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[1].cbr_slot,
 	    ca->ca_reg[1].cbr_offset, ca->ca_reg[1].cbr_size, 0,
 	    &sc->sc_ireg)) {
 		printf(": failed to map ireg\n");
 		return;
+	}
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[2].cbr_slot,
 	    ca->ca_reg[2].cbr_offset, ca->ca_reg[2].cbr_size,
 	    BUS_SPACE_MAP_LINEAR, &sc->sc_freg)) {
 		printf(": failed to map freg\n");
 		return;
+	}
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[3].cbr_slot,
 	    ca->ca_reg[3].cbr_offset, ca->ca_reg[3].cbr_size,
 	    BUS_SPACE_MAP_LINEAR, &sc->sc_sreg)) {
 		printf(": failed to map sreg\n");
 		return;
+	}
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[4].cbr_slot,
 	    ca->ca_reg[4].cbr_offset, ca->ca_reg[4].cbr_size,
 	    BUS_SPACE_MAP_LINEAR, &sc->sc_ureg)) {
 		printf(": failed to map ureg\n");
 		return;
+	}
 	if (central_bus_map(sc->sc_bt, ca->ca_reg[5].cbr_slot,
 	    ca->ca_reg[5].cbr_offset, ca->ca_reg[5].cbr_size,
 	    BUS_SPACE_MAP_LINEAR, &sc->sc_treg)) {
 		printf(": failed to map treg\n");
 		return;
+	}
 	board = bus_space_read_4(sc->sc_bt, sc->sc_preg, FHC_P_BSR);
 	sc->sc_board = ((board >> 16) & 0x1) | ((board >> 12) & 0xe);
 	sc->sc_dev = self;
 	fhc_attach(sc);
 	return;
+}

 @@ -1,111 +1,111 @@
-/*	$NetBSD: fhc_mainbus.c,v 1.1 2011/07/29 08:37:36 mrg Exp $	*/
+/*	$NetBSD: fhc_mainbus.c,v 1.2 2011/08/01 08:36:39 mrg Exp $	*/
 /*	$OpenBSD: fhc_mainbus.c,v 1.4 2004/09/27 18:32:35 jason Exp $	*/
 /*
  * Copyright (c) 2004 Jason L. Wright (jason@thought.net).
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/openfirm.h>
 #include <sparc64/dev/fhcvar.h>
 int	fhc_mainbus_match(device_t, cfdata_t, void *);
 void	fhc_mainbus_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(fhc_mainbus, sizeof(struct fhc_softc),
     fhc_mainbus_match, fhc_mainbus_attach, NULL, NULL);
 int
 fhc_mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (strcmp(ma->ma_name, "fhc") == 0)
 		return (1);
 	return (0);
+}
 void
 fhc_mainbus_attach(device_t parent, device_t self, void *aux)
+{
-	struct fhc_softc *sc = (struct fhc_softc *)self;
+	struct fhc_softc *sc = device_private(self);
 	struct mainbus_attach_args *ma = aux;
 	sc->sc_node = ma->ma_node;
 	sc->sc_bt = ma->ma_bustag;
 	sc->sc_is_central = 0;
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[0].ur_paddr,
 	    ma->ma_reg[0].ur_len, 0, &sc->sc_preg)) {
 		printf(": failed to map preg\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[1].ur_paddr,
 	    ma->ma_reg[1].ur_len, 0, &sc->sc_ireg)) {
 		printf(": failed to map ireg\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[2].ur_paddr,
 	    ma->ma_reg[2].ur_len, BUS_SPACE_MAP_LINEAR, &sc->sc_freg)) {
 		printf(": failed to map freg\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[3].ur_paddr,
 	    ma->ma_reg[3].ur_len, BUS_SPACE_MAP_LINEAR, &sc->sc_sreg)) {
 		printf(": failed to map sreg\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[4].ur_paddr,
 	    ma->ma_reg[4].ur_len, BUS_SPACE_MAP_LINEAR, &sc->sc_ureg)) {
 		printf(": failed to map ureg\n");
 		return;
+	}
 	if (bus_space_map(sc->sc_bt, ma->ma_reg[5].ur_paddr,
 	    ma->ma_reg[5].ur_len, BUS_SPACE_MAP_LINEAR, &sc->sc_treg)) {
 		printf(": failed to map treg\n");
 		return;
+	}
 	sc->sc_board = prom_getpropint(sc->sc_node, "board#", -1);
 	sc->sc_dev = self;
 	fhc_attach(sc);
 	return;
+}