 @@ -1,39 +1,39 @@
-/*	$Id: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $	*/
+/*	$Id: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 /* adapted from: */
-/*	$NetBSD: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $	*/
+/*	$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 /*	$OpenBSD: pxa2x0_ohci.c,v 1.19 2005/04/08 02:32:54 dlg Exp $ */
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.3 2008/10/24 05:39:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 @@ -49,27 +49,27 @@ struct obioohci_softc {
 	ohci_softc_t	sc;
 	void		*sc_ih;
 	bus_addr_t	sc_addr;
 	bus_addr_t	sc_size;
 };
 static int	obioohci_match(struct device *, struct cfdata *, void *);
 static void	obioohci_attach(struct device *, struct device *, void *);
 static int	obioohci_detach(struct device *, int);
 void *		obioohci_fake_intr_establish(int (*)(void *), void *);
 void		obioohci_fake_intr(void);
-CFATTACH_DECL(obioohci, sizeof(struct obioohci_softc),
+CFATTACH_DECL_NEW(obioohci, sizeof(struct obioohci_softc),
     obioohci_match, obioohci_attach, obioohci_detach, ohci_activate);
 static void	obioohci_clkinit(struct obio_attach_args *);
 static void	obioohci_power(int, void *);
 static void	obioohci_enable(struct obioohci_softc *);
 static void	obioohci_disable(struct obioohci_softc *);
 #define	HREAD4(sc,r)	bus_space_read_4((sc)->sc.iot, (sc)->sc.ioh, (r))
 #define	HWRITE4(sc,r,v)	bus_space_write_4((sc)->sc.iot, (sc)->sc.ioh, (r), (v))
 static int
 obioohci_match(struct device *parent, struct cfdata *cf, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_emifs.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 /*
  * Autoconfiguration support for the Texas Instruments OMAP EMIFS bus.
  * Based on arm/xscale/pxa2x0.c which in turn was derived
  * from arm/sa11x0/sa11x0.c
+ *
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -87,27 +87,27 @@
  * 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 REGENTS 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: omap_emifs.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <arm/cpufunc.h>
 @@ -155,27 +155,27 @@ static int	emifs_print(void *, const cha
 #define EMIFS_SIZE			256	/* per TRM */
 static const timing_parm_info timing_parms[] = {
 	{ "rdwst",   EMIFSCF_RDWST,   REF_CLK, CCS,  4, 2, 0xF },
 	{ "oesetup", EMIFSCF_OESETUP, REF_CLK, ACS,  0, 0, 0xF },
 	{ "oehold",  EMIFSCF_OEHOLD,  REF_CLK, ACS,  4, 0, 0xF },
 	{ "wrwst",   EMIFSCF_WRWST,   REF_CLK, CCS,  8, 1, 0xF },
 	{ "welen",   EMIFSCF_WELEN,   REF_CLK, CCS, 12, 1, 0xF },
 	{ "advhold", EMIFSCF_ADVHOLD, REF_CLK, ACS,  8, 1, 0x1 },
 	{ "btwst",   EMIFSCF_BTWST,   TC_CLK,  CCS, 23, 1, 0xF }
 };
 /* attach structures */
-CFATTACH_DECL(emifs, sizeof(struct emifs_softc),
+CFATTACH_DECL_NEW(emifs, sizeof(struct emifs_softc),
     emifs_match, emifs_attach, NULL, NULL);
 static int emifs_attached;
 static int
 emifs_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (emifs_attached)
 		return 0;
 	return 1;
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_gpio.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_gpio.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 /*
  * The OMAP GPIO Controller interface is inspired by pxa2x0_gpio.c
+ *
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford 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
 @@ -28,27 +28,27 @@
  * 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: omap_gpio.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include <arm/omap/omap_tipb.h>
 #include <arm/omap/omap_gpio.h>
 #include <arm/omap/omap_gpioreg.h>
 @@ -69,27 +69,27 @@ struct omapgpio_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_bust;
 	bus_space_handle_t sc_bush;
 	void *sc_irqcookie;
 	u_int16_t sc_mask;
 	struct gpio_irq_handler *sc_handlers[GPIO_NPINS];
 };
 static int	omapgpio_match(device_t, cfdata_t, void *);
 static void	omapgpio_attach(device_t, device_t, void *);
 extern struct cfdriver omapgpio_cd;
-CFATTACH_DECL(omapgpio, sizeof(struct omapgpio_softc),
+CFATTACH_DECL_NEW(omapgpio, sizeof(struct omapgpio_softc),
     omapgpio_match, omapgpio_attach, NULL, NULL);
 static int	omapgpio_intr(void *);
 static int
 omapgpio_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct tipb_attach_args *tipb = aux;
 	if (tipb->tipb_addr == -1 || tipb->tipb_intr == -1) {
 		panic("omapgpio must have addr and intr specified in config.");
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_ocp.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 /*
  * Autoconfiguration support for the Texas Instruments OMAP OCP bus.
  * Based on arm/xscale/pxa2x0.c which in turn was derived
  * from arm/sa11x0/sa11x0.c
+ *
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * 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
 @@ -86,27 +86,27 @@
  * 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 REGENTS 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: omap_ocp.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <arm/cpufunc.h>
 @@ -116,27 +116,27 @@ __KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v
 struct ocp_softc {
 	device_t sc_dev;
 	bus_dma_tag_t sc_dmac;
 };
 /* prototypes */
 static int	ocp_match(device_t, cfdata_t, void *);
 static void	ocp_attach(device_t, device_t, void *);
 static int 	ocp_search(device_t, cfdata_t, const int *, void *);
 static int	ocp_print(void *, const char *);
 /* attach structures */
-CFATTACH_DECL(ocp, sizeof(struct ocp_softc),
+CFATTACH_DECL_NEW(ocp, sizeof(struct ocp_softc),
     ocp_match, ocp_attach, NULL, NULL);
 static int ocp_attached;
 static int
 ocp_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (ocp_attached)
 		return 0;
 	return 1;
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_rtc.c,v 1.3 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $	*/
 /*
  * OMAP RTC driver, based on i80321_timer.c.
+ *
  * Copyright (c) 2007 Microsoft
  * 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
 @@ -22,27 +22,27 @@
  * 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 OR CONTRIBUTERS 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: omap_rtc.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <dev/clock_subr.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <arm/omap/omap_reg.h>
 @@ -80,27 +80,27 @@ __KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v
 static int	omaprtc_match(device_t, cfdata_t, void *);
 static void	omaprtc_attach(device_t, device_t, void *);
 struct omaprtc_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	int			sc_intr;
 	void			*sc_irqcookie;
 	struct todr_chip_handle	sc_todr;
 };
-CFATTACH_DECL(omaprtc, sizeof(struct omaprtc_softc),
+CFATTACH_DECL_NEW(omaprtc, sizeof(struct omaprtc_softc),
     omaprtc_match, omaprtc_attach, NULL, NULL);
 static int omaprtc_gettime(todr_chip_handle_t, struct clock_ymdhms *);
 static int omaprtc_settime(todr_chip_handle_t, struct clock_ymdhms *);
 #define rtc_is_busy()	(bus_space_read_1(sc->sc_iot, sc->sc_ioh, \
 					  RTC_STATUS_REG) & 1<<BUSY)
 static int
 omaprtc_gettime(todr_chip_handle_t tch, struct clock_ymdhms *dt)
+{
 	struct omaprtc_softc *sc = tch->cookie;
 	int s;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_tipb.c,v 1.3 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $ */
 /*
  * Autoconfiguration support for the Texas Instruments OMAP TIPB.
  * Based on arm/xscale/pxa2x0.c which in turn was derived from
  * arm/sa11x0/sa11x0.c.  The code to do the early attach was initially derived
  * from arch/sparc/dev/obio.c.
+ *
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -87,58 +87,57 @@
  * 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 REGENTS 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: omap_tipb.c,v 1.3 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.4 2008/12/12 17:36:14 matt Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <arm/cpufunc.h>
 #include <arm/mainbus/mainbus.h>
 #include <arm/omap/omap_reg.h>
 #include <arm/omap/omap_tipb.h>
 struct tipb_softc {
 	device_t sc_dev;
 	bus_dma_tag_t sc_dmac;
 };
 /* prototypes */
 static int	tipb_match(device_t, cfdata_t, void *);
 static void	tipb_attach(device_t, device_t, void *);
-static int 	tipb_search(device_t, cfdata_t,
+static int 	tipb_search(device_t, cfdata_t, const int *, void *);
 			     const int *, void *);
 static int	tipb_print(void *, const char *);
 /* attach structures */
-CFATTACH_DECL(tipb, sizeof(struct tipb_softc),
+CFATTACH_DECL_NEW(tipb, sizeof(struct tipb_softc),
     tipb_match, tipb_attach, NULL, NULL);
 static int tipb_attached;
 /*
  * There are some devices that need to be set up before all the others.  The
  * earlies array contains their names.  tipb_attach() and tipb_search() work
  * together to attach these devices in the order they appear in this array
  * before any other TIPB devices are attached.
  */
 static const char * const earlies[] = {
 	OMAP_INTC_DEVICE,
 	"omapmputmr",

 @@ -1,17 +1,17 @@
-/*	$Id: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $	*/
+/*	$Id: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $	*/
 /* adapted from: */
-/*	$NetBSD: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $ */
+/*	$NetBSD: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $ */
 /*
  * Autoconfiguration support for the Texas Instruments OMAP "On Board" I/O.
+ *
  * Based on arm/omap/omap_emifs.c which in turn was derived
  * Based on arm/xscale/pxa2x0.c which in turn was derived
  * from arm/sa11x0/sa11x0.c
+ *
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -93,27 +93,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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 "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.6 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.7 2008/12/12 17:36:14 matt Exp $");
 #include "locators.h"
 #include "obio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 @@ -373,29 +373,32 @@ obio_attach_critical(struct obio_softc *
 #endif
 		oa.obio_addr = critical_devs[i].addr;
 		oa.obio_size = OBIOCF_SIZE_DEFAULT;
 		oa.obio_intr = OBIOCF_INTR_DEFAULT;
 		oa.obio_intrbase = OBIOCF_INTRBASE_DEFAULT;
 		if (oa.obio_addr != OBIOCF_ADDR_DEFAULT
 		    && (oa.obio_addr < sc->sc_base
 		        || oa.obio_addr >= sc->sc_base + sc->sc_size))
 			continue;
 		cf = config_search_ia(obio_find, sc->sc_dev, "obio", &oa);
-		if (cf == NULL && critical_devs[i].required)
+		if (cf == NULL) {
-			panic("obio_attach_critical: failed to find %s!",
+			if (critical_devs[i].required)
-			    critical_devs[i].name);
+				panic("obio_attach_critical: failed to find %s!",
 				    critical_devs[i].name);
 			continue;
+		}
 		oa.obio_addr = cf->cf_loc[OBIOCF_ADDR];
 		oa.obio_size = cf->cf_loc[OBIOCF_SIZE];
 		oa.obio_intr = cf->cf_loc[OBIOCF_INTR];
 		oa.obio_intrbase = cf->cf_loc[OBIOCF_INTRBASE];
 		config_attach(sc->sc_dev, cf, &oa, obio_print);
+	}
+}
 static int
 obio_print(void *aux, const char *name)
+{
 	struct obio_attach_args *oa = (struct obio_attach_args*)aux;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: omap_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $	*/
+/*	$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $	*/
 /*
  * Based on i80321_timer.c and arch/arm/sa11x0/sa11x0_ost.c
+ *
  * Copyright (c) 1997 Mark Brinicombe.
  * Copyright (c) 1997 Causality Limited.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by IWAMOTO Toshihiro and Ichiro FUKUHARA.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -63,27 +63,27 @@
  * 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: omap_mputmr.c,v 1.4 2008/11/21 17:13:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_mputmr.c,v 1.5 2008/12/12 17:36:14 matt Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/device.h>
 #include <dev/clock_subr.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 @@ -129,27 +129,27 @@ static struct omapmputmr_softc *ref_sc =
 #endif
 /* Encapsulate the device knowledge within this source. */
 /* Register offsets and values */
 #define MPU_CNTL_TIMER	0x00
 #define  MPU_FREE		(1<<6)
 #define  MPU_CLOCK_ENABLE	(1<<5)
 #define  MPU_PTV_SHIFT		2
 #define  MPU_AR			(1<<1)
 #define  MPU_ST			(1<<0)
 #define MPU_LOAD_TIMER	0x04
 #define MPU_READ_TIMER	0x08
-CFATTACH_DECL(omapmputmr, sizeof(struct omapmputmr_softc),
+CFATTACH_DECL_NEW(omapmputmr, sizeof(struct omapmputmr_softc),
     omapmputmr_match, omapmputmr_attach, NULL, NULL);
 static int
 omapmputmr_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct tipb_attach_args *tipb = aux;
 	if (tipb->tipb_addr == -1 || tipb->tipb_intr == -1)
 	    panic("omapmputmr must have addr and intr specified in config.");
 	if (tipb->tipb_size == 0)
 		tipb->tipb_size = 256;	/* Per the OMAP TRM. */