diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-03-27 20:04:04 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-03-27 20:04:04 +0000 |
| commit | 21b0b497188e035770e07570c2576e6b17f6162b (patch) | |
| tree | e14ce391521dc6a786d899fd1229ecf5e116f0a8 /sys/dev/cardbus/if_re_cardbus.c | |
| parent | 7a7a0dd0679765c36528d91de139a78f950b7cc6 (diff) | |
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@
Diffstat (limited to 'sys/dev/cardbus/if_re_cardbus.c')
| -rw-r--r-- | sys/dev/cardbus/if_re_cardbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |