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/isa.c | |
| parent | fc7f8028698e121cef42396d8352c0357be86aa7 (diff) | |
Missing pieces of new bus.h that CVS lost behind my back
Diffstat (limited to 'sys/dev/isa/isa.c')
| -rw-r--r-- | sys/dev/isa/isa.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 9401e9f064d..f30489260e6 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.19 1996/11/23 21:46:41 kstailey Exp $ */ +/* $OpenBSD: isa.c,v 1.20 1996/11/29 22:55:01 niklas Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /*- @@ -86,14 +86,15 @@ isaattach(parent, self, aux) isa_attach_hook(parent, self, iba); printf("\n"); - sc->sc_bc = iba->iba_bc; + sc->sc_iot = iba->iba_iot; + sc->sc_memt = iba->iba_memt; sc->sc_ic = iba->iba_ic; /* * Map port 0x84, which causes a 1.25us delay when read. * We do this now, since several drivers need it. */ - if (bus_io_map(sc->sc_bc, 0x84, 1, &sc->sc_delayioh)) + if (bus_space_map(sc->sc_iot, 0x84, 1, 0, &sc->sc_delaybah)) panic("isaattach: can't map `delay port'"); /* XXX */ TAILQ_INIT(&sc->sc_subdevs); @@ -145,7 +146,8 @@ isascan(parent, match) irq_map = find_emap("irq"); drq_map = find_emap("drq"); - ia.ia_bc = sc->sc_bc; + ia.ia_iot = sc->sc_iot; + ia.ia_memt = sc->sc_memt; ia.ia_ic = sc->sc_ic; ia.ia_iobase = cf->cf_loc[0]; ia.ia_iosize = 0x666; @@ -153,7 +155,7 @@ isascan(parent, match) ia.ia_msize = cf->cf_loc[3]; ia.ia_irq = cf->cf_loc[4] == 2 ? 9 : cf->cf_loc[4]; ia.ia_drq = cf->cf_loc[5]; - ia.ia_delayioh = sc->sc_delayioh; + ia.ia_delaybah = sc->sc_delaybah; if (cf->cf_fstate == FSTATE_STAR) { struct isa_attach_args ia2 = ia; |