d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use the definitions found in <i386/isa/isa.h> instead of rolling our

Browse Source 
own definition of ISA_HOLE_START.  We shouldn't need to include
  bus/processor specific code in here, but it is required.  At least by
  doing it this way it becomes more obvious where the bogusness is.

Obtained from:	email with bde
This commit is contained in:
Nate Williams 1997-10-24 15:27:16 +00:00
parent 514b69b047
commit d50a3fb743
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/pccard/pccard.c
View File

@ -60,10 +60,10 @@
#include <machine/md_var.h> #include <machine/md_var.h>
/* /*
* XXX ISA_HOLE_START is defined in <machine/pmap.h>, but it * XXX We shouldn't be using processor-specific/bus-specific code in
* carries too much baggage * 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"); 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) if (drvp->mem)
devp->isahd.id_maddr = devp->isahd.id_maddr =
(caddr_t)(drvp->mem + atdevbase - ISA_HOLE_START); (caddr_t)(drvp->mem + atdevbase - IOM_BEGIN);
else else
devp->isahd.id_maddr = 0; devp->isahd.id_maddr = 0;
devp->next = sp->devices; 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_mem = *(unsigned long *)data;
pccard_kmem = (unsigned char *)(pccard_mem pccard_kmem = (unsigned char *)(pccard_mem
+ atdevbase - ISA_HOLE_START); + atdevbase - IOM_BEGIN);
break; break;
/* /*
* Set power values * Set power values
@ -1061,7 +1061,8 @@ crdpoll(dev_t dev, int events, struct proc *p)
static int static int
invalid_io_memory(unsigned long adr, int size) 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(1);
return(0); return(0);
} }