diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-29 22:55:11 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-29 22:55:11 +0000 |
| commit | bde17508b795638ded93ae6976d40b145b7078e6 (patch) | |
| tree | 68391b84ae17a5232bca6900696cbb9b92502ab9 /sys/dev/isa/if_ie.c | |
| parent | fc7f8028698e121cef42396d8352c0357be86aa7 (diff) | |
Missing pieces of new bus.h that CVS lost behind my back
Diffstat (limited to 'sys/dev/isa/if_ie.c')
| -rw-r--r-- | sys/dev/isa/if_ie.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index bb965d84db9..e04ee3c31f3 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.15 1996/11/12 20:30:37 niklas Exp $ */ +/* $OpenBSD: if_ie.c,v 1.16 1996/11/29 22:55:00 niklas Exp $ */ /* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- @@ -142,7 +142,7 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff. #include <machine/cpu.h> #include <machine/pio.h> /* XXX convert this driver! */ -#include <machine/bus.old.h> +#include <machine/bus.h> #include <machine/intr.h> #include <dev/isa/isareg.h> @@ -464,8 +464,8 @@ el_probe(sc, ia) struct ie_softc *sc; struct isa_attach_args *ia; { - bus_chipset_tag_t bc = ia->ia_bc; - bus_io_handle_t ioh; + bus_space_tag_t iot = ia->ia_iot; + bus_space_handle_t ioh; u_char c; int i, rval = 0; u_char signature[] = "*3COM*"; @@ -479,7 +479,7 @@ el_probe(sc, ia) /* * Map the Etherlink ID port for the probe sequence. */ - if (bus_io_map(bc, ELINK_ID_PORT, 1, &ioh)) { + if (bus_space_map(iot, ELINK_ID_PORT, 1, 0, &ioh)) { printf("3c507 probe: can't map Etherlink ID port\n"); return 0; } @@ -488,9 +488,9 @@ el_probe(sc, ia) * Reset and put card in CONFIG state without changing address. * XXX Indirect brokenness here! */ - elink_reset(bc, ioh, sc->sc_dev.dv_parent->dv_unit); - elink_idseq(bc, ioh, ELINK_507_POLY); - elink_idseq(bc, ioh, ELINK_507_POLY); + elink_reset(iot, ioh, sc->sc_dev.dv_parent->dv_unit); + elink_idseq(iot, ioh, ELINK_507_POLY); + elink_idseq(iot, ioh, ELINK_507_POLY); outb(ELINK_ID_PORT, 0xff); /* Check for 3COM signature before proceeding. */ @@ -508,7 +508,7 @@ el_probe(sc, ia) /* Go to RUN state. */ outb(ELINK_ID_PORT, 0x00); - elink_idseq(bc, ioh, ELINK_507_POLY); + elink_idseq(iot, ioh, ELINK_507_POLY); outb(ELINK_ID_PORT, 0x00); /* Set bank 2 for version info and read BCD version byte. */ @@ -572,7 +572,7 @@ el_probe(sc, ia) rval = 1; out: - bus_io_unmap(bc, ioh, 1); + bus_space_unmap(iot, ioh, 1); return rval; } |