From d475e057f4cf08a293f769e6a78d1bd294e056bd Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Fri, 19 May 2000 16:19:51 +0000 Subject: [PATCH] Use the rman_get_bustag() and rman_get_bushandle() functions. --- sys/dev/awi/if_awi_pccard.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index 45d43e54ffd..c9b8150587b 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -80,9 +80,8 @@ awi_pccard_probe(device_t dev) if (!psc->sc_port_res) return ENOMEM; - sc->sc_chip.sc_iot = I386_BUS_SPACE_IO; - sc->sc_chip.sc_ioh = - (bus_space_handle_t)rman_get_start(psc->sc_port_res); + sc->sc_chip.sc_iot = rman_get_bustag(psc->sc_port_res); + sc->sc_chip.sc_ioh = rman_get_bushandle(psc->sc_port_res); am79c930_chip_init(&sc->sc_chip, 0); DELAY(1000); @@ -129,9 +128,8 @@ awi_pccard_attach(device_t dev) device_printf(dev, "awi_pccard_attach: port alloc failed\n"); goto fail; } - sc->sc_chip.sc_iot = I386_BUS_SPACE_IO; - sc->sc_chip.sc_ioh = - (bus_space_handle_t)rman_get_start(psc->sc_port_res); + sc->sc_chip.sc_iot = rman_get_bustag(psc->sc_port_res); + sc->sc_chip.sc_ioh = rman_get_bushandle(psc->sc_port_res); psc->sc_irq_rid = 0; psc->sc_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, @@ -145,9 +143,8 @@ awi_pccard_attach(device_t dev) psc->sc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &psc->sc_mem_rid, 0, ~0, 0x8000, RF_ACTIVE); if (psc->sc_mem_res) { - sc->sc_chip.sc_memt = I386_BUS_SPACE_MEM; - sc->sc_chip.sc_memh = - (bus_space_handle_t)rman_get_virtual(psc->sc_mem_res); + sc->sc_chip.sc_memt = rman_get_bustag(psc->sc_mem_res); + sc->sc_chip.sc_memh = rman_get_bushandle(psc->sc_mem_res); am79c930_chip_init(&sc->sc_chip, 1); } else am79c930_chip_init(&sc->sc_chip, 0);