diff options
| author | kato <kato@FreeBSD.org> | 1997-09-20 05:29:03 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-09-20 05:29:03 +0000 |
| commit | fce1d3934ae96dc281be5957d96f8c34963dbecd (patch) | |
| tree | 6df706eeb6914f4b1a0a1d104cf66703cb56a8be /sys/pc98 | |
| parent | 16203bbd93cef4831f887fffd9076c2eff3ea461 (diff) | |
| download | FreeBSD-src-fce1d3934ae96dc281be5957d96f8c34963dbecd.zip FreeBSD-src-fce1d3934ae96dc281be5957d96f8c34963dbecd.tar.gz | |
Synchronize with sys/i386/isa/isa.c revision 1.104.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/pc98/pc98.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c index e1f18ba..50e47c9 100644 --- a/sys/pc98/pc98/pc98.c +++ b/sys/pc98/pc98/pc98.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: pc98.c,v 1.39 1997/08/26 15:08:52 kato Exp $ + * $Id: pc98.c,v 1.40 1997/08/28 09:15:31 kato Exp $ */ /* @@ -78,6 +78,11 @@ #include <sys/interrupt.h> +#include "pnp.h" +#if NPNP > 0 +#include <i386/isa/pnp.h> +#endif + /* ** Register definitions for DMA controller 1 (channels 0..3): */ @@ -312,6 +317,9 @@ haveseen_isadev(dvp, checkbits) struct isa_device *dvp; u_int checkbits; { +#if NPNP > 0 + struct pnp_dlist_node *nod; +#endif struct isa_device *tmpdvp; int status = 0; @@ -335,6 +343,11 @@ haveseen_isadev(dvp, checkbits) if (status) return status; } +#if NPNP > 0 + for (nod = pnp_device_list; nod != NULL; nod = nod->next) + if (status |= haveseen(dvp, &(nod->dev), checkbits)) + return status; +#endif #ifdef RESOURCE_CHECK if (!dvp->id_conflicts) { status = check_pciconflict(dvp, checkbits); @@ -574,8 +587,7 @@ config_isadev_c(isdp, mp, reconfig) printf(" at 0x%x", isdp->id_iobase); printf("\n"); } - } - else { + } else { #if 0 /* This code has not been tested.... */ if (isdp->id_irq) { @@ -969,7 +981,6 @@ isa_dmastatus(int chan) u_long cnt = 0; int ffport, waport; u_long low1, high1, low2, high2; - u_long ef; /* channel active? */ if ((dma_inuse & (1 << chan)) == 0) { |
