diff options
| author | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-06-14 11:02:28 +0000 |
| commit | 36a1932601c730683d263ee933dd90cd6dae96bf (patch) | |
| tree | d76ce0bf0a31500c82596831333ff034e969773b /sys/pccard/pccard.c | |
| parent | 5fa995752f02a42fcb2b0ca54149fef141f98060 (diff) | |
| download | FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.zip FreeBSD-src-36a1932601c730683d263ee933dd90cd6dae96bf.tar.gz | |
The Great PC98 Merge.
All new code is "#ifdef PC98"ed so this should make no difference to
PC/AT (and its clones) users.
Ok'd by: core
Submitted by: FreeBSD(98) development team
Diffstat (limited to 'sys/pccard/pccard.c')
| -rw-r--r-- | sys/pccard/pccard.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 3f223a8..ac6466d 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -47,9 +47,15 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#include <pc98/pc98/pc98_device.h> +#include <pc98/pc98/icu.h> +#else #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> +#endif /* PC98 */ #include "apm.h" #if NAPM > 0 @@ -480,6 +486,8 @@ allocate_driver(struct slot *sp, struct drv_desc *drvp) struct pccard_drv *dp; int err, irq = 0, s; +/* BUCHI */ + dp = find_driver(drvp->name); if (dp == 0) return(ENXIO); @@ -499,6 +507,12 @@ allocate_driver(struct slot *sp, struct drv_desc *drvp) * If an interrupt mask has been given, then check it * against the slot interrupt (if one has been allocated). */ +/* BUCHI */ +#if 0 +printf("drvp->irqmask=0x%x, dp->imask=0x%x, sp->irq=0x%x, sp->ctrl->irqs=0x%x\n", drvp->irqmask, dp->imask, sp->irq, sp->ctrl->irqs); +printf("name=%s, unit=%d, mem=0x%x, memsz=%d, iobase=0x%x, irqmask=0x%x\n", drvp->name, drvp->unit, drvp->mem, drvp->memsize, drvp->iobase, drvp->irqmask); +#endif + if (drvp->irqmask && dp->imask) { if ((sp->ctrl->irqs & drvp->irqmask)==0) return(EINVAL); |
