 @@ -1,218 +1,216 @@
-/*	$NetBSD: gt.c,v 1.12 2011/05/17 17:34:49 dyoung Exp $	*/
+/*	$NetBSD: gt.c,v 1.13 2011/06/06 17:13:05 matt Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
  * 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: gt.c,v 1.12 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 2011/06/06 17:13:05 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcivar.h>
 #include <evbmips/malta/maltareg.h>
 #include <evbmips/malta/maltavar.h>
 #include <evbmips/malta/dev/gtreg.h>
 #include <evbmips/malta/dev/gtvar.h>
 #include "pci.h"
 /*
  * Galileo systems (so far) are always single-processor, so this is sufficient.
  */
 #define	PCI_CONF_LOCK(s)	(s) = splhigh()
 #define	PCI_CONF_UNLOCK(s)	splx((s))
-static void	gt_attach_hook(struct device *, struct device *,
+static void	gt_attach_hook(device_t, device_t, struct pcibus_attach_args *);
 		    struct pcibus_attach_args *);
 static int	gt_bus_maxdevs(void *, int);
 static pcitag_t	gt_make_tag(void *, int, int, int);
 static void	gt_decompose_tag(void *, pcitag_t, int *, int *, int *);
 static pcireg_t	gt_conf_read(void *, pcitag_t, int);
 static void	gt_conf_write(void *, pcitag_t, int, pcireg_t);
 void
 gt_pci_init(pci_chipset_tag_t pc, struct gt_config *mcp)
+{
 	pc->pc_conf_v = mcp;
 	pc->pc_attach_hook = gt_attach_hook;
 	pc->pc_bus_maxdevs = gt_bus_maxdevs;
 	pc->pc_make_tag = gt_make_tag;
 	pc->pc_decompose_tag = gt_decompose_tag;
 	pc->pc_conf_read = gt_conf_read;
 	pc->pc_conf_write = gt_conf_write;
+}
 static void
-gt_attach_hook(struct device *parent, struct device *self,
+gt_attach_hook(device_t parent, device_t self, struct pcibus_attach_args *pba)
     struct pcibus_attach_args *pba)
+{
 	/* Nothing to do... */
+}
-static int	gt_match(struct device *, struct cfdata *, void *);
+static int	gt_match(device_t, cfdata_t, void *);
-static void	gt_attach(struct device *, struct device *, void *);
+static void	gt_attach(device_t, device_t, void *);
 static int	gt_print(void *aux, const char *pnp);
