diff options
| author | Nate Williams <nate@FreeBSD.org> | 1997-10-24 15:27:16 +0000 |
|---|---|---|
| committer | Nate Williams <nate@FreeBSD.org> | 1997-10-24 15:27:16 +0000 |
| commit | d50a3fb74309e1668db55fda6555fb2ae0f4ee21 (patch) | |
| tree | 741c0edb38b2968d9a64c3195a43e861beda0d53 /sys | |
| parent | 514b69b047738fccf54337936e72141d407e81eb (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pccard/pccard.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c index 969d97d3a0c9..f96c1423e2b7 100644 --- a/sys/pccard/pccard.c +++ b/sys/pccard/pccard.c @@ -60,10 +60,10 @@ #include <machine/md_var.h> /* - * XXX ISA_HOLE_START is defined in <machine/pmap.h>, but it - * carries too much baggage + * XXX We shouldn't be using processor-specific/bus-specific code in + * here, but we need the start of the ISA hole (IOM_BEGIN). */ -#define ISA_HOLE_START 0xA0000 +#include <i386/isa/isa.h> SYSCTL_NODE(_machdep, OID_AUTO, pccard, CTLFLAG_RW, 0, "pccard"); @@ -592,7 +592,7 @@ allocate_driver(struct slot *sp, struct drv_desc *drvp) */ if (drvp->mem) devp->isahd.id_maddr = - (caddr_t)(drvp->mem + atdevbase - ISA_HOLE_START); + (caddr_t)(drvp->mem + atdevbase - IOM_BEGIN); else devp->isahd.id_maddr = 0; devp->next = sp->devices; @@ -995,7 +995,7 @@ crdioctl(dev_t dev, int cmd, caddr_t data, int fflag, struct proc *p) */ pccard_mem = *(unsigned long *)data; pccard_kmem = (unsigned char *)(pccard_mem - + atdevbase - ISA_HOLE_START); + + atdevbase - IOM_BEGIN); break; /* * Set power values @@ -1061,7 +1061,8 @@ crdpoll(dev_t dev, int events, struct proc *p) static int invalid_io_memory(unsigned long adr, int size) { - if (adr < 0xC0000 || (adr+size) > 0x100000) + /* XXX - What's magic about 0xC0000?? */ + if (adr < 0xC0000 || (adr+size) > IOM_END) return(1); return(0); } |