From 1102f897219574e0d06fc9c54339813db65f0b79 Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Wed, 31 Jan 2007 03:43:12 +0000 Subject: 2007-01-30 Till Straumann * Makefile.am, preinstall.am, include/bsp.h: Use VME DMA support implemented by vmeUniverse and libbsp/powerpc/shared/vme/vme_universe_dma.c Added explanation for use of BSP_PIC_DO_EOI by BSP implementors who derive from this 'include/bsp.h'. --- c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 8 ++++++++ c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 7 ++++++- c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h | 14 ++++++++++++++ c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am | 12 ++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index e3acf1deca..84e893f7b5 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,11 @@ +2007-01-30 Till Straumann + + * Makefile.am, preinstall.am, include/bsp.h: + Use VME DMA support implemented by vmeUniverse and + libbsp/powerpc/shared/vme/vme_universe_dma.c + Added explanation for use of BSP_PIC_DO_EOI by + BSP implementors who derive from this 'include/bsp.h'. + 2007-01-26 Ralf Corsépius * bootloader/Makefile.am: Use MKDIR_P instead of mkdir_p. diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index d28838d8dd..8bdfcfc474 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -135,15 +135,20 @@ vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/VME.h \ - ../../powerpc/shared/vme/VMEConfig.h + ../../powerpc/shared/vme/VMEConfig.h \ + ../../shared/vmeUniverse/vmeUniverseDMA.h\ + ../../shared/vmeUniverse/bspVmeDmaList.h\ + ../../shared/vmeUniverse/VMEDMA.h noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ + ../../shared/vmeUniverse/bspVmeDmaList.c \ ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/VME.h \ ../../powerpc/shared/vme/vmeconfig.c \ ../../powerpc/shared/vme/vme_universe.c \ + ../../powerpc/shared/vme/vme_universe_dma.c \ ../../powerpc/shared/vme/VMEConfig.h vme_rel_CPPFLAGS = $(AM_CPPFLAGS) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h index 10bac559a2..a183928363 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h @@ -132,6 +132,20 @@ #define BSP_UART_BAUD_BASE 115200 #include +/* BSP_PIC_DO_EOI is optionally used by the 'vmeUniverse' driver + * to implement VME IRQ priorities in software. + * Note that this requires support by the interrupt controller + * driver (cf. libbsp/shared/powerpc/irq/openpic_i8259_irq.c) + * and the BSP-specific universe initialization/configuration + * (cf. libbsp/shared/powerpc/vme/VMEConfig.h vme_universe.c) + * + * ********* IMPORTANT NOTE ******** + * When deriving from this file (new BSPs) + * DO NOT define "BSP_PIC_DO_EOI" if you don't know what + * you are doing i.e., w/o implementing the required pieces + * mentioned above. + * ********* IMPORTANT NOTE ******** + */ #define BSP_PIC_DO_EOI openpic_eoi(0) #ifndef ASM diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am index 7f98b79245..c1d57ab9a7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am @@ -125,3 +125,15 @@ $(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../powerpc/shared/vme/VMEConfig.h $(PROJE $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.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 + -- cgit v1.2.3