diff options
| author | dfr <dfr@FreeBSD.org> | 1999-09-07 08:42:49 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-09-07 08:42:49 +0000 |
| commit | e2da291638899ecbc4fb439bebf44d5763be13f4 (patch) | |
| tree | da7778a2053253c07923bdb2565c4919af210b53 /sys/i386 | |
| parent | 2325c8f0cd1729626bf053cb03df56503d5ac806 (diff) | |
| download | FreeBSD-src-e2da291638899ecbc4fb439bebf44d5763be13f4.zip FreeBSD-src-e2da291638899ecbc4fb439bebf44d5763be13f4.tar.gz | |
Change isa_get/set_flags() to device_get/set_flags().
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/isa/if_ed.c | 10 | ||||
| -rw-r--r-- | sys/i386/isa/isa_compat.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 3244b3b..78fe9ee 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -382,7 +382,7 @@ ed_probe_WD80x3(dev) struct ed_softc *sc = device_get_softc(dev); int error; int i; - int flags = isa_get_flags(dev); + int flags = device_get_flags(dev); u_int memsize, maddr; u_char iptr, isa16bit, sum; u_long conf_maddr, conf_msize, irq, junk; @@ -795,7 +795,7 @@ ed_probe_3Com(dev) struct ed_softc *sc = device_get_softc(dev); int error; int i; - int flags = isa_get_flags(dev); + int flags = device_get_flags(dev); u_int memsize; u_char isa16bit; u_long conf_maddr, conf_msize, irq, junk; @@ -1301,7 +1301,7 @@ static int ed_probe_Novell(dev) device_t dev; { - return ed_probe_Novell_generic(dev, 0, isa_get_flags(dev)); + return ed_probe_Novell_generic(dev, 0, device_get_flags(dev)); } #if NCARDxx > 0 @@ -1539,7 +1539,7 @@ ed_probe_HP_pclanp(dev) sc->tx_page_start = ED_HPP_TX_PAGE_OFFSET; - if (isa_get_flags(dev) & ED_FLAGS_NO_MULTI_BUFFERING) + if (device_get_flags(dev) & ED_FLAGS_NO_MULTI_BUFFERING) sc->txb_cnt = 1; else sc->txb_cnt = 2; @@ -1864,7 +1864,7 @@ ed_isa_attach(dev) device_t dev; { struct ed_softc *sc = device_get_softc(dev); - int flags = isa_get_flags(dev); + int flags = device_get_flags(dev); int error; if (sc->port_used > 0) diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h index e7883e2..6b3e01b 100644 --- a/sys/i386/isa/isa_compat.h +++ b/sys/i386/isa/isa_compat.h @@ -99,7 +99,6 @@ struct old_isa_driver { extern struct isa_driver vtdriver; extern struct isa_driver advdriver; -extern struct isa_driver ahadriver; extern struct isa_driver wdcdriver; extern struct isa_driver msedriver; extern struct isa_driver ardriver; @@ -313,10 +312,6 @@ static struct old_isa_driver old_drivers[] = { #endif #endif -#if NAHA > 0 - { INTR_TYPE_CAM, &ahadriver }, -#endif - #ifdef PC98 #if NBS > 0 { INTR_TYPE_CAM, &bsdriver }, |
