diff options
| author | imp <imp@FreeBSD.org> | 2001-11-26 00:33:04 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-11-26 00:33:04 +0000 |
| commit | db87601b0e5b25e1c588971b3a467cdb8a0bfe9a (patch) | |
| tree | 3633b1449e0216008e8ef813717ddad9b5c8684d /sys/dev/pccbb | |
| parent | 36f6388741d3a15db7722ebb472a7a2175aa1d0e (diff) | |
| download | FreeBSD-src-db87601b0e5b25e1c588971b3a467cdb8a0bfe9a.zip FreeBSD-src-db87601b0e5b25e1c588971b3a467cdb8a0bfe9a.tar.gz | |
Make the address we kludily allocate in pccbb be a #define for easier
changing. Also change it from 0x44000000 to 0x84000000 for large memory
machines.
# the PCI bus code should do this for us. This is a bandaide, not a
# solution.
Diffstat (limited to 'sys/dev/pccbb')
| -rw-r--r-- | sys/dev/pccbb/pccbb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index 364bd21..a6cd25f 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -103,6 +103,8 @@ #define PCIC_MASK2(SC,REG,MASK,MASK2) \ PCIC_WRITE(SC,REG,(PCIC_READ(SC,REG) MASK) MASK2) +#define PCCBB_START_MEM 0x84000000 + struct pccbb_sclist { struct pccbb_softc *sc; STAILQ_ENTRY(pccbb_sclist) entries; @@ -438,7 +440,7 @@ pccbb_attach(device_t brdev) -(sockbase & 0xfffffff0); sc->sc_base_res = bus_generic_alloc_resource( device_get_parent(brdev), brdev, SYS_RES_MEMORY, - &rid, 0x10000000, ~0, sockbase, + &rid, PCCBB_START_MEM, ~0, sockbase, RF_ACTIVE|rman_make_alignment_flags(sockbase)); if (!sc->sc_base_res){ device_printf(brdev, @@ -1267,8 +1269,8 @@ pccbb_cardbus_alloc_resource(device_t brdev, device_t child, int type, int *rid, end = start; break; case SYS_RES_MEMORY: - if (start <= 0x44000000) - start = 0x44000000; + if (start <= PCCBB_START_MEM) + start = PCCBB_START_MEM; if (end < start) end = start; break; |
