diff options
| author | jhb <jhb@FreeBSD.org> | 2009-11-17 18:22:14 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-11-17 18:22:14 +0000 |
| commit | c8decde1ac9b2805d8b80fbc6a2a9c08bee4d13e (patch) | |
| tree | c5680c0a28eb661bd755e21353bebdafdfddc6c2 /sys/dev/vge | |
| parent | 9fd2522ee91ee46f6e32e5ded433e64953b900e9 (diff) | |
| download | FreeBSD-src-c8decde1ac9b2805d8b80fbc6a2a9c08bee4d13e.zip FreeBSD-src-c8decde1ac9b2805d8b80fbc6a2a9c08bee4d13e.tar.gz | |
Use the bus_*() routines rather than bus_space_*() for register operations.
Diffstat (limited to 'sys/dev/vge')
| -rw-r--r-- | sys/dev/vge/if_vge.c | 3 | ||||
| -rw-r--r-- | sys/dev/vge/if_vgevar.h | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index a245769..830be20 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -945,9 +945,6 @@ vge_attach(dev) goto fail; } - sc->vge_btag = rman_get_bustag(sc->vge_res); - sc->vge_bhandle = rman_get_bushandle(sc->vge_res); - /* Allocate interrupt */ rid = 0; sc->vge_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, diff --git a/sys/dev/vge/if_vgevar.h b/sys/dev/vge/if_vgevar.h index aab5228..b19ed3f 100644 --- a/sys/dev/vge/if_vgevar.h +++ b/sys/dev/vge/if_vgevar.h @@ -100,8 +100,6 @@ struct vge_list_data { struct vge_softc { struct ifnet *vge_ifp; /* interface info */ device_t vge_dev; - bus_space_handle_t vge_bhandle; /* bus space handle */ - bus_space_tag_t vge_btag; /* bus space tag */ struct resource *vge_res; struct resource *vge_irq; void *vge_intrhand; @@ -134,20 +132,20 @@ struct vge_softc { * register space access macros */ #define CSR_WRITE_STREAM_4(sc, reg, val) \ - bus_space_write_stream_4(sc->vge_btag, sc->vge_bhandle, reg, val) + bus_write_stream_4(sc->vge_res, reg, val) #define CSR_WRITE_4(sc, reg, val) \ - bus_space_write_4(sc->vge_btag, sc->vge_bhandle, reg, val) + bus_write_4(sc->vge_res, reg, val) #define CSR_WRITE_2(sc, reg, val) \ - bus_space_write_2(sc->vge_btag, sc->vge_bhandle, reg, val) + bus_write_2(sc->vge_res, reg, val) #define CSR_WRITE_1(sc, reg, val) \ - bus_space_write_1(sc->vge_btag, sc->vge_bhandle, reg, val) + bus_write_1(sc->vge_res, reg, val) #define CSR_READ_4(sc, reg) \ - bus_space_read_4(sc->vge_btag, sc->vge_bhandle, reg) + bus_read_4(sc->vge_res, reg) #define CSR_READ_2(sc, reg) \ - bus_space_read_2(sc->vge_btag, sc->vge_bhandle, reg) + bus_read_2(sc->vge_res, reg) #define CSR_READ_1(sc, reg) \ - bus_space_read_1(sc->vge_btag, sc->vge_bhandle, reg) + bus_read_1(sc->vge_res, reg) #define CSR_SETBIT_1(sc, reg, x) \ CSR_WRITE_1(sc, reg, CSR_READ_1(sc, reg) | (x)) |