-CFATTACH_DECL(gt, sizeof(struct device),
+CFATTACH_DECL_NEW(gt, 0,
     gt_match, gt_attach, NULL, NULL);
 static int
-gt_match(struct device *parent, struct cfdata *match, void *aux)
+gt_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 static void
-gt_attach(struct device *parent, struct device *self, void *aux)
+gt_attach(device_t parent, device_t self, void *aux)
+{
 	struct malta_config *mcp = &malta_configuration;
 	struct pcibus_attach_args pba;
 	printf("\n");
 #if NPCI > 0
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_iot = &mcp->mc_iot;
 	pba.pba_memt = &mcp->mc_memt;
 	pba.pba_dmat = &mcp->mc_pci_dmat;	/* pci_bus_dma_tag */
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = &mcp->mc_pc;
 	config_found_ia(self, "pcibus", &pba, gt_print);
 #endif
+}
 static int
 gt_print(void *aux, const char *pnp)
+{
 	/* XXX */
 	return 0;
+}
 static int
 gt_bus_maxdevs(void *v, int busno)
+{
 	/* The galileo has problems accessing device 31. */
 	if (busno == 0)
 		return (31);
 	return (32);
+}
 static pcitag_t
 gt_make_tag(void *v, int b, int d, int f)
+{
 	return ((b << 16) | (d << 11) | (f << 8));
+}
 static void
 gt_decompose_tag(void *v, pcitag_t tag, int *bp, int *dp, int *fp)
+{
 	if (bp != NULL)
 		*bp = (tag >> 16) & 0xff;
 	if (dp != NULL)
 		*dp = (tag >> 11) & 0x1f;
 	if (fp != NULL)
 		*fp = (tag >> 8) & 0x7;
+}
 static pcireg_t
 gt_conf_read(void *v, pcitag_t tag, int offset)
+{
 	pcireg_t data;
 	int bus, dev, func, s;
 	gt_decompose_tag(NULL /* XXX */, tag, &bus, &dev, &func);
 	/* The galileo has problems accessing device 31. */
 	if (bus == 0 && dev == 31)
 		return ((pcireg_t) -1);
 	/* XXX: no support for bus > 0 yet */
 	if (bus > 0)
 		return ((pcireg_t) -1);
 	PCI_CONF_LOCK(s);
 	/* Clear cause register bits. */
 	GT_REGVAL(GT_INTR_CAUSE) = 0;
 	GT_REGVAL(GT_PCI0_CFG_ADDR) = (1 << 31) | tag | offset;
 	data = GT_REGVAL(GT_PCI0_CFG_DATA);
 	/* Check for master abort. */
 	if (GT_REGVAL(GT_INTR_CAUSE) & (GTIC_MASABORT0 | GTIC_TARABORT0))
 		data = (pcireg_t) -1;
 	PCI_CONF_UNLOCK(s);
 	return (data);
+}
 static void
 gt_conf_write(void *v, pcitag_t tag, int offset, pcireg_t data)
+{
 	int bus, dev, func, s;
 	gt_decompose_tag(NULL /* XXX */, tag, &bus, &dev, &func);
 	/* The galileo has problems accessing device 31. */
 	if (bus == 0 && dev == 31)
 		return;
 	/* XXX: no support for bus > 0 yet */
 	if (bus > 0)
 		return;
 	PCI_CONF_LOCK(s);
 	/* Clear cause register bits. */
 	GT_REGVAL(GT_INTR_CAUSE) = 0;
 	GT_REGVAL(GT_PCI0_CFG_ADDR) = (1 << 31) | tag | offset;
 	GT_REGVAL(GT_PCI0_CFG_DATA) = data;
 	PCI_CONF_UNLOCK(s);
+}

 @@ -1,191 +1,190 @@
-/*	$NetBSD: mainbus.c,v 1.11 2009/03/14 15:36:06 dsl Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.12 2011/06/06 17:13:05 matt Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
  * 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: mainbus.c,v 1.11 2009/03/14 15:36:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2011/06/06 17:13:05 matt Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #if defined(PCI_NETBSD_CONFIGURE)
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #endif
 #include <dev/pci/pcivar.h>
 #if defined(PCI_NETBSD_CONFIGURE)
 #include <dev/pci/pciconf.h>
 #endif
 #include <mips/cache.h>
 #include <mips/cpuregs.h>
 #include <evbmips/malta/autoconf.h>
 #include <evbmips/malta/maltareg.h>
 #include <evbmips/malta/maltavar.h>
 #if defined(PCI_NETBSD_ENABLE_IDE)
 #include <dev/pci/pciide_piix_reg.h>
 #endif /* PCI_NETBSD_ENABLE_IDE */
 #include "locators.h"
 #include "pci.h"
-static int	mainbus_match(struct device *, struct cfdata *, void *);
+static int	mainbus_match(device_t, cfdata_t, void *);
-static void	mainbus_attach(struct device *, struct device *, void *);
+static void	mainbus_attach(device_t, device_t, void *);
-static int	mainbus_submatch(struct device *, struct cfdata *,
+static int	mainbus_submatch(device_t, cfdata_t, const int *, void *);
 				 const int *, void *);
 static int	mainbus_print(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 /* There can be only one. */
-int	mainbus_found;
+bool mainbus_found;
 struct mainbusdev {
 	const char *md_name;
 	bus_addr_t md_addr;
 	int md_intr;
 };
-struct mainbusdev mainbusdevs[] = {
+const struct mainbusdev mainbusdevs[] = {
 	{ "cpu",		-1,			-1 },
 	{ "gt",			MALTA_CORECTRL_BASE,	-1 },
 	{ "com",		MALTA_CBUSUART,		MALTA_CBUSUART_INTR },
 	{ "i2c",		MALTA_I2C_BASE,		-1 },
 	{ "gpio",		MALTA_GPIO_BASE,	-1 },
 	{ NULL,			0,			0 },
 };
 static int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (mainbus_found)
 		return (0);
 	return (1);
+}
 static void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args ma;
-	struct mainbusdev *md;
+	const struct mainbusdev *md;
 #if defined(PCI_NETBSD_CONFIGURE)
 	struct extent *ioext, *memext;
 #endif
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	struct malta_config *mcp = &malta_configuration;
 	pci_chipset_tag_t pc = &mcp->mc_pc;
 	pcitag_t idetag;
 	pcireg_t idetim;
 #endif
-	mainbus_found = 1;
+	mainbus_found = true;
 	printf("\n");
 #if defined(PCI_NETBSD_CONFIGURE)
 	ioext = extent_create("pciio",  0x00001000, 0x0000efff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", MALTA_PCIMEM1_BASE,
 	    MALTA_PCIMEM1_BASE + MALTA_PCIMEM1_SIZE,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	pci_configure_bus(pc, ioext, memext, NULL, 0, mips_dcache_align);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	/*
 	 * Perhaps PMON has not enabled the IDE controller.  Easy to
 	 * fix -- just set the ENABLE bits for each channel in the
 	 * IDETIM register.  Just clear all the bits for the channel
 	 * except for the ENABLE bits -- the `pciide' driver will
 	 * properly configure it later.
 	 */
 	idetim = 0;
 	if (PCI_NETBSD_ENABLE_IDE & 0x01)
 		idetim = PIIX_IDETIM_SET(idetim, PIIX_IDETIM_IDE, 0);
 	if (PCI_NETBSD_ENABLE_IDE & 0x02)
 		idetim = PIIX_IDETIM_SET(idetim, PIIX_IDETIM_IDE, 1);
 	/* pciide0 is pci device 10, function 1 */
 	idetag = pci_make_tag(pc, 0, 10, 1);
 	pci_conf_write(pc, idetag, PIIX_IDETIM, idetim);
 #endif
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		ma.ma_name = md->md_name;
 		ma.ma_addr = md->md_addr;
 		ma.ma_intr = md->md_intr;
 		(void) config_found_sm_loc(self, "mainbus", NULL, &ma,
 		    mainbus_print, mainbus_submatch);
+	}
+}
 static int
-mainbus_submatch(struct device *parent, struct cfdata *cf,
+mainbus_submatch(device_t parent, cfdata_t cf,
 		 const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (cf->cf_loc[MAINBUSCF_ADDR] != MAINBUSCF_ADDR_DEFAULT &&
 	    cf->cf_loc[MAINBUSCF_ADDR] != ma->ma_addr)
 		return (0);
 	return (config_match(parent, cf, aux));
+}
 static int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (pnp != 0)
 		return QUIET;
 	if (pnp)
 		aprint_normal("%s at %s", ma->ma_name, pnp);
 	if (ma->ma_addr != MAINBUSCF_ADDR_DEFAULT)
 		aprint_normal(" addr 0x%lx", ma->ma_addr);
 	return (UNCONF);
+}

 @@ -1,110 +1,110 @@
-/*	$NetBSD: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $	*/
+/*	$NetBSD: pchb.c,v 1.10 2011/06/06 17:13:05 matt Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
  * 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: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2011/06/06 17:13:05 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
-static int	pchb_match(struct device *, struct cfdata *, void *);
+static int	pchb_match(device_t, cfdata_t, void *);
-static void	pchb_attach(struct device *, struct device *, void *);
+static void	pchb_attach(device_t, device_t, void *);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
     pchb_match, pchb_attach, NULL, NULL);
-static int pcifound = 0;
+static bool pcifound;
 static int
-pchb_match(struct device *parent, struct cfdata *match, void *aux)
+pchb_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	/*
 	 * Match all known PCI host chipsets.
 	 */
 	if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE &&
 	    PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_HOST) {
 		switch (PCI_VENDOR(pa->pa_id)) {
 		case PCI_VENDOR_MARVELL:
 			switch (PCI_PRODUCT(pa->pa_id)) {
 			case PCI_PRODUCT_MARVELL_GT64120:
 				return (!pcifound);
+			}
 			break;
+		}
+	}
 	return (0);
