summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorjoda <joda@NetBSD.org>2000-01-13 09:00:30 +0000
committerjoda <joda@NetBSD.org>2000-01-13 09:00:30 +0000
commit4bc55bd30786208be644c59b7a87d059a71bd7eb (patch)
tree5ab548a7e05bd0e29f24b1585b04e6a5a25c75bd /sys
parentc61a134a0095a88a33974411d40f48ce6e9470d3 (diff)
(pcic_chip_do_mem_map): handle 8-bit memory
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/i82365.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 51f1fae25a5..d641552021c 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.27 2000/01/02 02:08:07 sommerfeld Exp $ */
+/* $NetBSD: i82365.c,v 1.28 2000/01/13 09:00:30 joda Exp $ */
#define PCICDEBUG
@@ -932,6 +932,9 @@ pcic_chip_do_mem_map(h, win)
{
int reg;
+ int kind = h->mem[win].kind & ~PCMCIA_WIDTH_MEM_MASK;
+ int mem8 = (h->mem[win].kind & PCMCIA_WIDTH_MEM_MASK) == PCMCIA_WIDTH_MEM8;
+
pcic_write(h, mem_map_index[win].sysmem_start_lsb,
(h->mem[win].addr >> PCIC_SYSMEM_ADDRX_SHIFT) & 0xff);
pcic_write(h, mem_map_index[win].sysmem_start_msb,
@@ -957,11 +960,11 @@ pcic_chip_do_mem_map(h, win)
pcic_write(h, mem_map_index[win].cardmem_msb,
((h->mem[win].offset >> (PCIC_CARDMEM_ADDRX_SHIFT + 8)) &
PCIC_CARDMEM_ADDRX_MSB_ADDR_MASK) |
- ((h->mem[win].kind == PCMCIA_MEM_ATTR) ?
+ ((kind == PCMCIA_MEM_ATTR) ?
PCIC_CARDMEM_ADDRX_MSB_REGACTIVE_ATTR : 0));
reg = pcic_read(h, PCIC_ADDRWIN_ENABLE);
- reg |= (mem_map_index[win].memenable | PCIC_ADDRWIN_ENABLE_MEMCS16);
+ reg |= (mem_map_index[win].memenable | (mem8 ? 0 : PCIC_ADDRWIN_ENABLE_MEMCS16));
pcic_write(h, PCIC_ADDRWIN_ENABLE, reg);
delay(100);