diff options
| author | imp <imp@FreeBSD.org> | 2003-08-29 05:27:36 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-08-29 05:27:36 +0000 |
| commit | 8809ff94d637363de44834b2d97beffa582602f3 (patch) | |
| tree | 1a7ad7baf9bd5db646923fbdb11af18b705053e0 /sys/dev/exca | |
| parent | b5438b54303dbc8d523f6cdc914d2e4e37bb59fb (diff) | |
| download | FreeBSD-src-8809ff94d637363de44834b2d97beffa582602f3.zip FreeBSD-src-8809ff94d637363de44834b2d97beffa582602f3.tar.gz | |
When we went to the set_flags interface for the memory resource, we
switched from PCCARD_MEM_FOO to PCCARD_A_MEM_FOO, yet we didn't change
exca in all the right places. Do so now. Also use PCCARD_WIDTH_AUTO
rather than the magic cookie 0.
Diffstat (limited to 'sys/dev/exca')
| -rw-r--r-- | sys/dev/exca/exca.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c index ba3ef13..5ff0296 100644 --- a/sys/dev/exca/exca.c +++ b/sys/dev/exca/exca.c @@ -205,12 +205,12 @@ exca_do_mem_map(struct exca_softc *sc, int win) exca_putb(sc, map->cardmem_msb, ((mem->cardaddr >> (EXCA_CARDMEM_ADDRX_SHIFT + 8)) & EXCA_CARDMEM_ADDRX_MSB_ADDR_MASK) | - ((mem->kind == PCCARD_MEM_ATTR) ? + ((mem->kind == PCCARD_A_MEM_ATTR) ? EXCA_CARDMEM_ADDRX_MSB_REGACTIVE_ATTR : 0)); exca_setb(sc, EXCA_ADDRWIN_ENABLE, map->memenable); #ifdef EXCA_DEBUG - if (mem->kind == PCCARD_MEM_ATTR) + if (mem->kind == PCCARD_A_MEM_ATTR) printf("attribtue memory\n"); else printf("common memory\n"); @@ -791,10 +791,10 @@ exca_activate_resource(struct exca_softc *exca, device_t child, int type, if (!(rman_get_flags(res) & RF_ACTIVE)) { /* not already activated */ switch (type) { case SYS_RES_IOPORT: - err = exca_io_map(exca, 0, res); + err = exca_io_map(exca, PCCARD_WIDTH_AUTO, res); break; case SYS_RES_MEMORY: - err = exca_mem_map(exca, 0, res); + err = exca_mem_map(exca, PCCARD_A_MEM_COM, res); break; default: err = 0; |
