 @@ -1,14 +1,14 @@
-/*	$NetBSD: adv_cardbus.c,v 1.20 2009/03/14 15:36:16 dsl Exp $	*/
+/*	$NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * this file was brought from ahc_cardbus.c and adv_pci.c
  * and modified by YAMAMOTO Takashi.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.20 2009/03/14 15:36:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 @@ -72,35 +72,35 @@ __KERNEL_RCSID(0, "$NetBSD: adv_cardbus.
 struct adv_cardbus_softc {
 	struct asc_softc sc_adv;	/* real ADV */
 	/* CardBus-specific goo. */
 	cardbus_devfunc_t sc_ct;	/* our CardBus devfuncs */
 	cardbus_intr_line_t sc_intrline; /* our interrupt line */
 	cardbustag_t sc_tag;
 	int	sc_cbenable;		/* what CardBus access type to enable */
 	int	sc_csr;			/* CSR bits */
 	bus_size_t sc_size;
 };
-int	adv_cardbus_match(struct device *, struct cfdata *, void *);
+int	adv_cardbus_match(struct device *, cfdata_t, void *);
 void	adv_cardbus_attach(struct device *, struct device *, void *);
 int	adv_cardbus_detach(struct device *, int);
 CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc),
     adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL);
 int
-adv_cardbus_match(struct device *parent, struct cfdata *match,
+adv_cardbus_match(struct device *parent, cfdata_t match,
     void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (CARDBUS_VENDOR(ca->ca_id) == PCI_VENDOR_ADVSYS &&
 	    CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_ADVSYS_ULTRA)
 		return (1);
 	return (0);
+}
 void
 adv_cardbus_attach(struct device *parent, struct device *self,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $	*/
+/*	$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
  *     HAYAKAWA Koichi.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $");
 #include "opt_cardbus.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>		/* for AB_* needed by bootverbose */
 #include <sys/bus.h>
 @@ -61,27 +61,27 @@ __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v
 #include "locators.h"
 #if defined CARDBUS_DEBUG
 #define STATIC
 #define DPRINTF(a) printf a
 #else
 #define STATIC static
 #define DPRINTF(a)
 #endif
 STATIC void cardbusattach(device_t, device_t, void *);
 STATIC int cardbusdetach(device_t, int);
-STATIC int cardbusmatch(device_t, struct cfdata *, void *);
+STATIC int cardbusmatch(device_t, cfdata_t, void *);
 int cardbus_rescan(device_t, const char *, const int *);
 void cardbus_childdetached(device_t, device_t);
 static int cardbusprint(void *, const char *);
 typedef void (*tuple_decode_func)(u_int8_t*, int, void*);
 static int decode_tuples(u_int8_t *, int, tuple_decode_func, void*);
 #ifdef CARDBUS_DEBUG
 static void print_tuple(u_int8_t*, int, void*);
 #endif
 static int cardbus_read_tuples(struct cardbus_attach_args *,
     cardbusreg_t, u_int8_t *, size_t);
 @@ -93,27 +93,27 @@ static bool cardbus_child_register(devic
 CFATTACH_DECL3_NEW(cardbus, sizeof(struct cardbus_softc),
     cardbusmatch, cardbusattach, cardbusdetach, NULL,
     cardbus_rescan, cardbus_childdetached, DVF_DETACH_SHUTDOWN);
 #ifndef __NetBSD_Version__
 struct cfdriver cardbus_cd = {
 	NULL, "cardbus", DV_DULL
 };
 #endif
 STATIC int
-cardbusmatch(device_t parent, struct cfdata *cf, void *aux)
+cardbusmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 STATIC void
 cardbusattach(device_t parent, device_t self, void *aux)
+{
 	struct cardbus_softc *sc = device_private(self);
 	struct cbslot_attach_args *cba = aux;
 	sc->sc_dev = self;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $	*/
+/*	$NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1999 and 2000
  *       HAYAKAWA Koichi.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $");
 #include "opt_cardslot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 @@ -57,40 +57,40 @@ __KERNEL_RCSID(0, "$NetBSD: cardslot.c,v
 #if defined CARDSLOT_DEBUG
 #define STATIC
 #define DPRINTF(a) printf a
 #else
 #define STATIC static
 #define DPRINTF(a)
 #endif
 STATIC void cardslotattach(struct device *, struct device *, void *);
 STATIC int cardslotdetach(device_t, int);
-STATIC int cardslotmatch(struct device *, struct cfdata *, void *);
+STATIC int cardslotmatch(struct device *, cfdata_t, void *);
 static void cardslot_event_thread(void *arg);
 STATIC int cardslot_cb_print(void *aux, const char *pcic);
 static int cardslot_16_print(void *, const char *);
-static int cardslot_16_submatch(struct device *, struct cfdata *,
+static int cardslot_16_submatch(struct device *, cfdata_t,
 				     const int *, void *);
 CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc),
     cardslotmatch, cardslotattach, cardslotdetach, NULL, NULL, NULL,
     DVF_DETACH_SHUTDOWN);
 STATIC int
-cardslotmatch(struct device *parent, struct cfdata *cf,
+cardslotmatch(struct device *parent, cfdata_t cf,
     void *aux)
+{
 	struct cardslot_attach_args *caa = aux;
 	if (caa->caa_cb_attach == NULL && caa->caa_16_attach == NULL) {
 		/* Neither CardBus nor 16-bit PCMCIA are defined. */
 		return 0;
+	}
 	return 1;
+}
 @@ -194,27 +194,27 @@ cardslot_cb_print(void *aux, const char
+{
 	struct cbslot_attach_args *cba = aux;
 	if (pnp != NULL) {
 		aprint_normal("cardbus at %s subordinate bus %d",
 		    pnp, cba->cba_bus);
+	}
 	return UNCONF;
+}
 static int
-cardslot_16_submatch(struct device *parent, struct cfdata *cf,
+cardslot_16_submatch(struct device *parent, cfdata_t cf,
     const int *ldesc, void *aux)
+{
 	if (cf->cf_loc[PCMCIABUSCF_CONTROLLER] != PCMCIABUSCF_CONTROLLER_DEFAULT
 	    && cf->cf_loc[PCMCIABUSCF_CONTROLLER] != 0) {
 		return 0;
+	}
 	if ((cf->cf_loc[PCMCIABUSCF_CONTROLLER] == PCMCIABUSCF_CONTROLLER_DEFAULT)) {
 		return (config_match(parent, cf, aux));
+	}
 	return 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $	*/
+/*	$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1998 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
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #if defined pciinc
 #include <dev/pci/pcidevs.h>
 #endif
 @@ -55,51 +55,51 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_cardbus
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/ehcireg.h>
 #include <dev/usb/ehcivar.h>
 #ifdef EHCI_DEBUG
 #define DPRINTF(x)	if (ehcidebug) printf x
 extern int ehcidebug;
 #else
 #define DPRINTF(x)
 #endif
-int	ehci_cardbus_match(device_t, struct cfdata *, void *);
+int	ehci_cardbus_match(device_t, cfdata_t, void *);
 void	ehci_cardbus_attach(device_t, device_t, void *);
 int	ehci_cardbus_detach(device_t, int);
 struct ehci_cardbus_softc {
 	ehci_softc_t		sc;
 	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 CFATTACH_DECL_NEW(ehci_cardbus, sizeof(struct ehci_cardbus_softc),
     ehci_cardbus_match, ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate);
 #define CARDBUS_INTERFACE_EHCI PCI_INTERFACE_EHCI
 #define CARDBUS_CBMEM PCI_CBMEM
 #define cardbus_findvendor pci_findvendor
 #define cardbus_devinfo pci_devinfo
 static TAILQ_HEAD(, usb_cardbus) ehci_cardbus_alldevs =
 	TAILQ_HEAD_INITIALIZER(ehci_cardbus_alldevs);
 int
-ehci_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+ehci_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
 	if (CARDBUS_CLASS(ca->ca_class) == CARDBUS_CLASS_SERIALBUS &&
 	    CARDBUS_SUBCLASS(ca->ca_class) == CARDBUS_SUBCLASS_SERIALBUS_USB &&
 	    CARDBUS_INTERFACE(ca->ca_class) == CARDBUS_INTERFACE_EHCI)
 		return (1);
 	return (0);
+}
 static bool
 ehci_cardbus_suspend(device_t dv PMF_FN_ARGS)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $	*/
+/*	$NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/bus.h>
 #if defined pciinc
 #include <dev/pci/pcidevs.h>
 #endif
 @@ -52,40 +52,40 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci_cardb
 #include <dev/ieee1394/firewirereg.h>
 #include <dev/ieee1394/fwdma.h>
 #include <dev/ieee1394/fwohcireg.h>
 #include <dev/ieee1394/fwohcivar.h>
 struct fwohci_cardbus_softc {
 	struct fwohci_softc	sc_sc;
 	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void		       *sc_ih;
 };
-static int fwohci_cardbus_match(device_t, struct cfdata *, void *);
+static int fwohci_cardbus_match(device_t, cfdata_t, void *);
 static void fwohci_cardbus_attach(device_t, device_t, void *);
 static int fwohci_cardbus_detach(device_t, int);
 CFATTACH_DECL_NEW(fwohci_cardbus, sizeof(struct fwohci_cardbus_softc),
     fwohci_cardbus_match, fwohci_cardbus_attach,
     fwohci_cardbus_detach, NULL);
 #define CARDBUS_INTERFACE_OHCI PCI_INTERFACE_OHCI
 #define CARDBUS_OHCI_MAP_REGISTER PCI_OHCI_MAP_REGISTER
 #define cardbus_devinfo pci_devinfo
 static int
-fwohci_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+fwohci_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
 	if (CARDBUS_CLASS(ca->ca_class) == CARDBUS_CLASS_SERIALBUS &&
 	    CARDBUS_SUBCLASS(ca->ca_class) ==
 	        CARDBUS_SUBCLASS_SERIALBUS_FIREWIRE &&
 	    CARDBUS_INTERFACE(ca->ca_class) == CARDBUS_INTERFACE_OHCI)
 		return 1;
 	return 0;
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $ */
+/*	$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * CardBus bus front-end for the AR5001 Wireless LAN 802.11a/b/g CardBus.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $");
 #include "opt_inet.h"
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -142,27 +142,27 @@ ath_cardbus_resume(device_t self PMF_FN_
 	    csc->sc_ct->ct_cf, csc->sc_intrline, IPL_NET, ath_intr,
 	    &csc->sc_ath);
 	if (csc->sc_ih == NULL) {
 		aprint_error_dev(self,
 		    "unable to establish interrupt\n");
 		return false;
+	}
 	return ath_resume(&csc->sc_ath);
+}
 int
-ath_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+ath_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	const char *devname;
 	devname = ath_hal_probe(PCI_VENDOR(ca->ca_id), PCI_PRODUCT(ca->ca_id));
 	if (devname)
 		return 1;
 	return 0;
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_fxp_cardbus.c,v 1.37 2009/03/07 15:03:25 tsutsui Exp $	*/
+/*	$NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Johan Danielsson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * CardBus front-end for the Intel i82557 family of Ethernet chips.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.37 2009/03/07 15:03:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $");
 #include "opt_inet.h"
 #include "bpfilter.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -101,27 +101,27 @@ struct fxp_cardbus_softc {
 	bus_size_t size;
 };
 CFATTACH_DECL_NEW(fxp_cardbus, sizeof(struct fxp_cardbus_softc),
     fxp_cardbus_match, fxp_cardbus_attach, fxp_cardbus_detach, fxp_activate);
 #ifdef CBB_DEBUG
 #define DPRINTF(X) printf X
 #else
 #define DPRINTF(X)
 #endif
 static int
-fxp_cardbus_match(struct device *parent, struct cfdata *match,
+fxp_cardbus_match(struct device *parent, cfdata_t match,
     void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (CARDBUS_VENDOR(ca->ca_id) == PCI_VENDOR_INTEL &&
 	    CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_INTEL_82557)
 		return (1);
 	return (0);
+}
 static void
 fxp_cardbus_attach(struct device *parent, struct device *self,

 @@ -1,38 +1,38 @@
-/*	$NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $	*/
+/*	$NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $	*/
 /*	$OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $  */
 /*-
  * Copyright (c) 2005, 2006
  *	Damien Bergamini <damien.bergamini@free.fr>
+ *
  * 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.
  */
 /*
  * CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $");
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 @@ -83,41 +83,41 @@ struct ral_cardbus_softc {
 	} u;
 #define sc_sc	u.sc_rt2560
 	/* cardbus specific goo */
 	struct ral_opns		*sc_opns;
 	cardbus_devfunc_t	sc_ct;
 	cardbustag_t		sc_tag;
 	void			*sc_ih;
 	bus_size_t		sc_mapsize;
 	pcireg_t		sc_bar_val;
 	cardbus_intr_line_t	sc_intrline;
 };
-int	ral_cardbus_match(struct device *, struct cfdata *, void *);
+int	ral_cardbus_match(struct device *, cfdata_t, void *);
 void	ral_cardbus_attach(struct device *, struct device *, void *);
 int	ral_cardbus_detach(struct device *, int);
 CFATTACH_DECL(ral_cardbus, sizeof (struct ral_cardbus_softc),
     ral_cardbus_match, ral_cardbus_attach, ral_cardbus_detach, NULL);
 int	ral_cardbus_enable(struct rt2560_softc *);
 void	ral_cardbus_disable(struct rt2560_softc *);
 void	ral_cardbus_power(struct rt2560_softc *, int);
 void	ral_cardbus_setup(struct ral_cardbus_softc *);
 int
 ral_cardbus_match(struct device *parent,
-    struct cfdata *cfdata, void *aux)
+    cfdata_t cfdata, void *aux)
+{
         struct cardbus_attach_args *ca = aux;
         if (PCI_VENDOR(ca->ca_id) == PCI_VENDOR_RALINK) {
                 switch (PCI_PRODUCT(ca->ca_id)) {
 		case PCI_PRODUCT_RALINK_RT2560:
 		case PCI_PRODUCT_RALINK_RT2561:
 		case PCI_PRODUCT_RALINK_RT2561S:
 		case PCI_PRODUCT_RALINK_RT2661:
 			return 1;
 		default:
 			return 0;
+                }

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
+ *
  * Adapted for the RTL8180 by David Young.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * 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.
  */
 /*
  * Cardbus front-end for the Realtek RTL8180 802.11 MAC/BBP driver.
+ *
  * TBD factor with atw, tlp Cardbus front-ends?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $");
 #include "opt_inet.h"
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -130,27 +130,27 @@ struct rtw_cardbus_softc {
 	cardbus_devfunc_t	sc_ct;		/* our CardBus devfuncs */
 	cardbustag_t		sc_tag;		/* our CardBus tag */
 	int			sc_csr;		/* CSR bits */
 	bus_size_t		sc_mapsize;	/* size of the mapped bus space
 						 * region
 						 */
 	int			sc_bar_reg;	/* which BAR to use */
 	pcireg_t		sc_bar_val;	/* value of the BAR */
 	cardbus_intr_line_t	sc_intrline;	/* interrupt line */
 };
-int	rtw_cardbus_match(device_t, struct cfdata *, void *);
+int	rtw_cardbus_match(device_t, cfdata_t, void *);
 void	rtw_cardbus_attach(device_t, device_t, void *);
 int	rtw_cardbus_detach(device_t, int);
 CFATTACH_DECL_NEW(rtw_cardbus, sizeof(struct rtw_cardbus_softc),
     rtw_cardbus_match, rtw_cardbus_attach, rtw_cardbus_detach, NULL);
 void	rtw_cardbus_setup(struct rtw_cardbus_softc *);
 bool rtw_cardbus_resume(device_t PMF_FN_PROTO);
 bool rtw_cardbus_suspend(device_t PMF_FN_PROTO);
 const struct rtw_cardbus_product *rtw_cardbus_lookup(
      const struct cardbus_attach_args *);
 @@ -176,27 +176,27 @@ const struct rtw_cardbus_product *
 rtw_cardbus_lookup(const struct cardbus_attach_args *ca)
+{
 	const struct rtw_cardbus_product *rcp;
 	for (rcp = rtw_cardbus_products; rcp->rcp_product_name != NULL; rcp++) {
 		if (PCI_VENDOR(ca->ca_id) == rcp->rcp_vendor &&
 		    PCI_PRODUCT(ca->ca_id) == rcp->rcp_product)
 			return rcp;
+	}
 	return NULL;
+}
 int
-rtw_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+rtw_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (rtw_cardbus_lookup(ca) != NULL)
 		return 1;
 	return 0;
+}
 static void
 rtw_cardbus_funcregen(struct rtw_regs *regs, int enable)
+{
 	u_int32_t reg;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $	*/
+/*	$NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1998 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
  * Carlstedt Research & Technology.
+ *
  * 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 @@
  * 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.
  */
 /*
  * USB Open Host Controller driver.
+ *
  * OHCI spec: http://www.intel.com/design/usb/ohci11d.pdf
  * USB spec: http://www.teleport.com/cgi-bin/mailmerge.cgi/~usb/cgiform.tpl
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $");
 #include "ehci_cardbus.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #if defined pciinc
 #include <dev/pci/pcidevs.h>
 @@ -57,51 +57,51 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_cardbus
 #include <dev/cardbus/cardbusvar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/cardbus/usb_cardbus.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/ohcireg.h>
 #include <dev/usb/ohcivar.h>
-int	ohci_cardbus_match(device_t, struct cfdata *, void *);
+int	ohci_cardbus_match(device_t, cfdata_t, void *);
 void	ohci_cardbus_attach(device_t, device_t, void *);
 int	ohci_cardbus_detach(device_t, int);
 struct ohci_cardbus_softc {
 	ohci_softc_t		sc;
 #if NEHCI_CARDBUS > 0
 	struct usb_cardbus	sc_cardbus;
 #endif
 	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 CFATTACH_DECL_NEW(ohci_cardbus, sizeof(struct ohci_cardbus_softc),
     ohci_cardbus_match, ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate);
 #define CARDBUS_INTERFACE_OHCI PCI_INTERFACE_OHCI
 #define CARDBUS_CBMEM PCI_CBMEM
 #define cardbus_findvendor pci_findvendor
 #define cardbus_devinfo pci_devinfo
 int
-ohci_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+ohci_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
 	if (CARDBUS_CLASS(ca->ca_class) == CARDBUS_CLASS_SERIALBUS &&
 	    CARDBUS_SUBCLASS(ca->ca_class) == CARDBUS_SUBCLASS_SERIALBUS_USB &&
 	    CARDBUS_INTERFACE(ca->ca_class) == CARDBUS_INTERFACE_OHCI)
 		return (1);
 	return (0);
+}
 void
 ohci_cardbus_attach(device_t parent, device_t self, void *aux)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $	*/
+/*	$NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Richardson <mcr@sandelman.ottawa.on.ca>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * CardBus front-end for the Intel/Digital DECchip 21152 PCI-PCI bridge
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #if NRND > 0
 #include <sys/rnd.h>
 @@ -65,27 +65,27 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v
 #include <dev/pci/pccbbreg.h>
 #include <dev/pci/pccbbvar.h>
 #include <dev/cardbus/cardbusvar.h>
 #include <dev/pci/pcidevs.h>
 #include <x86/pci/pci_addr_fixup.h>
 #include <x86/pci/pci_bus_fixup.h>
 #include <i386/pci/pci_intr_fixup.h>
 #include <i386/pci/pcibios.h>
 struct ppb_softc;
-static int  ppb_cardbus_match(struct device *, struct cfdata *, void *);
+static int  ppb_cardbus_match(struct device *, cfdata_t, void *);
 static void ppb_cardbus_attach(struct device *, struct device *, void *);
 static int  ppb_cardbus_detach(struct device * self, int flags);
 /*static*/ void ppb_cardbus_setup(struct ppb_softc * sc);
 /*static*/ int  ppb_cardbus_enable(struct ppb_softc * sc);
 /*static*/ void ppb_cardbus_disable(struct ppb_softc * sc);
 static int  ppb_activate(struct device *, enum devact);
 int rppbprint(void *, const char *);
 int rbus_intr_fixup(pci_chipset_tag_t, int, int, int);
 void rbus_do_header_fixup(pci_chipset_tag_t, pcitag_t, void *);
 static void rbus_pci_phys_allocate(pci_chipset_tag_t, pcitag_t, void *);
 static int rbus_do_phys_allocate(pci_chipset_tag_t, pcitag_t, int,
 @@ -106,27 +106,27 @@ struct ppb_cardbus_softc {
 };
 CFATTACH_DECL_NEW(rbus_ppb, sizeof(struct ppb_cardbus_softc),
     ppb_cardbus_match, ppb_cardbus_attach, ppb_cardbus_detach, ppb_activate);
 #ifdef  CBB_DEBUG
 int rbus_ppb_debug = 0;   /* hack with kdb */
 #define DPRINTF(X) if(rbus_ppb_debug) printf X
 #else
 #define DPRINTF(X)
 #endif
 static int
-ppb_cardbus_match(struct device *parent, struct cfdata *match, void *aux)
+ppb_cardbus_match(struct device *parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (CARDBUS_VENDOR(ca->ca_id) ==  PCI_VENDOR_DEC &&
 	    CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_DEC_21152)
 		return (1);
 	if(PCI_CLASS(ca->ca_class) == PCI_CLASS_BRIDGE &&
 	   PCI_SUBCLASS(ca->ca_class) == PCI_SUBCLASS_BRIDGE_PCI) {
 	  /* XXX */
 	  printf("recognizing generic bridge chip\n");
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $	*/
+/*	$NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $	*/
 /*
  * Copyright (c) 1998-2005 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
  * Carlstedt Research & Technology.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $");
 #include "ehci_cardbus.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <dev/cardbus/cardbusvar.h>
 @@ -57,40 +57,40 @@ __KERNEL_RCSID(0, "$NetBSD: uhci_cardbus
 struct uhci_cardbus_softc {
 	uhci_softc_t		sc;
 #if NEHCI_CARDBUS > 0
 	struct usb_cardbus	sc_cardbus;
 #endif
 	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	cardbustag_t		sc_tag;
 	void 			*sc_ih;		/* interrupt vectoring */
 };
-static int	uhci_cardbus_match(device_t, struct cfdata *, void *);
+static int	uhci_cardbus_match(device_t, cfdata_t, void *);
 static void	uhci_cardbus_attach(device_t, device_t, void *);
 static int	uhci_cardbus_detach(device_t, int);
 CFATTACH_DECL_NEW(uhci_cardbus, sizeof(struct uhci_cardbus_softc),
     uhci_cardbus_match, uhci_cardbus_attach, uhci_cardbus_detach, uhci_activate);
 #define CARDBUS_INTERFACE_UHCI	PCI_INTERFACE_UHCI
 #define CARDBUS_CBIO		PCI_CBIO
 #define cardbus_findvendor	pci_findvendor
 #define cardbus_devinfo		pci_devinfo
 static int
-uhci_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+uhci_cardbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux;
 	if (CARDBUS_CLASS(ca->ca_class) == CARDBUS_CLASS_SERIALBUS &&
 	    CARDBUS_SUBCLASS(ca->ca_class) == CARDBUS_SUBCLASS_SERIALBUS_USB &&
 	    CARDBUS_INTERFACE(ca->ca_class) == CARDBUS_INTERFACE_UHCI)
 		return (1);
 	return (0);
+}
 static void
 uhci_cardbus_attach(device_t parent, device_t self,