diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-10 19:29:16 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-10 19:29:16 +0000 |
| commit | 2b01be5c65bba8d592a114843b5c07f70adb8448 (patch) | |
| tree | 369efb1c826a4a1b37b033e8dbe75d976b233766 | |
| parent | 0ecc74d006577eada7b9a415579fec0d19343e2d (diff) | |
Use the correct COR offset for pcmcia card; noted by Warner Losh
| -rw-r--r-- | sys/dev/ic/if_wireg.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/if_wi_pci.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ic/if_wireg.h b/sys/dev/ic/if_wireg.h index 099d25a92a8..da1efd976d2 100644 --- a/sys/dev/ic/if_wireg.h +++ b/sys/dev/ic/if_wireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wireg.h,v 1.24 2002/06/27 15:11:44 fgsch Exp $ */ +/* $OpenBSD: if_wireg.h,v 1.25 2002/07/10 19:29:15 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -292,7 +292,7 @@ #define WI_AUX_OFFSET 0x3C #define WI_AUX_DATA 0x3E -#define WI_COR_OFFSET 0x3E0 /* COR attribute offset of card */ +#define WI_COR_OFFSET 0x40 /* COR attribute offset of card */ #define WI_PLX_LOCALRES 0x14 /* PLX chip's local registers */ #define WI_PLX_MEMRES 0x18 /* Prism attribute memory (PLX) */ @@ -300,6 +300,7 @@ #define WI_PLX_INTCSR 0x4C /* PLX Interrupt CSR */ #define WI_PLX_INTEN 0x40 /* Interrupt Enable bit */ #define WI_PLX_COR_VALUE 0x41 /* Enable with irq in level trigger */ +#define WI_PLX_COR_OFFSET 0x3E0 /* COR attribute offset of card */ #define WI_TMD_LOCALRES 0x14 /* TMD chip's local registers */ #define WI_TMD_IORES 0x18 /* Prism I/O space (TMD) */ diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index c55c70aec50..67b23db1611 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.27 2002/07/09 11:00:27 fgsch Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.28 2002/07/10 19:29:15 millert Exp $ */ /* * Copyright (c) 2001, 2002 Todd C. Miller <Todd.Miller@courtesan.com> @@ -288,8 +288,9 @@ wi_pci_attach(parent, self, aux) /* * Setup the PLX chip for level interrupts and config index 1 */ - bus_space_write_1(memt, memh, WI_COR_OFFSET, WI_PLX_COR_VALUE); - sc->wi_cor_offset = WI_COR_OFFSET; + bus_space_write_1(memt, memh, WI_PLX_COR_OFFSET, + WI_PLX_COR_VALUE); + sc->wi_cor_offset = WI_PLX_COR_OFFSET; /* Unmap registers we no longer need access to. */ if (localsize != 0) |