Bring back cardbus_chipset_tag_t which is in practice a

pointer to the pccbb softc, to distinguish it from a pci_chipset_tag_t
which can be passed to the normal pci functions.

Suggested by and ok kettenis@

23 files changed, 148 insertions, 147 deletions

diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index a22a0997d50..dbdf604396e 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus.c,v 1.42 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: cardbus.c,v 1.43 2010/03/27 20:04:03 jsg Exp $	*/
 /*	$NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -140,7 +140,7 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, pcireg_t cis_ptr,
     u_int8_t *tuples, size_t len)
 {
 	struct cardbus_softc *sc = ca->ca_ct->ct_sc;
-	pci_chipset_tag_t cc = ca->ca_ct->ct_cc;
+	cardbus_chipset_tag_t cc = ca->ca_ct->ct_cc;
 	cardbus_function_tag_t cf = ca->ca_ct->ct_cf;
 	pcitag_t tag = ca->ca_tag;
 	pcireg_t command;
@@ -371,7 +371,7 @@ parse_tuple(u_int8_t *tuple, int len, void *data)
 int
 cardbus_attach_card(struct cardbus_softc *sc)
 {
-	pci_chipset_tag_t cc;
+	cardbus_chipset_tag_t cc;
 	cardbus_function_tag_t cf;
 	int cdstatus;
 	pcitag_t tag;
@@ -635,11 +635,11 @@ cardbus_detach_card(struct cardbus_softc *sc)
  * void *cardbus_intr_establish(cc, cf, irq, level, func, arg, name)
  *   Interrupt handler of pccard.
  *  args:
- *   pci_chipset_tag_t *cc
+ *   cardbus_chipset_tag_t *cc
  *   int irq:
  */
 void *
