svn commit: r199558 - head/sys/dev/et
Pyun YongHyeon
yongari at FreeBSD.org
Thu Nov 19 22:06:19 UTC 2009
Author: yongari
Date: Thu Nov 19 22:06:19 2009
New Revision: 199558
URL: http://svn.freebsd.org/changeset/base/199558
Log:
Use bus_{read,write}_4 rather than bus_space_{read,write}_4.
Modified:
head/sys/dev/et/if_et.c
head/sys/dev/et/if_etvar.h
Modified: head/sys/dev/et/if_et.c
==============================================================================
--- head/sys/dev/et/if_et.c Thu Nov 19 22:04:02 2009 (r199557)
+++ head/sys/dev/et/if_et.c Thu Nov 19 22:06:19 2009 (r199558)
@@ -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) {
Modified: head/sys/dev/et/if_etvar.h
==============================================================================
--- head/sys/dev/et/if_etvar.h Thu Nov 19 22:04:02 2009 (r199557)
+++ head/sys/dev/et/if_etvar.h Thu Nov 19 22:06:19 2009 (r199558)
@@ -92,9 +92,9 @@ m_getl(int len, int how, int type, int f
#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;
More information about the svn-src-all
mailing list