 @@ -1,14 +1,14 @@
-/*	$NetBSD: elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 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.
 @@ -20,52 +20,52 @@
  * ``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.6 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 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(struct device *, struct cfdata *, void *);
+static int	elb_match(device_t, cfdata_t, void *);
-static void	elb_attach(struct device *, struct device *, 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 = {
 @@ -99,43 +99,43 @@ static struct powerpc_bus_dma_tag elb_bu
 	_bus_dma_phys_to_bus_mem_generic,
 	_bus_dma_bus_mem_to_phys_generic,
 };
 static 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(elb, sizeof(struct device),
+CFATTACH_DECL_NEW(elb, 0,
     elb_match, elb_attach, NULL, NULL);
 /*
  * Probe for the elb; always succeeds.
  */
 static int
-elb_match(struct device *parent, struct cfdata *cf, void *aux)
+elb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 /*
  * Attach the Explora local bus.
  */
 static void
-elb_attach(struct device *parent, struct device *self, void *aux)
+elb_attach(device_t parent, device_t self, void *aux)
+{
 	struct elb_attach_args eaa;
 	int i;
 	printf("\n");
 	for (i = 0; i < sizeof(elb_devs)/sizeof(elb_devs[0]); i++) {
 		eaa.elb_name = elb_devs[i].elb_name;
 		eaa.elb_bt = elb_get_bus_space_tag(elb_devs[i].elb_addr);
 		eaa.elb_dmat = &elb_bus_dma_tag;
 		eaa.elb_base = elb_devs[i].elb_addr;
 		eaa.elb_base2 = elb_devs[i].elb_addr2;
 		eaa.elb_irq = elb_devs[i].elb_irq;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at Sandburst Corp.
+ *
  * 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,71 +20,71 @@
  * ``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: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include "locators.h"
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pciconf.h>
 #include <dev/ic/cpc700reg.h>
 #include <dev/ic/cpc700var.h>
 #include <dev/ic/cpc700uic.h>
 #include <machine/pmppc.h>
 #include <arch/evbppc/pmppc/dev/mainbus.h>
 struct genppc_pci_chipset *genppc_pct;
 void
-cpc_attach(struct device *self, pci_chipset_tag_t pc, bus_space_tag_t mem,
+cpc_attach(device_t self, pci_chipset_tag_t pc, bus_space_tag_t mem,
 	   bus_space_tag_t pciio, bus_dma_tag_t tag, int attachpci,
 	   uint freq);
-static int	cpc_mainbus_match(struct device *, struct cfdata *, void *);
+static int	cpc_mainbus_match(device_t, cfdata_t, void *);
-static void	cpc_mainbus_attach(struct device *, struct device *, void *);
+static void	cpc_mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpc_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(cpc_mainbus, 0,
     cpc_mainbus_match, cpc_mainbus_attach, NULL, NULL);
 int
-cpc_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpc_mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *maa = aux;
 	return (strcmp(maa->mb_name, "cpc") == 0);
+}
 void
-cpc_mainbus_attach(struct device *parent, struct device *self, void *aux)
+cpc_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct genppc_pci_chipset_businfo *pbi;
 	genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
 	    M_NOWAIT);
 	pmppc_pci_get_chipset_tag(genppc_pct);
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
 	KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* 	$NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * 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,46 +20,46 @@
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <machine/bus.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 #include <evbppc/virtex/dev/xcvbusvar.h>
 static int	xcvbus_match(device_t, cfdata_t, void *);
 static void	xcvbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(xcvbus, sizeof(struct device),
+CFATTACH_DECL_NEW(xcvbus, 0,
     xcvbus_match, xcvbus_attach, NULL, NULL);
 static int
 xcvbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct plb_attach_args 		*paa = aux;
 	return (strcmp(paa->plb_name, cf->cf_name) == 0);
+}
 static void
 xcvbus_attach(device_t parent, device_t self, void *aux)
 @@ -91,19 +91,19 @@ xcvbus_print(void *aux, const char *pnp)
+	}
 	if (vaa->vaa_intr != -1)
 		aprint_normal(" intr %d", vaa->vaa_intr);
 	if (vaa->vaa_tx_dmac != NULL)
 		aprint_normal(" tx %d", vaa->vaa_tx_dmac->dmac_chan);
 	if (vaa->vaa_rx_dmac != NULL)
 		aprint_normal(" rx %d", vaa->vaa_rx_dmac->dmac_chan);
 	return (UNCONF);
