diff options
| author | imp <imp@FreeBSD.org> | 2001-11-26 02:11:22 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-11-26 02:11:22 +0000 |
| commit | 4d78fb97ddbcfe194adec77d7f2ff79e384462c2 (patch) | |
| tree | 7a6162b246ae1442a2e24229c599159bccaaea17 | |
| parent | c62822dc9fdc77e8a9a8ee9a26b90811be89f26b (diff) | |
| download | FreeBSD-src-4d78fb97ddbcfe194adec77d7f2ff79e384462c2.zip FreeBSD-src-4d78fb97ddbcfe194adec77d7f2ff79e384462c2.tar.gz | |
peter pointed out that I missed a hard coded location for the memory.
Also add a define for I/O stuff (for cardbus).
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index a6cd25f..975b36d 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -104,6 +104,7 @@ PCIC_WRITE(SC,REG,(PCIC_READ(SC,REG) MASK) MASK2) #define PCCBB_START_MEM 0x84000000 +#define PCCBB_START_IO 0x1000 struct pccbb_sclist { struct pccbb_softc *sc; @@ -1263,8 +1264,8 @@ pccbb_cardbus_alloc_resource(device_t brdev, device_t child, int type, int *rid, start = end = tmp; break; case SYS_RES_IOPORT: - if (start <= 0x1000) - start = 0x1000; + if (start <= PCCBB_START_IO) + start = PCCBB_START_IO; if (end < start) end = start; break; @@ -1793,8 +1794,8 @@ pccbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid, switch (type) { case SYS_RES_MEMORY: - if (start < 0x10000000) - start = 0x10000000; /* XXX tweakable? */ + if (start < PCCBB_START_MEM) + start = PCCBB_START_MEM; if (end < start) end = start; flags = (flags & ~RF_ALIGNMENT_MASK) | |
