From 0f08d52a6042e55bd85f3a16e7ec3da1bf13dff5 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 19 Oct 2003 17:38:04 +0000 Subject: [PATCH] Finish the removal of the bst/bsh confusion. --- sys/dev/ep/if_epvar.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h index 40cde2a7577e..122b0b88373a 100644 --- a/sys/dev/ep/if_epvar.h +++ b/sys/dev/ep/if_epvar.h @@ -81,21 +81,21 @@ void ep_intr(void *); int get_e(struct ep_softc *, u_int16_t, u_int16_t *); int ep_get_macaddr(struct ep_softc *, u_char *); -#define EP_READ_1(sc, off) (bus_space_read_1((sc)->bsh, (sc)->bst, off)) -#define EP_READ_2(sc, off) (bus_space_read_2((sc)->bsh, (sc)->bst, off)) +#define EP_READ_1(sc, off) (bus_space_read_1((sc)->bst, (sc)->bsh, off)) +#define EP_READ_2(sc, off) (bus_space_read_2((sc)->bst, (sc)->bsh, off)) #define EP_WRITE_1(sc, off, val) \ - bus_space_write_1(sc->bsh, sc->bst, off, val) + bus_space_write_1(sc->bst, sc->bsh, off, val) #define EP_WRITE_2(sc, off, val) \ - bus_space_write_2(sc->bsh, sc->bst, off, val) + bus_space_write_2(sc->bst, sc->bsh, off, val) #define EP_WRITE_MULTI_1(sc, off, addr, count) \ - bus_space_write_multi_1(sc->bsh, sc->bst, off, addr, count) + bus_space_write_multi_1(sc->bst, sc->bsh, off, addr, count) #define EP_WRITE_MULTI_2(sc, off, addr, count) \ - bus_space_write_multi_2(sc->bsh, sc->bst, off, addr, count) + bus_space_write_multi_2(sc->bst, sc->bsh, off, addr, count) #define EP_WRITE_MULTI_4(sc, off, addr, count) \ - bus_space_write_multi_4(sc->bsh, sc->bst, off, addr, count) + bus_space_write_multi_4(sc->bst, sc->bsh, off, addr, count) #define EP_READ_MULTI_1(sc, off, addr, count) \ - bus_space_read_multi_1(sc->bsh, sc->bst, off, addr, count) + bus_space_read_multi_1(sc->bst, sc->bsh, off, addr, count) #define EP_READ_MULTI_2(sc, off, addr, count) \ - bus_space_read_multi_2(sc->bsh, sc->bst, off, addr, count) + bus_space_read_multi_2(sc->bst, sc->bsh, off, addr, count) #define EP_READ_MULTI_4(sc, off, addr, count) \ - bus_space_read_multi_4(sc->bsh, sc->bst, off, addr, count) + bus_space_read_multi_4(sc->bst, sc->bsh, off, addr, count)