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/cardbus_map.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/cardbus_map.c')
| -rw-r--r-- | sys/dev/cardbus/cardbus_map.c | 20 |
1 files changed, 10 insertions, 10 deletions
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; |