+}
 static void
-pchb_attach(struct device *parent, struct device *self, void *aux)
+pchb_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	printf("\n");
-	pcifound++;
+	pcifound = true;
 	/*
 	 * All we do is print out a description.  Eventually, we
 	 * might want to add code that does something that's
 	 * possibly chipset-specific.
 	 */
 	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MARVELL &&
 	    PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MARVELL_GT64120) {
 		/* Bah, same product ID... */
 		/*
 		 * XXX:	Is the >= 0x10 test correct?  The '120 doco
 		 *	lists rev == 0x02 and the '120A doco lists
 		 *	rev == 0x10.
 		 */
 		snprintf(devinfo, sizeof(devinfo),
 		    "Galileo Technology GT-64120%s System Controller",
 		    PCI_REVISION(pa->pa_class) >= 0x10 ? "A" : "");
 	} else {
 		pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo,
 		    sizeof(devinfo));
+	}
 	printf("%s: %s (rev. 0x%02x)\n", self->dv_xname, devinfo,
 	    PCI_REVISION(pa->pa_class));
+}

 @@ -1,182 +1,184 @@
-/*	$NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $	*/
+/*	$NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.8 2011/06/06 17:13:06 matt Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <machine/explora.h>
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <powerpc/ibm4xx/dcr403cgx.h>
 #include <evbppc/explora/dev/elbvar.h>
 struct elb_dev {
 	const char *elb_name;
 	int elb_addr;
 	int elb_addr2;
 	int elb_irq;
 	bus_space_tag_t elb_bt;
 };
 static int	elb_match(device_t, cfdata_t, void *);
 static void	elb_attach(device_t, device_t, void *);
 static int	elb_print(void *, const char *);
 static struct powerpc_bus_space elb_tag = {
 	_BUS_SPACE_LITTLE_ENDIAN | _BUS_SPACE_MEM_TYPE | 1,	/* stride 1 */
 x00000000,
 	BASE_PCKBC,
 	BASE_PCKBC + 0x6ff
 };
 static char elb_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8)]
     __attribute__((aligned(8)));
 static int elb_tag_init_done;
 static struct powerpc_bus_space elb_fb_tag = {
 	_BUS_SPACE_LITTLE_ENDIAN | _BUS_SPACE_MEM_TYPE,
 x00000000,
 	BASE_FB,
 	BASE_FB2 + SIZE_FB - 1
 };
 static char elb_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8)]
     __attribute__((aligned(8)));
 static char elbfb_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8)]
     __attribute__((aligned(8)));
 static int elbfb_tag_init_done;
 static bool elb_tag_init_done;
 static bool elbfb_tag_init_done;
 /*
  * DMA struct, nothing special.
  */
 static struct powerpc_bus_dma_tag elb_bus_dma_tag = {
 ,			/* _bounce_thresh */
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
 	_bus_dmamap_load_mbuf,
 	_bus_dmamap_load_uio,
 	_bus_dmamap_load_raw,
 	_bus_dmamap_unload,
 	_bus_dmamap_sync,
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap,
 	_bus_dma_phys_to_bus_mem_generic,
 	_bus_dma_bus_mem_to_phys_generic,
 };
