summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmlb <dmlb@FreeBSD.org>2001-01-09 23:39:32 +0000
committerdmlb <dmlb@FreeBSD.org>2001-01-09 23:39:32 +0000
commitf2dd7e71f7ccc84c1b9e0b2181b6a9c7fb528e2c (patch)
tree4ac11f6555152ebac8770f41192936a8c90892cd
parent1bb19011b4203c40e178805f1eb09a46c5eeef0c (diff)
downloadFreeBSD-src-f2dd7e71f7ccc84c1b9e0b2181b6a9c7fb528e2c.zip
FreeBSD-src-f2dd7e71f7ccc84c1b9e0b2181b6a9c7fb528e2c.tar.gz
Fix a minor bug that prevents NEWBUS users from setting more than
one memory map. The memory window for the PCIC is identifed by the resource id for NEWSBUS drivers. pccardd always uses window 0 and rid 0 when setting maps up. This fix does not affect pccardd's handling of common memory for ed cards. Reviewed by: imp
-rw-r--r--sys/pccard/pcic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index df54688..8f1b624 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -156,7 +156,7 @@ pcic_memory(struct slot *slt, int win)
{
struct pcic_slot *sp = slt->cdata;
struct mem_desc *mp = &slt->mem[win];
- int reg = mp->window * PCIC_MEMSIZE + PCIC_MEMBASE;
+ int reg = win * PCIC_MEMSIZE + PCIC_MEMBASE;
if (mp->flags & MDF_ACTIVE) {
unsigned long sys_addr = (uintptr_t)(void *)mp->start >> 12;
OpenPOWER on IntegriCloud