diff options
author | Marius Strobl <marius@FreeBSD.org> | 2008-10-14 20:28:42 +0000 |
---|---|---|
committer | Marius Strobl <marius@FreeBSD.org> | 2008-10-14 20:28:42 +0000 |
commit | c00cf7224513254c606cae3620b81149b36b20c4 (patch) | |
tree | e417a60ac158c529ad1fb72cede9b98e1f9455ae /sys/dev/bge/if_bgereg.h | |
parent | 1675bf71aeb374223ef6ed952d49d326c6c26d56 (diff) | |
download | src-c00cf7224513254c606cae3620b81149b36b20c4.tar.gz src-c00cf7224513254c606cae3620b81149b36b20c4.zip |
Use bus_{read,write}_4(9) instead of bus_space_{read,write}_4(9)
in order to get rid of the bus space handle and tag in the softc.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=183896
Diffstat (limited to 'sys/dev/bge/if_bgereg.h')
-rw-r--r-- | sys/dev/bge/if_bgereg.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h index 4e1980c2012f..b10da2e7d97a 100644 --- a/sys/dev/bge/if_bgereg.h +++ b/sys/dev/bge/if_bgereg.h @@ -1896,8 +1896,7 @@ struct bge_rcb { }; #define RCB_WRITE_4(sc, rcb, offset, val) \ - bus_space_write_4(sc->bge_btag, sc->bge_bhandle, \ - rcb + offsetof(struct bge_rcb, offset), val) + bus_write_4(sc->bge_res, rcb + offsetof(struct bge_rcb, offset), val) #define BGE_RCB_MAXLEN_FLAGS(maxlen, flags) ((maxlen) << 16 | (flags)) #define BGE_RCB_FLAG_USE_EXT_RX_BD 0x0001 @@ -2394,10 +2393,10 @@ struct bge_gib { */ #define CSR_WRITE_4(sc, reg, val) \ - bus_space_write_4(sc->bge_btag, sc->bge_bhandle, reg, val) + bus_write_4(sc->bge_res, reg, val) #define CSR_READ_4(sc, reg) \ - bus_space_read_4(sc->bge_btag, sc->bge_bhandle, reg) + bus_read_4(sc->bge_res, reg) #define BGE_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, (CSR_READ_4(sc, reg) | (x))) @@ -2522,8 +2521,6 @@ struct bge_softc { device_t bge_dev; struct mtx bge_mtx; device_t bge_miibus; - bus_space_handle_t bge_bhandle; - bus_space_tag_t bge_btag; void *bge_intrhand; struct resource *bge_irq; struct resource *bge_res; |