+}
 int
-xcvbus_child_match(struct device *parent, struct cfdata *cf, void *aux)
+xcvbus_child_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct xcvbus_attach_args *vaa = aux;
 	return (strcmp(vaa->vaa_name, cf->cf_name) == 0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $	*/
+/*	$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath 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
 @@ -56,27 +56,27 @@
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $");
 #include "locators.h"
 #include "pckbc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <machine/walnut.h>
 #include <evbppc/walnut/dev/pbusvar.h>
 @@ -86,60 +86,60 @@ __KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.1
 /*
  * The external devices on the Walnut 405GP evaluation board.
  */
 const struct pbus_dev {
 	const char *name;
 	bus_addr_t addr;
 	int irq;
 } pbus_devs [] = {
 	{ "ds1743rtc",	NVRAM_BASE,	-1 },
 	{ "pckbc",	KEY_MOUSE_BASE,	25 }, /* XXX: really irq x..x+1 */
 	{ NULL }
 };
-static int	pbus_match(struct device *, struct cfdata *, void *);
+static int	pbus_match(device_t, cfdata_t, void *);
-static void	pbus_attach(struct device *, struct device *, void *);
+static void	pbus_attach(device_t, device_t, void *);
 static int	pbus_print(void *, const char *);
-CFATTACH_DECL(pbus, sizeof(struct device),
+CFATTACH_DECL_NEW(pbus, 0,
     pbus_match, pbus_attach, NULL, NULL);
 static struct powerpc_bus_space pbus_tag = {
 	_BUS_SPACE_LITTLE_ENDIAN | _BUS_SPACE_MEM_TYPE,
 x00000000,
 	NVRAM_BASE,
 	NVRAM_BASE + 0x0300010	/* Cover from NVRAM_BASE -> FPGA_BASE */
 };
 /*
  * Probe for the peripheral bus.
  */
 static int
-pbus_match(struct device *parent, struct cfdata *cf, void *aux)
+pbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct pbus_attach_args *pba = aux;
 	/* match only pbus devices */
 	if (strcmp(pba->pb_name, cf->cf_name) != 0)
 		return (0);
 	return (1);
+}
 /*
  * Attach the peripheral bus.
  */
 static void
-pbus_attach(struct device *parent, struct device *self, void *aux)
+pbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct plb_attach_args *paa = aux;
 	struct pbus_attach_args pba;
 	int i;
 #if NPCKBC > 0
 	bus_space_handle_t ioh_fpga;
 	bus_space_tag_t iot_fpga = &pbus_tag;
 	uint8_t fpga_reg;
 #endif
 	printf("\n");
 	if (bus_space_init(&pbus_tag, "pbus", NULL, 0))

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.9 2011/05/17 17:34:49 dyoung Exp $	*/
+/*	$NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 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.
 @@ -19,77 +19,77 @@
  * 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.9 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 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(struct device *, struct cfdata *, void *);
+static int	pchbmatch(device_t, cfdata_t, void *);
-static void	pchbattach(struct device *, struct device *, void *);
+static void	pchbattach(device_t, device_t, void *);
 static int	pchbprint(void *, const char *);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
     pchbmatch, pchbattach, NULL, NULL);
 static int pcifound = 0;
 /* 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(struct device *parent, struct cfdata *cf, void *aux)
+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);
 @@ -105,27 +105,27 @@ pchbmatch(struct device *parent, struct
 		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(struct device *parent, struct device *self, void *aux)
+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;

 @@ -1,14 +1,14 @@
-/* $NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $ */
+/* $NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $ */
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath 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
 @@ -56,27 +56,27 @@
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $");
 #include "locators.h"
 #include "emac.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 @@ -101,31 +101,31 @@ const struct plb_dev plb_devs [] = {
 	{ IBM405GPR,	"opb", },
 	{ IBM405GPR,	"pchb", },
 	{ IBM405GPR,	"exb", },
 	/* AMCC 405EX / EXR */
 	{ AMCC405EX,	"cpu", },
 	{ AMCC405EX,	"ecc", },
 	{ AMCC405EX,	"opb", },
 	{ AMCC405EX,	"pchb", },
 	{ 0,		NULL }
 };
