* Makefile.am, preinstall.am, include/bsp.h,

	* vme/vmeconfig.c (removed), vme/VME.h (removed):
	cleaned up vme support - use files from libbsp/powerpc/shared/vme
	and define BSP specifica in VMEConfig.h.
	Use VME DMA support implemented by vmeUniverse and
	libbsp/powerpc/shared/vme/vme_universe_dma.c

4 files changed, 36 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index bef71a5eef..17dfcea648 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-29	Till Straumann <strauman@slac.stanford.edu>
+
+	* Makefile.am, preinstall.am, include/bsp.h, 
+	* vme/vmeconfig.c (removed), vme/VME.h (removed):
+	cleaned up vme support - use files from libbsp/powerpc/shared/vme
+	and define BSP specifica in VMEConfig.h.
+	Use VME DMA support implemented by vmeUniverse and
+	libbsp/powerpc/shared/vme/vme_universe_dma.c
+
 2007-01-29	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* GT64260/MVME5500I2C.c: Eliminate u32.
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 4d4e8f35a1..5476dcd93f 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -107,11 +107,18 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 ##
 include_bsp_HEADERS += ../../shared/vmeUniverse/VME.h vme/VMEConfig.h
-include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h
+include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
+	../../shared/vmeUniverse/vmeUniverseDMA.h\
+	../../shared/vmeUniverse/bspVmeDmaList.h\
+	../../shared/vmeUniverse/VMEDMA.h
 
 noinst_PROGRAMS += vme.rel
 vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c
-vme_rel_SOURCES+= ../shared/vme/vmeconfig.c ../shared/vme/vme_universe.c
+vme_rel_SOURCES+= ../../shared/vmeUniverse/bspVmeDmaList.c
+vme_rel_SOURCES+= ../shared/vme/vmeconfig.c
+vme_rel_SOURCES+= ../shared/vme/vme_universe.c
+vme_rel_SOURCES+= ../shared/vme/vme_universe_dma.c
+
 vme_rel_CPPFLAGS = $(AM_CPPFLAGS)
 vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index f83c5f5a23..e119615e56 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -53,13 +53,14 @@
 #define BSP_MAX_PCI_BUS  (BSP_MAX_PCI_BUS_ON_PCI0+BSP_MAX_PCI_BUS_ON_PCI1)
 
 
-/* The glues to Till's vmeUniverse, although the name does not
- * actually reflect the relevant architect of the MVME5500.
- * Till TODO ? :  BSP_PCI_DO_EOI instead ? 
- * BSP_EXT_IRQ0 instead of BSP_PCI_IRQ0 ?
- *
+#if 0
+/* T.S, 2007/1: in order to let the universe acknowledge the interrupt
+ * (this allows for VME software priorities) corresponding support
+ * **MUST** be present in the interrupt controller driver
+ * Unless that's implemented DO NOT define BSP_PIC_DO_EOI.
  */
 #define BSP_PIC_DO_EOI  inl(0xc34)  /* PCI IACK */
+#endif
 #define BSP_PCI_IRQ0 BSP_GPP_IRQ_LOWEST_OFFSET
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
index 8060453e4b..8caab7ae5e 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/preinstall.am
@@ -126,6 +126,18 @@ $(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(P
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
 
+$(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h: ../../shared/vmeUniverse/vmeUniverseDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverseDMA.h
+
+$(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h: ../../shared/vmeUniverse/bspVmeDmaList.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bspVmeDmaList.h
+
+$(PROJECT_INCLUDE)/bsp/VMEDMA.h: ../../shared/vmeUniverse/VMEDMA.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEDMA.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEDMA.h
+
 $(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)