-static struct elb_dev elb_devs[] = {
+static const struct elb_dev elb_devs[] = {
 	{ "cpu",	0,		0,		-1, NULL },
 	{ "pckbc",	BASE_PCKBC,	BASE_PCKBC2,	31, &elb_tag },
 	{ "com",	BASE_COM,	0,		30, &elb_tag },
 	{ "lpt",	BASE_LPT,	0,		-1, &elb_tag },
 	{ "fb",		BASE_FB,	BASE_FB2,	-1, &elb_fb_tag },
 	{ "le",		BASE_LE,	0,		28, &elb_fb_tag },
 };
 CFATTACH_DECL_NEW(elb, 0,
     elb_match, elb_attach, NULL, NULL);
 /*
  * Probe for the elb; always succeeds.
  */
 static int
 elb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 /*
  * Attach the Explora local bus.
  */
 static void
 elb_attach(device_t parent, device_t self, void *aux)
+{
 	struct elb_attach_args eaa;
-	int i;
+	const struct elb_dev *elb;
 	size_t i;
 	printf("\n");
-	for (i = 0; i < sizeof(elb_devs)/sizeof(elb_devs[0]); i++) {
+	for (i = 0, elb = elb_devs; i < __arraycount(elb_devs); i++, elb++) {
-		eaa.elb_name = elb_devs[i].elb_name;
+		eaa.elb_name = elb->elb_name;
-		eaa.elb_bt = elb_get_bus_space_tag(elb_devs[i].elb_addr);
+		eaa.elb_bt = elb_get_bus_space_tag(elb->elb_addr);
 		eaa.elb_dmat = &elb_bus_dma_tag;
-		eaa.elb_base = elb_devs[i].elb_addr;
+		eaa.elb_base = elb->elb_addr;
-		eaa.elb_base2 = elb_devs[i].elb_addr2;
+		eaa.elb_base2 = elb->elb_addr2;
-		eaa.elb_irq = elb_devs[i].elb_irq;
+		eaa.elb_irq = elb->elb_irq;
 		(void) config_found(self, &eaa, elb_print);
+	}
+}
 static int
 elb_print(void *aux, const char *pnp)
+{
 	struct elb_attach_args *eaa = aux;
 	if (pnp)
 		aprint_normal("%s at %s", eaa->elb_name, pnp);
 	if (eaa->elb_irq != -1)
 		aprint_normal(" irq %d", eaa->elb_irq);
 	return (UNCONF);
+}
 bus_space_tag_t
 elb_get_bus_space_tag(bus_addr_t addr)
+{
 	if ((addr & 0xff000000) == 0x74000000) {
 		if (!elb_tag_init_done) {
 			if (bus_space_init(&elb_tag, "elbtag",
 			    elb_ex_storage, sizeof(elb_ex_storage)))
 				panic("elb_get_bus_space_tag: elb_tag");
-			elb_tag_init_done = 1;
+			elb_tag_init_done = true;
+		}
 		return (&elb_tag);
 	} else {
 		if (!elbfb_tag_init_done) {
 			if (bus_space_init(&elb_fb_tag, "elbfbtag",
 			    elbfb_ex_storage, sizeof(elbfb_ex_storage)))
 				panic("elb_get_bus_space_tag: elb_fb_tag");
-			elbfb_tag_init_done = 1;
+			elbfb_tag_init_done = true;
+		}
 		return (&elb_fb_tag);
+	}
+}

 @@ -1,223 +1,223 @@
-/*	$NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $	*/
+/*	$NetBSD: pchb.c,v 1.11 2011/06/06 17:13:06 matt Exp $	*/
 /*-
  * Copyright (c) 1996 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.
  * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11 2011/06/06 17:13:06 matt Exp $");
 #include "pci.h"
 #include "opt_pci.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #define _IBM4XX_BUS_DMA_PRIVATE
 #include <machine/walnut.h>
 #include <powerpc/ibm4xx/ibm405gp.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciconf.h>
 static int	pchbmatch(device_t, cfdata_t, void *);
 static void	pchbattach(device_t, device_t, void *);
 static int	pchbprint(void *, const char *);
 CFATTACH_DECL_NEW(pchb, 0,
     pchbmatch, pchbattach, NULL, NULL);
-static int pcifound = 0;
+static bool pcifound;
 /* IO window located @ e8000000 and maps to 0-0xffff */
 static struct powerpc_bus_space pchb_io_tag = {
 	_BUS_SPACE_LITTLE_ENDIAN | _BUS_SPACE_IO_TYPE,
 	MIN_PLB_PCI_IOADDR,		/* offset */
 	MIN_PCI_PCI_IOADDR,		/* extent base */
 	MIN_PCI_PCI_IOADDR + 0xffff,	/* extent limit */
 };
 /* PCI memory window is directly mapped */
 static struct powerpc_bus_space pchb_mem_tag = {
 	_BUS_SPACE_LITTLE_ENDIAN | _BUS_SPACE_MEM_TYPE,
 x00000000,					/* offset */
 	MIN_PCI_MEMADDR_NOPREFETCH,			/* extent base */
 	MIN_PCI_MEMADDR_NOPREFETCH + 0x1fffffff,	/* extent limit */
 };
 static int
 pchbmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct plb_attach_args *paa = aux;
 	/* XXX chipset tag unused by walnut, so just pass 0 */
 	pci_chipset_tag_t pc = 0;
 	pcitag_t tag;
 	int class, id;
 	/* match only pchb devices */
 	if (strcmp(paa->plb_name, cf->cf_name) != 0)
 		return 0;
 	pci_machdep_init();
 	tag = pci_make_tag(pc, 0, 0, 0);
 	class = pci_conf_read(pc, tag, PCI_CLASS_REG);
 	id = pci_conf_read(pc, tag, PCI_ID_REG);
 	/*
 	 * Match all known PCI host chipsets.
 	 */
 	if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
 	    PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_HOST) {
 		switch (PCI_VENDOR(id)) {
 		case PCI_VENDOR_IBM:
 			switch (PCI_PRODUCT(id)) {
 			case PCI_PRODUCT_IBM_405GP:
 				return (!pcifound);
+			}
 			break;
+		}
+	}
 	return (0);
+}
 static void
 pchbattach(device_t parent, device_t self, void *aux)
