d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bus_{read,write}_4 rather than bus_space_{read,write}_4.

Browse Source
This commit is contained in:
yongari 2009-11-19 22:06:19 +00:00
parent 5a87f586d4
commit d49024b6f4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/et/if_et.c
View File

@ -269,8 +269,6 @@ et_attach(device_t dev)
device_printf(dev, "can't allocate IO memory\n");
return (ENXIO);
}
sc->sc_mem_bt = rman_get_bustag(sc->sc_mem_res);
sc->sc_mem_bh = rman_get_bushandle(sc->sc_mem_res);
msic = 0;
if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) == 0) {

6
sys/dev/et/if_etvar.h
View File

@ -92,9 +92,9 @@ m_getl(int len, int how, int type, int flags, int *psize)
#define ET_JUMBO_MEM_SIZE (ET_JSLOTS * ET_JLEN)
#define CSR_WRITE_4(sc, reg, val) \
bus_space_write_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg), (val))
bus_write_4((sc)->sc_mem_res, (reg), (val))
#define CSR_READ_4(sc, reg) \
bus_space_read_4((sc)->sc_mem_bt, (sc)->sc_mem_bh, (reg))
bus_read_4((sc)->sc_mem_res, (reg))
#define ET_ADDR_HI(addr) ((uint64_t) (addr) >> 32)
#define ET_ADDR_LO(addr) ((uint64_t) (addr) & 0xffffffff)
@ -229,8 +229,6 @@ struct et_softc {
device_t dev;
struct mtx sc_mtx;
device_t sc_miibus;
bus_space_handle_t sc_mem_bh;
bus_space_tag_t sc_mem_bt;
void *sc_irq_handle;
struct resource *sc_irq_res;
struct resource *sc_mem_res;