-static int	plb_match(struct device *, struct cfdata *, void *);
+static int	plb_match(device_t, cfdata_t, void *);
-static void	plb_attach(struct device *, struct device *, void *);
+static void	plb_attach(device_t, device_t, void *);
 static int	plb_print(void *, const char *);
-CFATTACH_DECL(plb, sizeof(struct device), plb_match, plb_attach, NULL, NULL);
+CFATTACH_DECL_NEW(plb, 0, plb_match, plb_attach, NULL, NULL);
 /*
  * "generic" DMA struct, nothing special.
  */
 struct powerpc_bus_dma_tag ibm4xx_default_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,
 @@ -133,37 +133,37 @@ struct powerpc_bus_dma_tag ibm4xx_defaul
 	_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,
 };
 /*
  * Probe for the plb; always succeeds.
  */
 static int
-plb_match(struct device *parent, struct cfdata *cf, void *aux)
+plb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the processor local bus.
  */
 static void
-plb_attach(struct device *parent, struct device *self, void *aux)
+plb_attach(device_t parent, device_t self, void *aux)
+{
 	struct plb_attach_args paa;
 	struct plb_dev *local_plb_devs = aux;
 	int pvr, i;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	pvr = mfpvr() >> 16;
 #if NEMAC > 0
 	mal_attach(pvr);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.7 2011/05/17 17:34:52 dyoung Exp $	*/
+/*	$NetBSD: pchb.c,v 1.8 2011/06/06 16:42:18 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.
 @@ -19,77 +19,77 @@
  * 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.7 2011/05/17 17:34:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2011/06/06 16:42:18 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 <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(struct device *, struct cfdata *, void *);
+static int	pchbmatch(device_t, cfdata_t, void *);
-static void	pchbattach(struct device *, struct device *, void *);
+static void	pchbattach(device_t, device_t, void *);
 static int	pchbprint(void *, const char *);
 static pci_chipset_tag_t	alloc_chipset_tag(int);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
     pchbmatch, pchbattach, NULL, NULL);
 static int pcifound = 0;
 /* 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,
 	IBM405GP_PLB_PCI_IO_START,		/* offset */
 	IBM405GP_PCI_PCI_IO_START,		/* extent base */
 	IBM405GP_PCI_PCI_IO_START + 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 */
 	IBM405GP_PCI_MEM_START,			/* extent base */
 	IBM405GP_PCI_MEM_START + 0x1fffffff,	/* extent limit */
 };
 static int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+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 = alloc_chipset_tag(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);
 @@ -105,27 +105,27 @@ pchbmatch(struct device *parent, struct
 		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(struct device *parent, struct device *self, void *aux)
+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_CONFIGURE_VERBOSE
 	extern int pci_conf_debug;
 	pci_conf_debug = 1;
 #endif
 	pci_chipset_tag_t pc = alloc_chipset_tag(0);
 	pcitag_t tag;
 	int class, id;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.4 2008/04/28 20:23:32 martin Exp $	*/
+/*	$NetBSD: pchb.c,v 1.5 2011/06/06 16:42:18 matt Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * 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,72 +20,72 @@
  * ``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.4 2008/04/28 20:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.5 2011/06/06 16:42:18 matt Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/agpreg.h>
 #include <dev/pci/agpvar.h>
 #include <dev/ic/mpc105reg.h>
 #include <dev/ic/mpc106reg.h>
 #include <dev/ic/ibm82660reg.h>
 #include "agp.h"
-int	pchbmatch(struct device *, struct cfdata *, void *);
+int	pchbmatch(device_t, cfdata_t, void *);
-void	pchbattach(struct device *, struct device *, void *);
+void	pchbattach(device_t, device_t, void *);
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
     pchbmatch, pchbattach, NULL, NULL);
 int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+pchbmatch(device_t parent, cfdata_t cf, 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) {
 		return (1);
+	}
 	return (0);
+}
 static void
-mpc105_print(struct pci_attach_args *pa, struct device *self)
+mpc105_print(struct pci_attach_args *pa, device_t self)
+{
 	pcireg_t reg1, reg2;
 	const char *s1;
 	reg1 = pci_conf_read(pa->pa_pc, pa->pa_tag, MPC105_PICR1);
 	reg2 = pci_conf_read(pa->pa_pc, pa->pa_tag, MPC105_PICR2);
 	aprint_normal("%s: L2 cache: ", self->dv_xname);
 	switch (reg2 & MPC105_PICR2_L2_SIZE) {
 	case MPC105_PICR2_L2_SIZE_256K:
 		s1 = "256K";
 		break;
 	case MPC105_PICR2_L2_SIZE_512K:
 @@ -108,27 +108,27 @@ mpc105_print(struct pci_attach_args *pa,
 		s1 = "write-through";
 		break;
 	case MPC105_PICR1_L2_MP_WB:
 		s1 = "write-back";
 		break;
 	case MPC105_PICR1_L2_MP_MP:
 		s1 = "multiprocessor";
 		break;
+	}
 	aprint_normal("%s mode\n", s1);
+}
 static void
-mpc106_print(struct pci_attach_args *pa, struct device *self)
+mpc106_print(struct pci_attach_args *pa, device_t self)
+{
 	pcireg_t reg1, reg2;
 	const char *s1;
 	reg1 = pci_conf_read(pa->pa_pc, pa->pa_tag, MPC106_PICR1);
 	reg2 = pci_conf_read(pa->pa_pc, pa->pa_tag, MPC106_PICR2);
 	aprint_normal("%s: L2 cache: ", self->dv_xname);
 	switch (reg2 & MPC106_PICR2_L2_SIZE) {
 	case MPC106_PICR2_L2_SIZE_256K:
 		s1 = "256K";
 		break;
 	case MPC106_PICR2_L2_SIZE_512K:
 @@ -167,27 +167,27 @@ mpc106_print(struct pci_attach_args *pa,
 			break;
 		case MPC106_PICR1_L2_MP_MP:
 			s1 = "multiprocessors/external";
 			break;
 		default:
 			s1 = "reserved";
 			break;
+		}
+	}
 	aprint_normal("%s mode\n", s1);
+}
 static void
-ibm82660_print(struct pci_attach_args *pa, struct device *self)
+ibm82660_print(struct pci_attach_args *pa, device_t self)
+{
 	pcireg_t reg1;
 #ifdef PREP_BUS_SPACE_IO
 	pcireg_t reg2;
 #endif
 	const char *s1, *s2;
 	reg1 = pci_conf_read(pa->pa_pc, pa->pa_tag,
 	    IBM_82660_CACHE_STATUS);
 #ifdef PREP_BUS_SPACE_IO
 	reg2 = in32rb(PREP_BUS_SPACE_IO+IBM_82660_SYSTEM_CTRL);
 	if (reg2 & IBM_82660_SYSTEM_CTRL_L2_EN) {
 		if (reg1 & IBM_82660_CACHE_STATUS_L2_EN)
 @@ -221,27 +221,27 @@ ibm82660_print(struct pci_attach_args *p
 	aprint_verbose("%s: PCI/ISA I/O mapping %s\n", self->dv_xname,
 	    (reg1 & IBM_82660_OPTIONS_1_ISA) ? "contiguous" : "non-contiguous");
 	reg1 = pci_conf_read(pa->pa_pc, pa->pa_tag, IBM_82660_OPTIONS_3);
 	aprint_normal("%s: DRAM %s (%s) SRAM %s\n", self->dv_xname,
 	    (reg1 & IBM_82660_OPTIONS_3_DRAM) ? "EDO" : "standard",
 	    (reg1 & IBM_82660_OPTIONS_3_ECC) ? "ECC" : "parity",
 	    (reg1 & IBM_82660_OPTIONS_3_SRAM) ? "sync" : "async");
 	aprint_verbose("%s: Snoop mode %s\n", self->dv_xname,
 	    (reg1 & IBM_82660_OPTIONS_3_SNOOP) ? "603" : "601/604");
+}
 void
-pchbattach(struct device *parent, struct device *self, void *aux)
+pchbattach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 #if NAGP > 0
 	struct agpbus_attach_args apa;
 #endif
 	volatile unsigned char *python;
 	uint32_t v;
 	aprint_normal("\n");
 	/*
 	 * All we do is print out a description.  Eventually, we

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isabeep.c,v 1.9 2007/10/17 19:56:50 garbled Exp $	*/
+/*	$NetBSD: isabeep.c,v 1.10 2011/06/06 16:42:18 matt Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,61 +18,61 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabeep.c,v 1.9 2007/10/17 19:56:50 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabeep.c,v 1.10 2011/06/06 16:42:18 matt Exp $");
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <dev/isa/isavar.h>
 #include "pcppi.h"
 #if NPCPPI > 0
 #include <dev/isa/pcppivar.h>
-int isabeepmatch(struct device *, struct cfdata *, void *);
+int isabeepmatch(device_t, cfdata_t, void *);
-void isabeepattach(struct device *, struct device *, void *);
+void isabeepattach(device_t, device_t, void *);
-CFATTACH_DECL(isabeep, sizeof(struct device),
+CFATTACH_DECL_NEW(isabeep, 0,
     isabeepmatch, isabeepattach, NULL, NULL);
 static int ppi_attached;
 static pcppi_tag_t ppicookie;
 int
-isabeepmatch(struct device *parent, struct cfdata *match, void *aux)
+isabeepmatch(device_t parent, cfdata_t match, void *aux)
+{
 	return (!ppi_attached);
+}
 void
-isabeepattach(struct device *parent, struct device *self, void *aux)
+isabeepattach(device_t parent, device_t self, void *aux)
+{
 	aprint_normal("\n");
 	ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
 	ppi_attached = 1;
+}
 #endif
 void
 isabeep(int pitch, int period)
+{
 #if NPCPPI > 0
 	if (ppi_attached)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pceb.c,v 1.3 2008/04/28 20:23:33 martin Exp $	*/
+/*	$NetBSD: pceb.c,v 1.4 2011/06/06 16:42:18 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1998 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.
 @@ -20,62 +20,62 @@
  * ``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: pceb.c,v 1.3 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.4 2011/06/06 16:42:18 matt Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/eisa/eisavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include "eisa.h"
 #include "isa.h"
-int	pcebmatch(struct device *, struct cfdata *, void *);
+int	pcebmatch(device_t, cfdata_t, void *);
-void	pcebattach(struct device *, struct device *, void *);
+void	pcebattach(device_t, device_t, void *);
-CFATTACH_DECL(pceb, sizeof(struct device),
+CFATTACH_DECL_NEW(pceb, 0,
     pcebmatch, pcebattach, NULL, NULL);
-void	pceb_callback(struct device *);
+void	pceb_callback(device_t);
 union pceb_attach_args {
 	const char *ea_name;			/* XXX should be common */
 	struct isabus_attach_args ea_iba;
 	struct eisabus_attach_args ea_eba;
 };
 int
