summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2004-11-16 23:00:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2004-11-16 23:00:27 +0000
commit30062b7576e065e26a1f98295e31b8170c4df5f8 (patch)
tree9b5a4faeecf8f72586dfc4e5d82a89740f36d56c
parent2004-11-16 Richard Campbell <richard.campbell@OARcorp.com> (diff)
downloadrtems-30062b7576e065e26a1f98295e31b8170c4df5f8.tar.bz2
2004-11-16 Richard Campbell <richard.campbell@OARcorp.com>
* vmeUniverse/vmeUniverse.c: Use PCI_MEM_BASE_ADJUSTMENT because some boards -- notably the MVME2100 -- return the physical address, not an offset in PCI memory space.
-rw-r--r--c/src/lib/libbsp/shared/ChangeLog6
-rw-r--r--c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog
index 4fbb053668..a0ff144acf 100644
--- a/c/src/lib/libbsp/shared/ChangeLog
+++ b/c/src/lib/libbsp/shared/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-16 Richard Campbell <richard.campbell@OARcorp.com>
+
+ * vmeUniverse/vmeUniverse.c: Use PCI_MEM_BASE_ADJUSTMENT because some
+ boards -- notably the MVME2100 -- return the physical address, not an
+ offset in PCI memory space.
+
2004-11-10 Joel Sherrill <joel@oarcorp.com>
* tod.c: Add include of tod.h to remove warnings.
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
index 9a521446df..664893afd3 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
@@ -69,7 +69,8 @@
#endif
typedef unsigned int pci_ulong;
-#define PCI_TO_LOCAL_ADDR(memaddr) ((pci_ulong)(memaddr) + PCI_MEM_BASE)
+#define PCI_TO_LOCAL_ADDR(memaddr) \
+ ((pci_ulong)(memaddr) + PCI_MEM_BASE_ADJUSTMENT)
#elif defined(__vxworks)