From 7996b53a69044f3dfc94e00127ab21b632e3b81a Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Fri, 19 Jan 2007 22:58:08 +0000 Subject: * Makefile.am, * ep1a/Makefile.am, ep1a/preinstall.am, * motorola_powerpc/Makefile.am, motorola_powerpc/preinstall.am, * score603e/Makefile.am, score603e/preinstall.am, * shared/vme/VME.h: moved VME.h from libbsp/powerpc/shared/vme to libbsp/shared/vmeUniverse; eventually, this (and other) VME API headers should migrate to cpukit. --- c/src/lib/libbsp/powerpc/ChangeLog | 11 ++ c/src/lib/libbsp/powerpc/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ep1a/Makefile.am | 5 +- c/src/lib/libbsp/powerpc/ep1a/preinstall.am | 8 +- .../libbsp/powerpc/motorola_powerpc/Makefile.am | 6 +- .../libbsp/powerpc/motorola_powerpc/preinstall.am | 8 +- c/src/lib/libbsp/powerpc/score603e/Makefile.am | 3 +- c/src/lib/libbsp/powerpc/score603e/preinstall.am | 8 +- c/src/lib/libbsp/powerpc/shared/vme/VME.h | 113 --------------------- 9 files changed, 33 insertions(+), 131 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/shared/vme/VME.h (limited to 'c/src') diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 34f57c8c53..bf79ed2184 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,14 @@ +2007-01-19 Till Straumann + + * Makefile.am, + * ep1a/Makefile.am, ep1a/preinstall.am, + * motorola_powerpc/Makefile.am, motorola_powerpc/preinstall.am, + * score603e/Makefile.am, score603e/preinstall.am, + * shared/vme/VME.h: + moved VME.h from libbsp/powerpc/shared/vme to + libbsp/shared/vmeUniverse; eventually, this (and other) + VME API headers should migrate to cpukit. + 2007-01-16 Till Straumann * ep1a/vme/vmeconfig.c, mvme5500/pci/pcifinddevice.c, diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am index 4b1efc7dcd..f92464053a 100644 --- a/c/src/lib/libbsp/powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/Makefile.am @@ -62,7 +62,7 @@ EXTRA_DIST += shared/tod/todcfg.c EXTRA_DIST += shared/vectors/vectors_init.c shared/vectors/vectors.S ## shared/vme -EXTRA_DIST += shared/vme/vmeconfig.c shared/vme/VMEConfig.h shared/vme/VME.h +EXTRA_DIST += shared/vme/vmeconfig.c shared/vme/VMEConfig.h shared/vme/README shared/vme/vme_universe.c include $(top_srcdir)/../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index 09a77782b4..1c022ec8fc 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am @@ -91,8 +91,9 @@ vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ - ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h \ - ../../shared/vmeUniverse/vme_am_defs.h + ../../powerpc/shared/vme/VMEConfig.h \ + ../../shared/vmeUniverse/vme_am_defs.h \ + ../../shared/vmeUniverse/VME.h noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c vme/vmeconfig.c \ diff --git a/c/src/lib/libbsp/powerpc/ep1a/preinstall.am b/c/src/lib/libbsp/powerpc/ep1a/preinstall.am index 3a320ac1f5..6b43ab716b 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/preinstall.am +++ b/c/src/lib/libbsp/powerpc/ep1a/preinstall.am @@ -105,14 +105,14 @@ $(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/VME.h: ../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h - $(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h +$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h + $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 78509105cc..d28838d8dd 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -134,15 +134,17 @@ vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ - ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h + ../../shared/vmeUniverse/VME.h \ + ../../powerpc/shared/vme/VMEConfig.h noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.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/VMEConfig.h ../../powerpc/shared/vme/VME.h + ../../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/preinstall.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am index 16b8e80263..7f98b79245 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am @@ -117,11 +117,11 @@ $(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(P $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h +$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h + $(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h -$(PROJECT_INCLUDE)/bsp/VME.h: ../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h - diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index a3b9b3e1a1..37e151e677 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -82,7 +82,8 @@ vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ## include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../shared/vmeUniverse/vme_am_defs.h \ - ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h \ + ../../shared/vmeUniverse/VME.h \ + ../../powerpc/shared/vme/VMEConfig.h \ ../../powerpc/shared/motorola/motorola.h noinst_PROGRAMS += vme.rel diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am b/c/src/lib/libbsp/powerpc/score603e/preinstall.am index c74bd49bf2..882704e0ef 100644 --- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am +++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am @@ -101,14 +101,14 @@ $(PROJECT_INCLUDE)/bsp/vme_am_defs.h: ../../shared/vmeUniverse/vme_am_defs.h $(P $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vme_am_defs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vme_am_defs.h +$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vmeUniverse/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h + $(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h -$(PROJECT_INCLUDE)/bsp/VME.h: ../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h - $(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h diff --git a/c/src/lib/libbsp/powerpc/shared/vme/VME.h b/c/src/lib/libbsp/powerpc/shared/vme/VME.h deleted file mode 100644 index 6f5c570aab..0000000000 --- a/c/src/lib/libbsp/powerpc/shared/vme/VME.h +++ /dev/null @@ -1,113 +0,0 @@ -#ifndef RTEMS_BSP_VME_API_H -#define RTEMS_BSP_VME_API_H -/* $Id$ */ - -/* SVGM et al. BSP's VME support */ - -/* - * Authorship - * ---------- - * This software was created by - * Till Straumann , 2002, - * Stanford Linear Accelerator Center, Stanford University. - * - * Acknowledgement of sponsorship - * ------------------------------ - * This software was produced by - * the Stanford Linear Accelerator Center, Stanford University, - * under Contract DE-AC03-76SFO0515 with the Department of Energy. - * - * Government disclaimer of liability - * ---------------------------------- - * Neither the United States nor the United States Department of Energy, - * nor any of their employees, makes any warranty, express or implied, or - * assumes any legal liability or responsibility for the accuracy, - * completeness, or usefulness of any data, apparatus, product, or process - * disclosed, or represents that its use would not infringe privately owned - * rights. - * - * Stanford disclaimer of liability - * -------------------------------- - * Stanford University makes no representations or warranties, express or - * implied, nor assumes any liability for the use of this software. - * - * Stanford disclaimer of copyright - * -------------------------------- - * Stanford University, owner of the copyright, hereby disclaims its - * copyright and all other rights in this software. Hence, anyone may - * freely use it for any purpose without restriction. - * - * Maintenance of notices - * ---------------------- - * In the interest of clarity regarding the origin and status of this - * SLAC software, this and all the preceding Stanford University notices - * are to remain affixed to any copy or derivative of this software made - * or distributed by the recipient and are to be affixed to any copy of - * software made or distributed by the recipient that contains a copy or - * derivative of this software. - * - * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03 - */ - -#include - -/* address modifiers & friends */ -#include - -/* VME related declarations */ - -/* - * BSP-specific configuration routine; sets up - * VME windows and installs the VME interrupt manager. - */ -void BSP_vme_config() __attribute__((weak)); - -/* translate through host bridge and vme master window of vme bridge */ -int -BSP_vme2local_adrs(unsigned long am, unsigned long vmeaddr, unsigned long *plocaladdr); - -/* how a CPU address is mapped to the VME bus (if at all) */ -int -BSP_local2vme_adrs(unsigned long am, unsigned long localaddr, unsigned long *pvmeaddr); - -/* interrupt handlers and levels */ -typedef void (*BSP_VME_ISR_t)(void *usrArg, unsigned long vector); - -int -BSP_installVME_isr(unsigned long vector, BSP_VME_ISR_t handler, void *arg); -int -BSP_removeVME_isr(unsigned long vector, BSP_VME_ISR_t handler, void *arg); - -/* retrieve the currently installed ISR for a given vector */ -BSP_VME_ISR_t -BSP_getVME_isr(unsigned long vector, void **parg); - -int -BSP_enableVME_int_lvl(unsigned int level); - -int -BSP_disableVME_int_lvl(unsigned int level); - -int -BSP_VMEOutboundPortCfg( - unsigned long port, - unsigned long address_space, - unsigned long vme_address, - unsigned long pci_address, - unsigned long size); - -int -BSP_VMEInboundPortCfg( - unsigned long port, - unsigned long address_space, - unsigned long vme_address, - unsigned long pci_address, - unsigned long size); - -void -BSP_VMEOutboundPortsShow(FILE *f); - -void -BSP_VMEInboundPortsShow(FILE *f); - -#endif -- cgit v1.2.3