-pcebmatch(struct device *parent, struct cfdata *match, void *aux)
+pcebmatch(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	/*
 	 * Match anything which claims to be PCI-EISA bridge.
 	 */
 	if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE &&
 	    PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_EISA)
 		return (1);
 	/*
 	 * Match some known PCI-EISA bridges explicitly.
 	 * XXX this is probably not necessary, should be matched by above
 @@ -84,27 +84,27 @@ pcebmatch(struct device *parent, struct
 	switch (PCI_VENDOR(pa->pa_id)) {
 	case PCI_VENDOR_INTEL:
 		switch (PCI_PRODUCT(pa->pa_id)) {
 		case PCI_PRODUCT_INTEL_PCEB:
 			return (1);
+		}
 		break;
+	}
 	return (0);
+}
 void
-pcebattach(struct device *parent, struct device *self, void *aux)
+pcebattach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	char devinfo[256];
 	int error;
 	aprint_normal("\n");
 	/*
 	 * Just print out a description and defer configuration
 	 * until all PCI devices have been attached.
 	 */
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal("%s: %s (rev. 0x%02x)\n", self->dv_xname, devinfo,
 @@ -114,27 +114,27 @@ pcebattach(struct device *parent, struct
 	error = bus_space_init(&prep_eisa_io_space_tag, "eisa-ioport", NULL, 0);
 	if (error)
 		panic("prep_bus_space_init: can't init eisa io tag");
 	prep_eisa_mem_space_tag.pbs_extent = prep_mem_space_tag.pbs_extent;
 	error = bus_space_init(&prep_eisa_mem_space_tag, "eisa-iomem", NULL, 0);
 	if (error)
 		panic("prep_bus_space_init: can't init eisa mem tag");
 	config_defer(self, pceb_callback);
+}
 void
-pceb_callback(struct device *self)
+pceb_callback(device_t self)
+{
 	union pceb_attach_args ea;
 	/*
 	 * Attach the EISA bus behind this bridge.
 	 */
 	memset(&ea, 0, sizeof(ea));
 	ea.ea_eba.eba_iot = &prep_eisa_io_space_tag;
 	ea.ea_eba.eba_memt = &prep_eisa_mem_space_tag;
 #if NEISA > 0
 	ea.ea_eba.eba_dmat = &eisa_bus_dma_tag;
 #endif
 	config_found_ia(self, "eisabus", &ea.ea_eba, eisabusprint);

 @@ -1,14 +1,14 @@
-/* $NetBSD: eumb.c,v 1.3 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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,70 +20,69 @@
  * ``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: eumb.c,v 1.3 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.4 2011/06/06 16:42:19 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <sandpoint/sandpoint/eumbvar.h>
 #include "locators.h"
-static int  eumb_match(struct device *, struct cfdata *, void *);
+static int  eumb_match(device_t, cfdata_t, void *);
-static void eumb_attach(struct device *, struct device *, void *);
+static void eumb_attach(device_t, device_t, void *);
 static int  eumb_print(void *, const char *);
-static int  eumb_search(struct device *, struct cfdata *, const int *, void *);
+static int  eumb_search(device_t, cfdata_t, const int *, void *);
-CFATTACH_DECL(eumb, sizeof(struct device),
+CFATTACH_DECL_NEW(eumb, 0,
     eumb_match, eumb_attach, NULL, NULL);
 extern struct cfdriver eumb_cd;
 static int
-eumb_match(struct device *parent, struct cfdata *cf, void *aux)
+eumb_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const char **ca_name = aux; /* XXX */
 	if (strcmp(*ca_name, eumb_cd.cd_name) != 0)
 		return (0);
 	return (1);
+}
 static void
-eumb_attach(struct device *parent, struct device *self, void *aux)
+eumb_attach(device_t parent, device_t self, void *aux)
+{
 	printf("\n");
 	config_search_ia(eumb_search, self, "eumb", NULL);
+}
 static int
-eumb_search(struct device *parent, struct cfdata *cf,
+eumb_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
     const int *ldesc, void *aux)
+{
 	struct eumb_attach_args eaa;
 	eaa.eumb_name = cf->cf_name;
 	eaa.eumb_bt = &sandpoint_eumb_space_tag;
 	eaa.eumb_unit = cf->cf_loc[EUMBCF_UNIT];
         if (config_match(parent, cf, &eaa) > 0)
                 config_attach(parent, cf, &eaa, eumb_print);
 	return (0);
+}
 static int