-cardbus_intr_establish(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_intr_establish(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     cardbus_intr_handle_t irq, int level, int (*func)(void *), void *arg,
     const char *name)
 {
@@ -652,10 +652,10 @@ cardbus_intr_establish(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
  * void cardbus_intr_disestablish(cc, cf, handler)
  *   Interrupt handler of pccard.
  *  args:
- *   pci_chipset_tag_t *cc
+ *   cardbus_chipset_tag_t *cc
  */
 void
-cardbus_intr_disestablish(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_intr_disestablish(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     void *handler)
 {
 	DPRINTF(("- pccard_intr_disestablish\n"));
@@ -701,7 +701,7 @@ disable_function(struct cardbus_softc *sc, int function)
 int
 cardbus_function_enable(struct cardbus_softc *sc, int func)
 {
-	pci_chipset_tag_t cc = sc->sc_cc;
+	cardbus_chipset_tag_t cc = sc->sc_cc;
 	cardbus_function_tag_t cf = sc->sc_cf;
 	pcireg_t command;
 	pcitag_t tag;
@@ -747,14 +747,14 @@ cardbus_function_disable(struct cardbus_softc *sc, int func)
 }
 
 /*
- * int cardbus_get_capability(pci_chipset_tag_t cc,
+ * int cardbus_get_capability(cardbus_chipset_tag_t cc,
  *	cardbus_function_tag_t cf, pcitag_t tag, int capid, int *offset,
  *	pcireg_t *value)
  *
  *	Find the specified PCI capability.
  */
 int
-cardbus_get_capability(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_get_capability(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     pcitag_t tag, int capid, int *offset, pcireg_t *value)
 {
 	pcireg_t reg;
diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c
index 9b3f68cb7bf..f6fb1a74f93 100644
--- a/sys/dev/cardbus/cardbus_map.c
+++ b/sys/dev/cardbus/cardbus_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus_map.c,v 1.11 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: cardbus_map.c,v 1.12 2010/03/27 20:04:03 jsg Exp $	*/
 /*	$NetBSD: cardbus_map.c,v 1.10 2000/03/07 00:31:46 mycroft Exp $	*/
 
 /*
@@ -56,15 +56,15 @@
 #endif
 
 
-STATIC int cardbus_io_find(pci_chipset_tag_t, cardbus_function_tag_t,
+STATIC int cardbus_io_find(cardbus_chipset_tag_t, cardbus_function_tag_t,
 	       pcitag_t, int, pcireg_t, bus_addr_t *, bus_size_t *,
 	       int *);
-STATIC int cardbus_mem_find(pci_chipset_tag_t, cardbus_function_tag_t,
+STATIC int cardbus_mem_find(cardbus_chipset_tag_t, cardbus_function_tag_t,
 	       pcitag_t, int, pcireg_t, bus_addr_t *, bus_size_t *,
 	       int *);
 
 int
-cardbus_mapreg_probe(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_mapreg_probe(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     pcitag_t tag, int reg, pcireg_t *typep)
 {
 	pcireg_t address, mask;
@@ -86,14 +86,14 @@ cardbus_mapreg_probe(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
 }
 
 /*
- * STATIC int cardbus_io_find(pci_chipset_tag_t cc,
+ * STATIC int cardbus_io_find(cardbus_chipset_tag_t cc,
  *			      cardbus_function_tag_t cf, pcitag_t tag,
  *			      int reg, pcireg_t type, bus_addr_t *basep,
  *			      bus_size_t *sizep, int *flagsp)
  * This code is stolen from sys/dev/pci_map.c.
  */
 STATIC int
-cardbus_io_find(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_io_find(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     pcitag_t tag, int reg, pcireg_t type, bus_addr_t *basep,
     bus_size_t *sizep, int *flagsp)
 {
@@ -146,14 +146,14 @@ cardbus_io_find(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
 }
 
 /*
- * STATIC int cardbus_mem_find(pci_chipset_tag_t cc,
+ * STATIC int cardbus_mem_find(cardbus_chipset_tag_t cc,
  *			       cardbus_function_tag_t cf, pcitag_t tag,
  *			       int reg, pcireg_t type, bus_addr_t *basep,
  *			       bus_size_t *sizep, int *flagsp)
  * This code is stolen from sys/dev/pci_map.c.
  */
 STATIC int
-cardbus_mem_find(pci_chipset_tag_t cc, cardbus_function_tag_t cf,
+cardbus_mem_find(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf,
     pcitag_t tag, int reg, pcireg_t type, bus_addr_t *basep,
     bus_size_t *sizep, int *flagsp)
 {
@@ -246,7 +246,7 @@ cardbus_mapreg_map(struct cardbus_softc *sc, int func, int reg,
     pcireg_t type, int busflags, bus_space_tag_t *tagp,
     bus_space_handle_t *handlep, bus_addr_t *basep, bus_size_t *sizep)
 {
-	pci_chipset_tag_t cc = sc->sc_cc;
+	cardbus_chipset_tag_t cc = sc->sc_cc;
 	cardbus_function_tag_t cf = sc->sc_cf;
 	bus_space_tag_t bustag;
 	rbus_tag_t rbustag;
@@ -318,7 +318,7 @@ int
 cardbus_mapreg_unmap(struct cardbus_softc *sc, int func, int reg,
     bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t size)
 {
-	pci_chipset_tag_t cc = sc->sc_cc;
+	cardbus_chipset_tag_t cc = sc->sc_cc;
 	cardbus_function_tag_t cf = sc->sc_cf;
 	int st = 1;
 	pcitag_t cardbustag;
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 79d8cffddb6..e0b46818cda 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbusvar.h,v 1.16 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: cardbusvar.h,v 1.17 2010/03/27 20:04:03 jsg Exp $	*/
 /*	$NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -34,6 +34,7 @@
 #include <dev/pci/pcivar.h>	/* for pcitag_t */
 #include <dev/cardbus/rbus.h>
 
+typedef void *cardbus_chipset_tag_t;
 typedef int cardbus_intr_handle_t;
 
 /* Base Registers */
@@ -63,22 +64,22 @@ typedef int cardbus_intr_handle_t;
 /* XXX end */
 
 typedef struct cardbus_functions {
-	int (*cardbus_space_alloc)(pci_chipset_tag_t, rbus_tag_t,
+	int (*cardbus_space_alloc)(cardbus_chipset_tag_t, rbus_tag_t,
 	    bus_addr_t, bus_size_t, bus_addr_t, bus_size_t, int, bus_addr_t *,
 	    bus_space_handle_t *);
-	int (*cardbus_space_free)(pci_chipset_tag_t, rbus_tag_t,
+	int (*cardbus_space_free)(cardbus_chipset_tag_t, rbus_tag_t,
 	    bus_space_handle_t, bus_size_t);
-	void *(*cardbus_intr_establish)(pci_chipset_tag_t, int, int,
+	void *(*cardbus_intr_establish)(cardbus_chipset_tag_t, int, int,
 	    int (*)(void *), void *, const char *);
-	void (*cardbus_intr_disestablish)(pci_chipset_tag_t, void *);
-	int (*cardbus_ctrl)(pci_chipset_tag_t, int);
-	int (*cardbus_power)(pci_chipset_tag_t, int);
+	void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t, void *);
+	int (*cardbus_ctrl)(cardbus_chipset_tag_t, int);
+	int (*cardbus_power)(cardbus_chipset_tag_t, int);
 
-	pcitag_t (*cardbus_make_tag)(pci_chipset_tag_t, int, int, int);
-	void (*cardbus_free_tag)(pci_chipset_tag_t, pcitag_t);
-	pcireg_t (*cardbus_conf_read)(pci_chipset_tag_t,
+	pcitag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int, int);
+	void (*cardbus_free_tag)(cardbus_chipset_tag_t, pcitag_t);
+	pcireg_t (*cardbus_conf_read)(cardbus_chipset_tag_t,
 	    pcitag_t, int);
-	void (*cardbus_conf_write)(pci_chipset_tag_t, pcitag_t, int,
+	void (*cardbus_conf_write)(cardbus_chipset_tag_t, pcitag_t, int,
 	    pcireg_t);
 } cardbus_function_t, *cardbus_function_tag_t;
 
@@ -93,7 +94,7 @@ struct cbslot_attach_args {
 
 	int cba_bus;			/* cardbus bus number */
 
-	pci_chipset_tag_t cba_cc;	/* cardbus chipset */
+	cardbus_chipset_tag_t cba_cc;	/* cardbus chipset */
 	cardbus_function_tag_t cba_cf;	/* cardbus functions */
 	int cba_intrline;		/* interrupt line */
 
@@ -127,7 +128,7 @@ struct cardbus_softc {
 	bus_space_tag_t sc_memt;	/* CardBus MEM space tag */
 	bus_dma_tag_t sc_dmat;		/* DMA tag */
 
-	pci_chipset_tag_t sc_cc;	/* CardBus chipset */
+	cardbus_chipset_tag_t sc_cc;	/* CardBus chipset */
 	cardbus_function_tag_t sc_cf;	/* CardBus function */
 
 	rbus_tag_t sc_rbus_iot;		/* CardBus i/o rbus tag */
@@ -153,7 +154,7 @@ struct cardbus_softc {
  *   disallocation.
  */
 typedef struct cardbus_devfunc {
-	pci_chipset_tag_t ct_cc;
+	cardbus_chipset_tag_t ct_cc;
 	cardbus_function_tag_t ct_cf;
 	struct cardbus_softc *ct_sc;	/* pointer to the parent */
 	int ct_bus;			/* bus number */
@@ -268,13 +269,13 @@ struct cardbus_attach_args {
 
 int	cardbus_attach_card(struct cardbus_softc *);
 void	cardbus_detach_card(struct cardbus_softc *);
-void   *cardbus_intr_establish(pci_chipset_tag_t, cardbus_function_tag_t,
+void   *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t,
 	    cardbus_intr_handle_t irq, int level, int (*func) (void *),
 	    void *arg, const char *);
-void	cardbus_intr_disestablish(pci_chipset_tag_t,
+void	cardbus_intr_disestablish(cardbus_chipset_tag_t,
 	    cardbus_function_tag_t, void *handler);
 
-int	cardbus_mapreg_probe(pci_chipset_tag_t, cardbus_function_tag_t,
+int	cardbus_mapreg_probe(cardbus_chipset_tag_t, cardbus_function_tag_t,
 	    pcitag_t, int, pcireg_t *);
 int	cardbus_mapreg_map(struct cardbus_softc *, int, int, pcireg_t,
 	    int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *,
@@ -287,7 +288,7 @@ int	cardbus_function_disable(struct cardbus_softc *, int function);
 
 int	cardbus_matchbyid(struct cardbus_attach_args *,
 	    const struct pci_matchid *, int);
-int	cardbus_get_capability(pci_chipset_tag_t, cardbus_function_tag_t,
+int	cardbus_get_capability(cardbus_chipset_tag_t, cardbus_function_tag_t,
 	    pcitag_t, int, int *, pcireg_t *);
 
 #define Cardbus_function_enable(ct)			\
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 6ed604255e2..dc528c7e9a5 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.37 2010/03/22 22:28:27 jsg Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.38 2010/03/27 20:04:03 jsg Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -284,7 +284,7 @@ void
 com_cardbus_setup(struct com_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->cc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
@@ -318,7 +318,7 @@ com_cardbus_enable(struct com_softc *sc)
 	struct com_cardbus_softc *csc = (struct com_cardbus_softc*)sc;
 	struct cardbus_softc *psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
-	pci_chipset_tag_t cc = psc->sc_cc;
+	cardbus_chipset_tag_t cc = psc->sc_cc;
 	cardbus_function_tag_t cf = psc->sc_cf;
 
 	Cardbus_function_enable(csc->cc_ct);
@@ -344,7 +344,7 @@ com_cardbus_disable(struct com_softc *sc)
 	struct com_cardbus_softc *csc = (struct com_cardbus_softc*)sc;
 	struct cardbus_softc *psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
-	pci_chipset_tag_t cc = psc->sc_cc;
+	cardbus_chipset_tag_t cc = psc->sc_cc;
 	cardbus_function_tag_t cf = psc->sc_cf;
 
 	cardbus_intr_disestablish(cc, cf, csc->cc_ih);
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 37e6cb5e821..174473928c5 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_cardbus.c,v 1.13 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: ehci_cardbus.c,v 1.14 2010/03/27 20:04:03 jsg Exp $ */
 /*	$NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ int	ehci_cardbus_detach(struct device *, int);
 
 struct ehci_cardbus_softc {
 	ehci_softc_t		sc;
-	pci_chipset_tag_t	sc_cc;
+	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void 			*sc_ih;		/* interrupt vectoring */
@@ -98,7 +98,7 @@ ehci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct ehci_cardbus_softc *sc = (struct ehci_cardbus_softc *)self;
 	struct cardbus_attach_args *ca = aux;
 	cardbus_devfunc_t ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t csr;
 	usbd_status r;
diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c
index 87c35fc8f68..368d5abf6ea 100644
--- a/sys/dev/cardbus/if_acx_cardbus.c
+++ b/sys/dev/cardbus/if_acx_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_acx_cardbus.c,v 1.16 2010/03/22 22:28:27 jsg Exp $  */
+/*	$OpenBSD: if_acx_cardbus.c,v 1.17 2010/03/27 20:04:03 jsg Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -185,7 +185,7 @@ acx_cardbus_detach(struct device *self, int flags)
 	struct acx_cardbus_softc *csc = (struct acx_cardbus_softc *)self;
 	struct acx_softc *sc = &csc->sc_acx;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	int error, b1 = CARDBUS_BASE0_REG, b2 = CARDBUS_BASE1_REG;
 
@@ -225,7 +225,7 @@ acx_cardbus_enable(struct acx_softc *sc)
 
 	csc = (struct acx_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* power on the socket */
@@ -254,7 +254,7 @@ acx_cardbus_disable(struct acx_softc *sc)
 {
 	struct acx_cardbus_softc *csc = (struct acx_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* unhook the interrupt handler */
@@ -280,7 +280,7 @@ void
 acx_cardbus_setup(struct acx_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 	int b1 = CARDBUS_BASE0_REG, b2 = CARDBUS_BASE1_REG;
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index 88c4fab3420..7ef034b79aa 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_cardbus.c,v 1.13 2010/03/22 22:28:27 jsg Exp $   */
+/*      $OpenBSD: if_ath_cardbus.c,v 1.14 2010/03/27 20:04:03 jsg Exp $   */
 /*	$NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
 
 /*
@@ -220,7 +220,7 @@ ath_cardbus_enable(struct ath_softc *sc)
 {
 	struct ath_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/*
@@ -252,7 +252,7 @@ ath_cardbus_disable(struct ath_softc *sc)
 {
 	struct ath_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* Unhook the interrupt handler. */
@@ -274,7 +274,7 @@ void
 ath_cardbus_setup(struct ath_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
diff --git a/sys/dev/cardbus/if_athn_cardbus.c b/sys/dev/cardbus/if_athn_cardbus.c
index 6977f0d3a58..cf06b68ff78 100644
--- a/sys/dev/cardbus/if_athn_cardbus.c
+++ b/sys/dev/cardbus/if_athn_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_cardbus.c,v 1.6 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: if_athn_cardbus.c,v 1.7 2010/03/27 20:04:03 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -146,7 +146,7 @@ athn_cardbus_detach(struct device *self, int flags)
 	struct athn_cardbus_softc *csc = (struct athn_cardbus_softc *)self;
 	struct athn_softc *sc = &csc->sc_sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	athn_detach(sc);
@@ -167,7 +167,7 @@ athn_cardbus_enable(struct athn_softc *sc)
 {
 	struct athn_cardbus_softc *csc = (struct athn_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* Power on the socket. */
@@ -193,7 +193,7 @@ athn_cardbus_disable(struct athn_softc *sc)
 {
 	struct athn_cardbus_softc *csc = (struct athn_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* Unhook the interrupt handler. */
@@ -219,7 +219,7 @@ void
 athn_cardbus_setup(struct athn_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 662a4df5895..7c9d6ccbcc9 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.16 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.17 2010/03/27 20:04:03 jsg Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -263,7 +263,7 @@ atw_cardbus_enable(struct atw_softc *sc)
 {
 	struct atw_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/*
@@ -296,7 +296,7 @@ atw_cardbus_disable(struct atw_softc *sc)
 {
 	struct atw_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* Unhook the interrupt handler. */
@@ -321,7 +321,7 @@ atw_cardbus_setup(struct atw_cardbus_softc *csc)
 	struct atw_softc *sc = &csc->sc_atw;
 #endif
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
diff --git a/sys/dev/cardbus/if_bwi_cardbus.c b/sys/dev/cardbus/if_bwi_cardbus.c
index e80b05af01d..b121bd8948c 100644
--- a/sys/dev/cardbus/if_bwi_cardbus.c
+++ b/sys/dev/cardbus/if_bwi_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bwi_cardbus.c,v 1.10 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_bwi_cardbus.c,v 1.11 2010/03/27 20:04:03 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -152,7 +152,7 @@ bwi_cardbus_detach(struct device *self, int flags)
 	struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)self;
 	struct bwi_softc *sc = &csc->csc_bwi;
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	int error;
 
@@ -177,7 +177,7 @@ void
 bwi_cardbus_setup(struct bwi_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
@@ -202,7 +202,7 @@ bwi_cardbus_enable(struct bwi_softc *sc)
 {
 	struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* power on the socket */
@@ -229,7 +229,7 @@ bwi_cardbus_disable(struct bwi_softc *sc)
 {
 	struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* unhook the interrupt handler */
@@ -245,7 +245,7 @@ bwi_cardbus_conf_write(void *self, uint32_t reg, uint32_t val)
 {
 	struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)self;
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	cardbus_conf_write(cc, cf, csc->csc_tag, reg, val);
@@ -256,7 +256,7 @@ bwi_cardbus_conf_read(void *self, uint32_t reg)
 {
 	struct bwi_cardbus_softc *csc = (struct bwi_cardbus_softc *)self;
 	cardbus_devfunc_t ct = csc->csc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	return (cardbus_conf_read(cc, cf, csc->csc_tag, reg));
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index c623f2d7985..8ec8054da66 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_cardbus.c,v 1.31 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: if_dc_cardbus.c,v 1.32 2010/03/27 20:04:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -125,7 +125,7 @@ dc_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct dc_softc *sc = &csc->sc_dc;
 	struct cardbus_attach_args *ca = aux;
 	struct cardbus_devfunc *ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 	bus_addr_t addr;
@@ -259,7 +259,7 @@ void
 dc_cardbus_setup(struct dc_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 	int r;
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 5ca90bfd6a5..3997afe9dd2 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.25 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.26 2010/03/27 20:04:03 jsg Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -126,7 +126,7 @@ fxp_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct cardbus_attach_args *ca = aux;
 	struct cardbus_softc *psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
-	pci_chipset_tag_t cc = psc->sc_cc;
+	cardbus_chipset_tag_t cc = psc->sc_cc;
 	cardbus_function_tag_t cf = psc->sc_cf;
 	bus_space_tag_t iot, memt;
 	bus_space_handle_t ioh, memh;
@@ -187,7 +187,7 @@ fxp_cardbus_setup(struct fxp_softc *sc)
 	struct fxp_cardbus_softc *csc = (struct fxp_cardbus_softc *) sc;
 	struct cardbus_softc *psc =
 	    (struct cardbus_softc *) sc->sc_dev.dv_parent;
-	pci_chipset_tag_t cc = psc->sc_cc;
+	cardbus_chipset_tag_t cc = psc->sc_cc;
 	cardbus_function_tag_t cf = psc->sc_cf;
 	pcireg_t command;
 
diff --git a/sys/dev/cardbus/if_malo_cardbus.c b/sys/dev/cardbus/if_malo_cardbus.c
index b319565ade0..daa609d2531 100644
--- a/sys/dev/cardbus/if_malo_cardbus.c
+++ b/sys/dev/cardbus/if_malo_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_malo_cardbus.c,v 1.7 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_malo_cardbus.c,v 1.8 2010/03/27 20:04:03 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -144,7 +144,7 @@ malo_cardbus_detach(struct device *self, int flags)
 	struct malo_cardbus_softc *csc = (struct malo_cardbus_softc *)self;
 	struct malo_softc *sc = &csc->sc_malo;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	int error;
 
@@ -171,7 +171,7 @@ void
 malo_cardbus_setup(struct malo_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
@@ -198,7 +198,7 @@ malo_cardbus_enable(struct malo_softc *sc)
 {
 	struct malo_cardbus_softc *csc = (struct malo_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* power on the socket */
@@ -225,7 +225,7 @@ malo_cardbus_disable(struct malo_softc *sc)
 {
 	struct malo_cardbus_softc *csc = (struct malo_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* unhook the interrupt handler */
diff --git a/sys/dev/cardbus/if_pgt_cardbus.c b/sys/dev/cardbus/if_pgt_cardbus.c
index 52a1d9baff1..1e2ae2100aa 100644
--- a/sys/dev/cardbus/if_pgt_cardbus.c
+++ b/sys/dev/cardbus/if_pgt_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pgt_cardbus.c,v 1.9 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_pgt_cardbus.c,v 1.10 2010/03/27 20:04:03 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
@@ -148,7 +148,7 @@ pgt_cardbus_detach(struct device *self, int flags)
 	struct pgt_cardbus_softc *csc = (struct pgt_cardbus_softc *)self;
 	struct pgt_softc *sc = &csc->sc_pgt;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	int error;
 
@@ -174,7 +174,7 @@ pgt_cardbus_enable(struct pgt_softc *sc)
 {
         struct pgt_cardbus_softc *csc = (struct pgt_cardbus_softc *)sc;
         cardbus_devfunc_t ct = csc->sc_ct;
-        pci_chipset_tag_t cc = ct->ct_cc;
+        cardbus_chipset_tag_t cc = ct->ct_cc;
         cardbus_function_tag_t cf = ct->ct_cf;
 
         /* power on the socket */
@@ -201,7 +201,7 @@ pgt_cardbus_disable(struct pgt_softc *sc)
 {
 	struct pgt_cardbus_softc *csc = (struct pgt_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* unhook the interrupt handler */
@@ -227,7 +227,7 @@ void
 pgt_cardbus_setup(struct pgt_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index 26a14dd4c1f..9cb140c703b 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral_cardbus.c,v 1.15 2010/03/22 22:28:27 jsg Exp $  */
+/*	$OpenBSD: if_ral_cardbus.c,v 1.16 2010/03/27 20:04:03 jsg Exp $  */
 
 /*-
  * Copyright (c) 2005-2007
@@ -204,7 +204,7 @@ ral_cardbus_detach(struct device *self, int flags)
 	struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)self;
 	struct rt2560_softc *sc = &csc->sc_sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	int error;
 
@@ -230,7 +230,7 @@ ral_cardbus_enable(struct rt2560_softc *sc)
 {
 	struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* power on the socket */
@@ -257,7 +257,7 @@ ral_cardbus_disable(struct rt2560_softc *sc)
 {
 	struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/* unhook the interrupt handler */
@@ -283,7 +283,7 @@ void
 ral_cardbus_setup(struct ral_cardbus_softc *csc)
 {
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index be842b33aa1..c8ec25b9ee7 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_cardbus.c,v 1.17 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: if_re_cardbus.c,v 1.18 2010/03/27 20:04:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -115,7 +115,7 @@ re_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct cardbus_attach_args *ca = aux;
 	struct cardbus_softc *psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
-	pci_chipset_tag_t cc = psc->sc_cc;
+	cardbus_chipset_tag_t cc = psc->sc_cc;
 	cardbus_function_tag_t cf = psc->sc_cf;
 	cardbus_devfunc_t ct = ca->ca_ct;
 	bus_addr_t adr;
@@ -178,7 +178,7 @@ re_cardbus_setup(struct rl_softc *sc)
 {
 	struct re_cardbus_softc *csc = (struct re_cardbus_softc *)sc;
 	cardbus_devfunc_t ct = csc->ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg, command;
 	int pmreg;
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index c126c6001bd..5573a9c3498 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.19 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.20 2010/03/27 20:04:03 jsg Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -149,7 +149,7 @@ rl_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct cardbus_attach_args	*ca = aux;
 	struct cardbus_softc		*psc =
 	    (struct cardbus_softc *)sc->sc_dev.dv_parent;
-	pci_chipset_tag_t		cc = psc->sc_cc;
+	cardbus_chipset_tag_t		cc = psc->sc_cc;
 	cardbus_function_tag_t		cf = psc->sc_cf;                            
 	cardbus_devfunc_t		ct = ca->ca_ct;
 	bus_addr_t			adr;
@@ -244,7 +244,7 @@ rl_cardbus_setup(struct rl_cardbus_softc *csc)
 {
 	struct rl_softc		*sc = &csc->sc_rl;
 	cardbus_devfunc_t	ct = csc->sc_ct;
-	pci_chipset_tag_t	cc = ct->ct_cc;
+	cardbus_chipset_tag_t	cc = ct->ct_cc;
 	cardbus_function_tag_t	cf = ct->ct_cf;
 	pcireg_t		reg, command;
 	int			pmreg;
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 17d645ee80a..730d31c7c5a 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.16 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.17 2010/03/27 20:04:03 jsg Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -321,7 +321,7 @@ rtw_cardbus_enable(struct rtw_softc *sc)
 {
 	struct rtw_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	/*
@@ -359,7 +359,7 @@ rtw_cardbus_disable(struct rtw_softc *sc)
 {
 	struct rtw_cardbus_softc *csc = (void *) sc;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 
 	RTW_WRITE(&sc->sc_regs, RTW_FEMR,
@@ -390,7 +390,7 @@ rtw_cardbus_setup(struct rtw_cardbus_softc *csc)
 {
 	struct rtw_softc *sc = &csc->sc_rtw;
 	cardbus_devfunc_t ct = csc->sc_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t reg;
 	int pmreg;
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 7afef8dfaa1..1ec4bf0e316 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_cardbus.c,v 1.25 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: if_xl_cardbus.c,v 1.26 2010/03/27 20:04:03 jsg Exp $ */
 /*	$NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $	*/
 
 /*
@@ -194,7 +194,7 @@ xl_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct xl_softc *sc = &csc->sc_softc;
 	struct cardbus_attach_args *ca = aux;
 	cardbus_devfunc_t ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t command, bhlc;
 	const struct xl_cardbus_product *ecp;
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index e69acb1a6cd..21da000a0a4 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_cardbus.c,v 1.13 2010/03/22 22:28:27 jsg Exp $ */
+/*	$OpenBSD: ohci_cardbus.c,v 1.14 2010/03/27 20:04:03 jsg Exp $ */
 /*	$NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $	*/
 
 /*
@@ -64,7 +64,7 @@ int	ohci_cardbus_detach(struct device *, int);
 
 struct ohci_cardbus_softc {
 	ohci_softc_t		sc;
-	pci_chipset_tag_t	sc_cc;
+	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void 			*sc_ih;		/* interrupt vectoring */
@@ -97,7 +97,7 @@ ohci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct ohci_cardbus_softc *sc = (struct ohci_cardbus_softc *)self;
 	struct cardbus_attach_args *ca = aux;
 	cardbus_devfunc_t ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t csr;
 	usbd_status r;
diff --git a/sys/dev/cardbus/puc_cardbus.c b/sys/dev/cardbus/puc_cardbus.c
index f023fdc0786..40022107a54 100644
--- a/sys/dev/cardbus/puc_cardbus.c
+++ b/sys/dev/cardbus/puc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: puc_cardbus.c,v 1.4 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: puc_cardbus.c,v 1.5 2010/03/27 20:04:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -57,7 +57,7 @@ puc_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	struct cardbus_attach_args *ca = aux;
 	struct cardbus_devfunc *ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t bhlc, reg;
 
@@ -85,7 +85,7 @@ puc_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct puc_softc *sc = &csc->sc_psc;
 	struct cardbus_attach_args *ca = aux;
 	struct cardbus_devfunc *ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	struct puc_attach_args paa;
 	pcireg_t reg;
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index 57084c5398a..37f400d9cef 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci_cardbus.c,v 1.9 2010/03/22 22:28:27 jsg Exp $	*/
+/*	$OpenBSD: uhci_cardbus.c,v 1.10 2010/03/27 20:04:03 jsg Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@ int	uhci_cardbus_detach(struct device *, int);
 
 struct uhci_cardbus_softc {
 	uhci_softc_t		sc;
-	pci_chipset_tag_t	sc_cc;
+	cardbus_chipset_tag_t	sc_cc;
 	cardbus_function_tag_t	sc_cf;
 	cardbus_devfunc_t	sc_ct;
 	void 			*sc_ih;		/* interrupt vectoring */
@@ -87,7 +87,7 @@ uhci_cardbus_attach(struct device *parent, struct device *self, void *aux)
 	struct uhci_cardbus_softc *sc = (struct uhci_cardbus_softc *)self;
 	struct cardbus_attach_args *ca = aux;
 	cardbus_devfunc_t ct = ca->ca_ct;
-	pci_chipset_tag_t cc = ct->ct_cc;
+	cardbus_chipset_tag_t cc = ct->ct_cc;
 	cardbus_function_tag_t cf = ct->ct_cf;
 	pcireg_t csr;
 	usbd_status r;
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 1866d42b147..b7de1ceaad9 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccbb.c,v 1.72 2010/03/23 11:44:00 krw Exp $	*/
+/*	$OpenBSD: pccbb.c,v 1.73 2010/03/27 20:04:03 jsg Exp $	*/
 /*	$NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $	*/
 
 /*
@@ -109,21 +109,21 @@ void	pccbb_pcmcia_detach_card(struct pcic_handle *, int);
 void	pccbb_pcmcia_deactivate_card(struct pcic_handle *);
 #endif
 
-int	pccbb_ctrl(pci_chipset_tag_t, int);
-int	pccbb_power(pci_chipset_tag_t, int);
+int	pccbb_ctrl(cardbus_chipset_tag_t, int);
+int	pccbb_power(cardbus_chipset_tag_t, int);
 int	pccbb_cardenable(struct pccbb_softc * sc, int function);
 void   *pccbb_intr_establish(struct pccbb_softc *, int irq, int level,
     int (*ih) (void *), void *sc, const char *);
 void	pccbb_intr_disestablish(struct pccbb_softc *, void *ih);
 
-void   *pccbb_cb_intr_establish(pci_chipset_tag_t, int irq, int level,
+void   *pccbb_cb_intr_establish(cardbus_chipset_tag_t, int irq, int level,
     int (*ih) (void *), void *sc, const char *);
-void	pccbb_cb_intr_disestablish(pci_chipset_tag_t ct, void *ih);
+void	pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih);
 
-pcitag_t pccbb_make_tag(pci_chipset_tag_t, int, int, int);
-void	pccbb_free_tag(pci_chipset_tag_t, pcitag_t);
-pcireg_t pccbb_conf_read(pci_chipset_tag_t, pcitag_t, int);
-void	pccbb_conf_write(pci_chipset_tag_t, pcitag_t, int,
+pcitag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int, int);
+void	pccbb_free_tag(cardbus_chipset_tag_t, pcitag_t);
+pcireg_t pccbb_conf_read(cardbus_chipset_tag_t, pcitag_t, int);
+void	pccbb_conf_write(cardbus_chipset_tag_t, pcitag_t, int,
     pcireg_t);
 void	pccbb_chipinit(struct pccbb_softc *);
 
@@ -155,10 +155,10 @@ void	pccbb_pcmcia_do_mem_map(struct pcic_handle *, int);
 void	pccbb_powerhook(int, void *);
 
 /* bus-space allocation and deallocation functions */
-int	pccbb_rbus_cb_space_alloc(pci_chipset_tag_t, rbus_tag_t,
+int	pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t,
     bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align,
     int flags, bus_addr_t * addrp, bus_space_handle_t * bshp);
-int	pccbb_rbus_cb_space_free(pci_chipset_tag_t, rbus_tag_t,
+int	pccbb_rbus_cb_space_free(cardbus_chipset_tag_t, rbus_tag_t,
     bus_space_handle_t, bus_size_t);
 
 int	pccbb_open_win(struct pccbb_softc *, bus_space_tag_t,
@@ -359,7 +359,7 @@ pccbb_shutdown(void *arg)
 	DPRINTF(("%s: shutdown\n", sc->sc_dev.dv_xname));
 
 	/* turn off power */
-	pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
+	pccbb_power((cardbus_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
 
 	bus_space_write_4(sc->sc_base_memt, sc->sc_base_memh, CB_SOCKET_MASK,
 	    0);
@@ -784,7 +784,7 @@ pccbb_chipinit(struct pccbb_softc *sc)
 		0x800 + PCIC_INTR) & ~PCIC_INTR_RESET);
 
 	/* turn off power */
-	pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
+	pccbb_power((cardbus_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
 }
 
 
@@ -1070,10 +1070,10 @@ pccbb_pcmcia_write(struct pcic_handle *ph, int reg, int val)
 }
 
 /*
- * int pccbb_ctrl(pci_chipset_tag_t, int)
+ * int pccbb_ctrl(cardbus_chipset_tag_t, int)
  */
 int
-pccbb_ctrl(pci_chipset_tag_t ct, int command)
+pccbb_ctrl(cardbus_chipset_tag_t ct, int command)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1116,12 +1116,12 @@ pccbb_ctrl(pci_chipset_tag_t ct, int command)
 }
 
 /*
- * int pccbb_power(pci_chipset_tag_t, int)
+ * int pccbb_power(cardbus_chipset_tag_t, int)
  *   This function returns true when it succeeds and returns false when
  *   it fails.
  */
 int
-pccbb_power(pci_chipset_tag_t ct, int command)
+pccbb_power(cardbus_chipset_tag_t ct, int command)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1454,7 +1454,7 @@ pccbb_cardenable(struct pccbb_softc *sc, int function)
 }
 
 /*
- * void *pccbb_cb_intr_establish(pci_chipset_tag_t ct,
+ * void *pccbb_cb_intr_establish(cardbus_chipset_tag_t ct,
  *					int irq,
  *					int level,
  *					int (* func)(void *),
@@ -1468,7 +1468,7 @@ pccbb_cardenable(struct pccbb_softc *sc, int function)
  *   The arguments irq is not used because pccbb selects intr vector.
  */
 void *
-pccbb_cb_intr_establish(pci_chipset_tag_t ct, int irq, int level,
+pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, int irq, int level,
     int (*func)(void *), void *arg, const char *name)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
@@ -1478,13 +1478,13 @@ pccbb_cb_intr_establish(pci_chipset_tag_t ct, int irq, int level,
 
 
 /*
- * void *pccbb_cb_intr_disestablish(pci_chipset_tag_t ct,
+ * void *pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct,
  *					   void *ih)
  *
  *   This function removes an interrupt handler pointed by ih.
  */
 void
-pccbb_cb_intr_disestablish(pci_chipset_tag_t ct, void *ih)
+pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1648,13 +1648,13 @@ cb_show_regs(pci_chipset_tag_t pc, pcitag_t tag, bus_space_tag_t memt,
 #endif
 
 /*
- * pcitag_t pccbb_make_tag(pci_chipset_tag_t cc,
+ * pcitag_t pccbb_make_tag(cardbus_chipset_tag_t cc,
  *                                    int busno, int devno, int function)
  *   This is the function to make a tag to access config space of
  *  a CardBus Card.  It works same as pci_conf_read.
  */
 pcitag_t
-pccbb_make_tag(pci_chipset_tag_t cc, int busno, int devno, int function)
+pccbb_make_tag(cardbus_chipset_tag_t cc, int busno, int devno, int function)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
 
@@ -1662,18 +1662,18 @@ pccbb_make_tag(pci_chipset_tag_t cc, int busno, int devno, int function)
 }
 
 void
-pccbb_free_tag(pci_chipset_tag_t cc, pcitag_t tag)
+pccbb_free_tag(cardbus_chipset_tag_t cc, pcitag_t tag)
 {
 }
 
 /*
- * pcireg_t pccbb_conf_read(pci_chipset_tag_t cc,
+ * pcireg_t pccbb_conf_read(cardbus_chipset_tag_t cc,
  *                                     pcitag_t tag, int offset)
  *   This is the function to read the config space of a CardBus Card.
  *  It works same as pci_conf_read.
  */
 pcireg_t
-pccbb_conf_read(pci_chipset_tag_t cc, pcitag_t tag, int offset)
+pccbb_conf_read(cardbus_chipset_tag_t cc, pcitag_t tag, int offset)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
 
@@ -1681,13 +1681,13 @@ pccbb_conf_read(pci_chipset_tag_t cc, pcitag_t tag, int offset)
 }
 
 /*
- * void pccbb_conf_write(pci_chipset_tag_t cc, pcitag_t tag,
+ * void pccbb_conf_write(cardbus_chipset_tag_t cc, pcitag_t tag,
  *                              int offs, pcireg_t val)
  *   This is the function to write the config space of a CardBus Card.
  *  It works same as pci_conf_write.
  */
 void
-pccbb_conf_write(pci_chipset_tag_t cc, pcitag_t tag, int reg,
+pccbb_conf_write(cardbus_chipset_tag_t cc, pcitag_t tag, int reg,
     pcireg_t val)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
@@ -2048,7 +2048,7 @@ pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch)
 
 	/* power down the socket to reset it, clear the card reset pin */
 
-	pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
+	pccbb_power((cardbus_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
 
 	/*
 	 * wait 200ms until power fails (Tpf).  Then, wait 100ms since
@@ -2064,7 +2064,7 @@ pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch)
 	/* Power up the socket. */
 	power = Pcic_read(ph, PCIC_PWRCTL);
 	Pcic_write(ph, PCIC_PWRCTL, (power & ~PCIC_PWRCTL_OE));
-	pccbb_power((pci_chipset_tag_t)sc, voltage);
+	pccbb_power((cardbus_chipset_tag_t)sc, voltage);
 
 	/* Now output enable */
 	power = Pcic_read(ph, PCIC_PWRCTL);
@@ -2147,7 +2147,7 @@ pccbb_pcmcia_socket_disable(pcmcia_chipset_handle_t pch)
 	power = Pcic_read(ph, PCIC_PWRCTL);
 	power &= ~PCIC_PWRCTL_OE;
 	Pcic_write(ph, PCIC_PWRCTL, power);
-	pccbb_power((pci_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
+	pccbb_power((cardbus_chipset_tag_t)sc, CARDBUS_VCC_0V | CARDBUS_VPP_0V);
 	/*
 	 * wait 300ms until power fails (Tpf).
 	 */
@@ -2577,7 +2577,7 @@ pccbb_pcmcia_intr_string(pcmcia_chipset_handle_t pch, void *ih)
 
 /*
  * int
- * pccbb_rbus_cb_space_alloc(pci_chipset_tag_t ct, rbus_tag_t rb,
+ * pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t ct, rbus_tag_t rb,
  *			    bus_addr_t addr, bus_size_t size,
  *			    bus_addr_t mask, bus_size_t align,
  *			    int flags, bus_addr_t *addrp;
@@ -2587,7 +2587,7 @@ pccbb_pcmcia_intr_string(pcmcia_chipset_handle_t pch, void *ih)
  *   clients.  This function is called from CardBus card drivers.
  */
 int
-pccbb_rbus_cb_space_alloc(pci_chipset_tag_t ct, rbus_tag_t rb,
+pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t ct, rbus_tag_t rb,
     bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align,
     int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
 {
@@ -2624,13 +2624,13 @@ pccbb_rbus_cb_space_alloc(pci_chipset_tag_t ct, rbus_tag_t rb,
 
 /*
  * int
- * pccbb_rbus_cb_space_free(pci_chipset_tag_t *ct, rbus_tag_t rb,
+ * pccbb_rbus_cb_space_free(cardbus_chipset_tag_t *ct, rbus_tag_t rb,
  *			   bus_space_handle_t *bshp, bus_size_t size);
  *
  *   This function is called from CardBus card drivers.
  */
 int
-pccbb_rbus_cb_space_free(pci_chipset_tag_t ct, rbus_tag_t rb,
+pccbb_rbus_cb_space_free(cardbus_chipset_tag_t ct, rbus_tag_t rb,
     bus_space_handle_t bsh, bus_size_t size)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;