+{
 	struct plb_attach_args *paa = aux;
 	struct pcibus_attach_args pba;
 	char devinfo[256];
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *ioext, *memext;
 #ifdef PCI_CONFIGURE_VERBOSE
 	extern int pci_conf_debug;
 	pci_conf_debug = 1;
 #endif
 #endif
 	pci_chipset_tag_t pc = 0;
 	pcitag_t tag;
 	int class, id;
 	pci_machdep_init();
 	tag = pci_make_tag(pc, 0, 0, 0);
 	class = pci_conf_read(pc, tag, PCI_CLASS_REG);
 	id = pci_conf_read(pc, tag, PCI_ID_REG);
 	printf("\n");
-	pcifound++;
+	pcifound = true;
 	/*
 	 * All we do is print out a description.  Eventually, we
 	 * might want to add code that does something that's
 	 * possibly chipset-specific.
 	 */
 	pci_devinfo(id, class, 0, devinfo, sizeof(devinfo));
 	printf("%s: %s (rev. 0x%02x)\n", self->dv_xname, devinfo,
 	    PCI_REVISION(class));
 	pci_machdep_init(); /* Redundant... */
 	ibm4xx_setup_pci();
 #ifdef PCI_CONFIGURE_VERBOSE
 	ibm4xx_show_pci_map();
 #endif
 	if (bus_space_init(&pchb_io_tag, "pchbio", NULL, 0))
 		panic("pchbattach: can't init IO tag");
 	if (bus_space_init(&pchb_mem_tag, "pchbmem", NULL, 0))
 		panic("pchbattach: can't init MEM tag");
 #ifdef PCI_NETBSD_CONFIGURE
 	memext = extent_create("pcimem", MIN_PCI_MEMADDR_NOPREFETCH,
 	    MIN_PCI_MEMADDR_NOPREFETCH + 0x1fffffff, M_DEVBUF, NULL, 0,
 	    EX_NOWAIT);
 	ioext = extent_create("pciio", MIN_PCI_PCI_IOADDR,
 	    MIN_PCI_PCI_IOADDR + 0xffff, M_DEVBUF, NULL, 0, EX_NOWAIT);
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
 	extent_destroy(memext);
 	extent_destroy(ioext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #ifdef PCI_CONFIGURE_VERBOSE
 	printf("running config_found PCI\n");
 #endif
 	/* IO window located @ e8000000 and maps to 0-0xffff */
 	pba.pba_iot = &pchb_io_tag;
 	/* PCI memory window is directly mapped */
 	pba.pba_memt = &pchb_mem_tag;
 	pba.pba_dmat = paa->plb_dmat;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
 	config_found_ia(self, "pcibus", &pba, pchbprint);
+}
 static int
 pchbprint(void *aux, const char *p)
+{
 	if (p == NULL)
 		return (UNCONF);
 	return (QUIET);
+}
 #if 0
 static void
 scan_pci_bus(void)
+{
 	pcitag_t tag;
 	int i, x;
 	for (i=0;i<32;i++){
 		tag = pci_make_tag(0, 0, i, 0);
 		x = pci_conf_read(0, tag, 0);
 		printf("%d tag=%08x : %08x\n", i, tag, x);
 #if 0
 		if (PCI_VENDOR(x) == PCI_VENDOR_INTEL
 		    && PCI_PRODUCT(x) == PCI_PRODUCT_INTEL_80960_RP) {
 			/* Do not configure PCI bus analyzer */
 			continue;
+		}
 		x = pci_conf_read(0, tag, PCI_COMMAND_STATUS_REG);
 		x |= PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE;
 		pci_conf_write(0, tag, PCI_COMMAND_STATUS_REG, x);
 #endif
+	}
+}
 #endif

 @@ -1,103 +1,103 @@
-/*	$NetBSD: txioman.c,v 1.9 2008/04/28 20:23:22 martin Exp $ */
+/*	$NetBSD: txioman.c,v 1.10 2011/06/06 17:13:06 matt Exp $ */
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: txioman.c,v 1.9 2008/04/28 20:23:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txioman.c,v 1.10 2011/06/06 17:13:06 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <hpcmips/tx/tx39var.h>
 #include <dev/hpc/hpciovar.h>
-int txioman_match(struct device *, struct cfdata *, void *);
+int txioman_match(device_t, cfdata_t, void *);
-void txioman_attach(struct device *, struct device *, void *);
+void txioman_attach(device_t, device_t, void *);
-void txioman_callback(struct device *);
+void txioman_callback(device_t);
 int txioman_print(void *, const char *);
 hpcio_chip_t tx_conf_reference_ioman(void *, int);
-CFATTACH_DECL(txioman, sizeof(struct device),
+CFATTACH_DECL_NEW(txioman, 0,
     txioman_match, txioman_attach, NULL, NULL);
 int
-txioman_match(struct device *parent, struct cfdata *cf, void *aux)
+txioman_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 void
-txioman_attach(struct device *parent, struct device *self, void *aux)
+txioman_attach(device_t parent, device_t self, void *aux)
+{
 	printf("\n");
 	config_defer(self, txioman_callback);
+}
 void
-txioman_callback(struct device *self)
+txioman_callback(device_t self)
+{
 	struct hpcio_attach_args haa;
 	haa.haa_busname = HPCIO_BUSNAME;
 	haa.haa_sc = tx_conf_get_tag();
 	haa.haa_getchip = tx_conf_reference_ioman;
 	haa.haa_iot = 0; /* not needed for TX */
 	config_found(self, &haa, txioman_print);
+}
 int
 txioman_print(void *aux, const char *pnp)
+{
 	return (QUIET);
+}
 void
 tx_conf_register_ioman(tx_chipset_tag_t t, struct hpcio_chip *hc)
+{
 	KASSERT(t == tx_conf_get_tag());
 	KASSERT(hc);
 	t->tc_iochip[hc->hc_chipid] = hc;
+}
 hpcio_chip_t
 tx_conf_reference_ioman(void *ctx, int iochip)
+{
 	struct tx_chipset_tag *t = tx_conf_get_tag();
 	KASSERT(iochip >= 0 && iochip < NTXIO_GROUP);
 	return (t->tc_iochip[iochip]);
+}

 @@ -1,71 +1,71 @@
-/* $NetBSD: auaudio.c,v 1.7 2005/12/11 12:18:06 christos Exp $ */
+/* $NetBSD: auaudio.c,v 1.8 2011/06/06 17:13:06 matt Exp $ */
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
  * 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: auaudio.c,v 1.7 2005/12/11 12:18:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auaudio.c,v 1.8 2011/06/06 17:13:06 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/aubusvar.h>
-static int	auaudio_match(struct device *, struct cfdata *, void *);
+static int	auaudio_match(device_t, cfdata_t, void *);
-static void	auaudio_attach(struct device *, struct device *, void *);
+static void	auaudio_attach(device_t, device_t, void *);
-CFATTACH_DECL(auaudio, sizeof (struct device),
+CFATTACH_DECL_NEW(auaudio, sizeof (struct device),
     auaudio_match, auaudio_attach, NULL, NULL);
 int
-auaudio_match(struct device *parent, struct cfdata *match, void *aux)
+auaudio_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct aubus_attach_args *aa = aux;
 	return (0);	/* XXX unimplemented! */
 	if (strcmp(aa->aa_name, match->cf_name) == 0)
 		return (1);
 	return (0);
+}
 void
-auaudio_attach(struct device *parent, struct device *self, void *aux)
+auaudio_attach(device_t parent, device_t self, void *aux)
+{
 	printf(": Au1X00 audio\n");	/* \n in clockattach */
+}

 @@ -1,129 +1,129 @@
-/*	$NetBSD: obio.c,v 1.16 2009/03/16 23:11:13 dsl Exp $	*/
+/*	$NetBSD: obio.c,v 1.17 2011/06/06 17:13:06 matt Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wayne Knowles
+ *
  * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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: obio.c,v 1.16 2009/03/16 23:11:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17 2011/06/06 17:13:06 matt Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/mainboard.h>
 #include <machine/bus.h>
 #include <machine/sysconf.h>
-static int	obio_match(struct device *, struct cfdata *, void *);
+static int	obio_match(device_t, cfdata_t, void *);
-static void	obio_attach(struct device *, struct device *, void *);
+static void	obio_attach(device_t, device_t, void *);
-static int	obio_search(struct device *, struct cfdata *,
+static int	obio_search(device_t, cfdata_t, const int *, void *);
 				 const int *, void *);
 static int	obio_print(void *, const char *);
 static void	obio_intr_establish(bus_space_tag_t, int, int, int,
-					  int (*)(void *), void *);
+		    int (*)(void *), void *);
-CFATTACH_DECL(obio, sizeof(struct device),
+CFATTACH_DECL_NEW(obio, 0,
     obio_match, obio_attach, NULL, NULL);
 extern struct cfdriver obio_cd;
 struct mipsco_bus_space obio_bustag;
 struct mipsco_bus_dma_tag obio_dmatag;
 static int
-obio_match(struct device *parent, struct cfdata *cf, void *aux)
+obio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct confargs *ca = aux;
 	if (strcmp(ca->ca_name, obio_cd.cd_name) != 0)
 		return 0;
 	return 1;
+}
 static void
-obio_attach(struct device *parent, struct device *self, void *aux)
+obio_attach(device_t parent, device_t self, void *aux)
+{
 	struct confargs *ca = aux;
 	/* PIZAZZ (Mips 3000 Magnum)  Address Map */
 	mipsco_bus_space_init(&obio_bustag, "obio",
 x18000000, 0xb8000000,
 xb8000000, 0x08000000);
 	_bus_dma_tag_init(&obio_dmatag);
 	obio_bustag.bs_intr_establish = obio_intr_establish; /* XXX */
 	ca->ca_bustag = &obio_bustag;
 	ca->ca_dmatag = &obio_dmatag;
 	printf("\n");
 	config_search_ia(obio_search, self, "obio", ca);
+}
 static int
-obio_search(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux)
+obio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct confargs *ca = aux;
 	ca->ca_addr = cf->cf_addr;
 	ca->ca_name = cf->cf_name;
 	if (config_match(parent, cf, ca) != 0)
 		config_attach(parent, cf, ca, obio_print);
 	return 0;
+}
 /*
  * Print out the confargs.  The (parent) name is non-NULL
  * when there was no match found by config_found().
  */
 static int
 obio_print(void *args, const char *name)
+{
 	struct confargs *ca = args;
 	if (name)
 		return(QUIET);
 	if (ca->ca_addr != -1)
 		aprint_normal(" addr 0x%x", ca->ca_addr);
 	return(UNCONF);
+}
 void
-obio_intr_establish(bus_space_tag_t bst, int level, int pri, int flags, int (*func)(void *), void *arg)
+obio_intr_establish(bus_space_tag_t bst, int level, int pri, int flags,
 	int (*func)(void *), void *arg)
+{
 	(*platform.intr_establish)(level, func, arg);
+}