diff options
146 files changed, 1642 insertions, 668 deletions
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am index a913042d22..8b058537f3 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am @@ -10,6 +10,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += include/cplb.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.in b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.in index 591c154c5c..921e94ea82 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.in +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -171,10 +172,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -327,6 +329,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/cplb.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -354,8 +357,9 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/cplb.h \ - $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/bsp/setvec.h $(PROJECT_INCLUDE)/bspopts.h \ + $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -703,6 +707,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -982,7 +1007,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1042,7 +1067,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1091,7 +1116,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1106,15 +1131,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1149,6 +1175,9 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h index c4a28c5e93..0605630295 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h +++ b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h @@ -27,7 +27,7 @@ extern "C" { #include <rtems/score/bfin.h> #include <rtems/bfin/bf52x.h> #include <bf52x.h> - +#include <bsp/setvec.h> /* * PLL and clock setup values: @@ -64,12 +64,6 @@ extern "C" { #define ODD_PARITY 0x08 /* Enable ODD parity */ #define TWO_STP_BIT 0x04 /* 2 stop bits */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am index 557599a694..f67f6bb6d6 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index d128ca43a9..631cbaa2de 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -9,6 +9,8 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.in b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.in index 740bcd289e..63865aa4b0 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.in +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -185,10 +186,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -343,6 +345,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -372,9 +375,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -740,6 +743,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1019,7 +1043,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1079,7 +1103,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1128,7 +1152,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1143,15 +1167,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1183,6 +1208,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h index 9d96bb8b71..ea165297c6 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h +++ b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h @@ -28,6 +28,8 @@ extern "C" { #include <libcpu/bf537.h> #include <libcpu/memoryRegs.h> +#include <bsp/setvec.h> + /* configure data cache to use 16K of each SRAM bank when enabled */ #define BSP_DATA_CACHE_CONFIG (3 << DMEM_CONTROL_DMC_SHIFT) @@ -90,12 +92,6 @@ void setLED(uint8_t value); */ uint8_t getLED(void); -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am index bdd3a3e368..d8f202c1f2 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index 7d08f25d17..3230b4e666 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -10,6 +10,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += include/cplb.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.in b/c/src/lib/libbsp/bfin/eZKit533/Makefile.in index 7b9fe2ea45..af1f049d02 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.in +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -171,10 +172,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -327,6 +329,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/cplb.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -354,8 +357,9 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/cplb.h \ - $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/bsp/setvec.h $(PROJECT_INCLUDE)/bspopts.h \ + $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -703,6 +707,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -982,7 +1007,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1042,7 +1067,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1091,7 +1116,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1106,15 +1131,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1149,6 +1175,9 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index e4dc27ef52..43e928dc68 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/score/bfin.h> #include <rtems/bfin/bf533.h> +#include <bsp/setvec.h> /* * PLL and clock setup values: @@ -103,12 +104,6 @@ void setLED (uint8_t value); */ uint8_t getLED (void); -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am index 557599a694..f67f6bb6d6 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am +++ b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am index d7922263ac..6484139cf4 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.in b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.in index 1562c1fab6..78d8a49ad6 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.in +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -180,10 +181,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -338,6 +340,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h \ include/system_conf.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -369,9 +372,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/system_conf.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/system_conf.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -797,6 +801,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1076,7 +1101,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1136,7 +1161,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1185,7 +1210,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1200,15 +1225,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1240,6 +1266,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h index d13d42fb92..432ed3ab11 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h +++ b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h @@ -24,6 +24,7 @@ #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #if defined(RTEMS_NETWORKING) #include <rtems/rtems_bsdnet.h> @@ -66,15 +67,6 @@ extern int rtems_tsmac_driver_attach(struct rtems_bsdnet_ifconfig *config, { \ } -/* functions */ -#if 0 -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); -#endif - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am index a95af392b2..b0b61488af 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c index b8be8be0de..09bd86c9cd 100644 --- a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c +++ b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c @@ -132,9 +132,6 @@ static inline void tsmacregwrite(unsigned int reg, uint16_t value) rtems_isr tsmac_interrupt_handler(rtems_vector_number vector); -extern rtems_isr_entry set_vector(rtems_isr_entry handler, - rtems_vector_number vector, int type); - /* * Macros to access PHY registers through the (G)MII */ @@ -534,7 +531,11 @@ void tsmac_init(void *arg) /* * Setup interrupt handler */ - set_vector( tsmac_interrupt_handler, TSMAC_VECTOR, 1 ); + set_vector( + tsmac_interrupt_handler, + TSMAC_VECTOR, + 1 + ); /* Interrupt line for TSMAC */ lm32_interrupt_unmask(TSMAC_IRQMASK); diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 3c37eda2cf..c7baa947d9 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.in b/c/src/lib/libbsp/m68k/av5282/Makefile.in index b2dc5ec42f..d12f7748a2 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.in +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -181,10 +182,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -339,6 +341,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -371,9 +374,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -814,6 +817,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1093,7 +1117,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1153,7 +1177,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1202,7 +1226,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1217,15 +1241,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1257,6 +1282,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h index 84d79b6237..8e8c8e4542 100644 --- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/av5282/include/bsp.h @@ -13,6 +13,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/av5282/preinstall.am b/c/src/lib/libbsp/m68k/av5282/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/av5282/preinstall.am +++ b/c/src/lib/libbsp/m68k/av5282/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index ca2047b524..e51eaf2e19 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.in b/c/src/lib/libbsp/m68k/csb360/Makefile.in index 031905b5e8..ec4b2a924e 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.in +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -167,10 +168,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -324,6 +326,7 @@ AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -352,9 +355,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -744,6 +747,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1023,7 +1047,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1082,7 +1106,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1131,7 +1155,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1146,15 +1170,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1186,6 +1211,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 8f364dc4be..b7bbe3a8c0 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -110,6 +110,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> struct rtems_bsdnet_ifconfig; extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config); @@ -155,12 +156,6 @@ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/csb360/preinstall.am b/c/src/lib/libbsp/m68k/csb360/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/csb360/preinstall.am +++ b/c/src/lib/libbsp/m68k/csb360/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index d36190c005..a7eccda78c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.in b/c/src/lib/libbsp/m68k/gen68302/Makefile.in index 80e3440df1..35bba8103b 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -182,10 +183,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -340,6 +342,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/coverhd.h include/m302_int.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -373,9 +376,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/m302_int.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/m302_int.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -816,6 +820,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1095,7 +1120,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1155,7 +1180,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1204,7 +1229,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1219,15 +1244,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1259,6 +1285,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 6b3b397c29..0b6dc6f73a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -63,12 +64,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/gen68302/preinstall.am b/c/src/lib/libbsp/m68k/gen68302/preinstall.am index 540e452166..58185ccbcd 100644 --- a/c/src/lib/libbsp/m68k/gen68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68302/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index a7f3150fce..2f91d82227 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.in b/c/src/lib/libbsp/m68k/gen68340/Makefile.in index 6c93a590b8..a0861c160a 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -169,10 +170,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -326,6 +328,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/coverhd.h include/m340uart.h include/m340timer.h \ include/m68340.h include/m68340.inc include/m68349.inc +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -356,11 +359,12 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/m340uart.h $(PROJECT_INCLUDE)/m340timer.h \ - $(PROJECT_INCLUDE)/m68340.h $(PROJECT_INCLUDE)/m68340.inc \ - $(PROJECT_INCLUDE)/m68349.inc $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/m340uart.h \ + $(PROJECT_INCLUDE)/m340timer.h $(PROJECT_INCLUDE)/m68340.h \ + $(PROJECT_INCLUDE)/m68340.inc $(PROJECT_INCLUDE)/m68349.inc \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -813,6 +817,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1092,7 +1117,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1152,7 +1177,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1201,7 +1226,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1216,15 +1241,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1256,6 +1282,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index e8b2c98f8c..ae18d5972c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -51,14 +52,6 @@ extern "C" { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am index 0c891ea32e..de312ec2e8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68340/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 710c16308f..d8889e571b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.in b/c/src/lib/libbsp/m68k/gen68360/Makefile.in index 07415bcb4b..a65d5e021b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.in +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -184,10 +185,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -342,6 +344,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmds.prom startup/linkcmds.bootp include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -376,10 +379,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.prom \ - $(PROJECT_LIB)/linkcmds.bootp + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/linkcmds.prom $(PROJECT_LIB)/linkcmds.bootp PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -835,6 +838,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1114,7 +1138,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1174,7 +1198,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1223,7 +1247,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1238,15 +1262,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1278,6 +1303,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 4de5a4f362..7fc8659a4a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -34,6 +34,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Network driver configuration @@ -70,12 +71,6 @@ extern char M360DefaultWatchdogFeeder; extern int m360_clock_rate; /* BRG clock rate, defined in console.c */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Definitions for Atlas Computer Equipment Inc. High Speed Bridge (HSB) */ diff --git a/c/src/lib/libbsp/m68k/gen68360/preinstall.am b/c/src/lib/libbsp/m68k/gen68360/preinstall.am index 24d5ce9420..f59c3f677d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68360/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index 0cd50c21d4..565f721a4f 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.in b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.in index 676a6ed411..2bd15042de 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.in +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -184,10 +185,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -342,6 +344,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -379,8 +382,9 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) \ $(PROJECT_LIB)/linkcmds CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -821,6 +825,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1100,7 +1125,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1160,7 +1185,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1209,7 +1234,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1224,15 +1249,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1264,6 +1290,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h index dba6f5ae4c..8b18f96c80 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h +++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h @@ -55,6 +55,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -81,12 +82,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am index d6a779e080..548222b391 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index f13f028768..1845c379ec 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.in b/c/src/lib/libbsp/m68k/idp/Makefile.in index f8533350c1..207c8bce9d 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.in +++ b/c/src/lib/libbsp/m68k/idp/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -167,10 +168,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -323,6 +325,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/leds.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h \ ../../shared/include/coverhd.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h @@ -355,9 +358,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/leds.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/leds.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -822,6 +826,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1101,7 +1126,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1160,7 +1185,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1209,7 +1234,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1224,15 +1249,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1264,6 +1290,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index 72795f99e2..21c0293a1a 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -11,6 +11,7 @@ #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/motorola/mc68230.h> #include <rtems/motorola/mc68681.h> @@ -24,13 +25,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - void init_pit( void ); void transmit_char( char ch ); diff --git a/c/src/lib/libbsp/m68k/idp/preinstall.am b/c/src/lib/libbsp/m68k/idp/preinstall.am index 1bcb5b692a..f8852a8073 100644 --- a/c/src/lib/libbsp/m68k/idp/preinstall.am +++ b/c/src/lib/libbsp/m68k/idp/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 56876c6f30..716bcc487c 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.in b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.in index 55f7b1abde..8e5fe2696b 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.in +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -179,10 +180,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -370,6 +372,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds startup/gdbinit \ include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h \ include/i2c.h include/i2cdrv.h include/ds1307.h \ include/nvram.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -407,12 +410,13 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/i2c.h $(PROJECT_INCLUDE)/i2cdrv.h \ - $(PROJECT_INCLUDE)/ds1307.h $(PROJECT_INCLUDE)/nvram.h \ - $(PROJECT_INCLUDE)/tod.h $(PROJECT_LIB)/linkcmds \ - $(PROJECT_LIB)/gdbinit $(PROJECT_LIB)/linkcmds.flash + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/i2c.h \ + $(PROJECT_INCLUDE)/i2cdrv.h $(PROJECT_INCLUDE)/ds1307.h \ + $(PROJECT_INCLUDE)/nvram.h $(PROJECT_INCLUDE)/tod.h \ + $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/gdbinit \ + $(PROJECT_LIB)/linkcmds.flash PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-recursive @@ -892,6 +896,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1257,7 +1282,7 @@ check: check-recursive all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1316,7 +1341,7 @@ info: info-recursive info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-recursive @@ -1365,7 +1390,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ @@ -1383,8 +1408,8 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ @@ -1392,7 +1417,7 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1424,6 +1449,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index 074e05c589..c49bbb2da1 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -126,6 +126,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/rtc.h> #include "i2c.h" @@ -164,14 +165,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am index 5454d9d0b0..42dbffda25 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index 7ef44e6ccb..310833b3af 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.in b/c/src/lib/libbsp/m68k/mcf52235/Makefile.in index 05c133ab1c..bf7df180e2 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.in +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -170,10 +171,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -326,6 +328,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -359,9 +362,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -829,6 +832,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1108,7 +1132,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1168,7 +1192,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1217,7 +1241,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1232,15 +1256,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1272,6 +1297,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h index 701e604327..9bc7891141 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern "C" { uint32_t bsp_get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am index 1758c1a3f6..1a9ddc278a 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.in b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.in index 7e2186cf22..65171619a7 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.in +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -170,10 +171,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -328,6 +330,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -352,9 +355,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -792,6 +795,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1071,7 +1095,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1131,7 +1155,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1180,7 +1204,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1195,15 +1219,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1235,6 +1260,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h index 13a189f5d2..d68ccfcea1 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h @@ -16,6 +16,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -62,12 +63,6 @@ extern "C" { uint32_t bsp_get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 403b47f6b0..986e88d9ea 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.in b/c/src/lib/libbsp/m68k/mcf5235/Makefile.in index 6551bcf6da..d8cc710b89 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.in +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -183,10 +184,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -342,6 +344,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmdsflash startup/linkcmdsram include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -378,10 +381,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmdsflash \ - $(PROJECT_LIB)/linkcmdsram + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/linkcmdsflash $(PROJECT_LIB)/linkcmdsram PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -852,6 +855,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1131,7 +1155,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1191,7 +1215,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1240,7 +1264,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1255,15 +1279,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1295,6 +1320,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h index b822b8d59a..fffb53e816 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -37,11 +38,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at /* functions */ uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); /* * Interrupt assignments diff --git a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am index 916e8d1f3c..26aaf1fc60 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index cb23cb99aa..39bc949f67 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.in b/c/src/lib/libbsp/m68k/mcf5329/Makefile.in index b4a90875a2..eb80bf45f3 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.in +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -184,10 +185,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -343,6 +345,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmdsflash include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -379,9 +382,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmdsflash + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/linkcmdsflash PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -837,6 +841,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1116,7 +1141,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1176,7 +1201,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1225,7 +1250,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1240,15 +1265,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1280,6 +1306,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h index 7a7db3b575..205c516005 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t bsp_get_CPU_clock_speed(void); uint32_t bsp_get_BUS_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am index aaadcccd1e..845327fdff 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 6b36feb8d9..57f13b6d64 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.in b/c/src/lib/libbsp/m68k/mrm332/Makefile.in index 2f234f3539..b3db766229 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.in +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -166,10 +167,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -323,6 +325,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmds_ROM include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/mrm332.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h \ ../../shared/include/coverhd.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h @@ -356,10 +359,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/mrm332.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ - $(PROJECT_LIB)/linkcmds_ROM + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/mrm332.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds_ROM PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -809,6 +812,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1088,7 +1112,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1147,7 +1171,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1196,7 +1220,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1211,15 +1235,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1251,6 +1276,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index c792c3695e..8df4373d60 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #include <rtems.h> #include <rtems/bspIo.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> #include <mrm332.h> @@ -91,12 +92,6 @@ extern int stack_start; /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - void Spurious_Initialize(void); void _UART_flush(void); diff --git a/c/src/lib/libbsp/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am index 4a71e7df99..cd1c5e178c 100644 --- a/c/src/lib/libbsp/m68k/mrm332/preinstall.am +++ b/c/src/lib/libbsp/m68k/mrm332/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index a887fcccfe..6422697940 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/Makefile.in index dba5f6bec1..79f7d2db72 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -185,10 +186,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -340,6 +342,7 @@ AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -372,9 +375,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -857,6 +860,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1136,7 +1160,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1196,7 +1220,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1245,7 +1269,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1260,15 +1284,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1300,6 +1325,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index 4b10ecefd7..7d56b339e1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -21,6 +21,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -80,14 +81,6 @@ struct w_m681_info { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme136/preinstall.am b/c/src/lib/libbsp/m68k/mvme136/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme136/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme136/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index a9464f0f3c..23e45b6862 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/Makefile.in index d546782316..d4451a7d85 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -168,10 +169,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -323,6 +325,7 @@ AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -353,9 +356,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -778,6 +781,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1057,7 +1081,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1117,7 +1141,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1166,7 +1190,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1181,15 +1205,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1221,6 +1246,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 51c8d5907f..6392cf033f 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -106,12 +107,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme147/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 8ca16d547c..2a9aa1d591 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in index 565c01ec29..8ee7457711 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -186,10 +187,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -341,6 +343,7 @@ AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -372,9 +375,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -857,6 +860,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1136,7 +1160,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1196,7 +1220,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1245,7 +1269,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1260,15 +1284,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1300,6 +1325,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 1627457ddc..9b258828a1 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -181,12 +182,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 5272bd4fc2..cf8dad7180 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.in b/c/src/lib/libbsp/m68k/mvme162/Makefile.in index 7ddf5fc381..72c88ec1bd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -185,10 +186,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -343,6 +345,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h ../../shared/tod.h \ include/coverhd.h include/page_table.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h \ $(top_srcdir)/../shared/mvme/mvme16x_hw.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h @@ -379,9 +382,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/tod.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/page_table.h \ + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/tod.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_INCLUDE)/page_table.h \ $(PROJECT_INCLUDE)/mvme16x_hw.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -853,6 +857,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1132,7 +1157,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1192,7 +1217,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1241,7 +1266,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1256,15 +1281,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1296,6 +1322,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index ccbac9ecae..1e269c632d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -187,12 +188,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am index 528c115219..f7242272d3 100644 --- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme162/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 0ba3aa269f..f21976cbb9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.in b/c/src/lib/libbsp/m68k/mvme167/Makefile.in index adc321772c..b125a6e331 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -184,10 +185,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -342,6 +344,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h include/coverhd.h \ include/page_table.h include/fatal.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h \ $(top_srcdir)/../shared/mvme/mvme16x_hw.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h @@ -378,10 +381,11 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/page_table.h $(PROJECT_INCLUDE)/fatal.h \ - $(PROJECT_INCLUDE)/mvme16x_hw.h $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/page_table.h \ + $(PROJECT_INCLUDE)/fatal.h $(PROJECT_INCLUDE)/mvme16x_hw.h \ + $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -837,6 +841,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1116,7 +1141,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1176,7 +1201,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1225,7 +1250,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1240,15 +1265,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1280,6 +1306,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index 9a3324a682..ad4da09f47 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -27,6 +27,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -294,12 +295,6 @@ typedef volatile struct cd2401_regs_ { /* BSP-wide functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef M167_INIT #undef EXTERN #define EXTERN diff --git a/c/src/lib/libbsp/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am index 332fc9c9a2..8cf68cf235 100644 --- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme167/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 7c773205a1..2180f1d191 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -9,6 +9,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.in b/c/src/lib/libbsp/m68k/ods68302/Makefile.in index afcabc2abd..98bd62cbee 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.in +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -170,10 +171,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -333,6 +335,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds startup/rom \ include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/bare.h include/crc.h include/debugport.h \ include/m68302scc.h include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -366,12 +369,12 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/bare.h \ - $(PROJECT_INCLUDE)/crc.h $(PROJECT_INCLUDE)/debugport.h \ - $(PROJECT_INCLUDE)/m68302scc.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/rom \ - $(PROJECT_LIB)/debugger + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/bare.h $(PROJECT_INCLUDE)/crc.h \ + $(PROJECT_INCLUDE)/debugport.h $(PROJECT_INCLUDE)/m68302scc.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/rom $(PROJECT_LIB)/debugger PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -895,6 +898,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1174,7 +1198,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1234,7 +1258,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1283,7 +1307,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1298,15 +1322,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @ODS68302_DEBUG_TRUE@start.$(OBJEXT): start/debugreset.S @@ -1342,6 +1367,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 394c166d1c..560ede392a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/m68k/m68302.h> #ifndef VARIANT @@ -68,14 +69,6 @@ extern "C" { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/ods68302/preinstall.am b/c/src/lib/libbsp/m68k/ods68302/preinstall.am index f95a8437f0..2f98702783 100644 --- a/c/src/lib/libbsp/m68k/ods68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/ods68302/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index ba7d98df1b..f2ecdce77a 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.in b/c/src/lib/libbsp/m68k/sim68000/Makefile.in index f48504712f..8ac2457805 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.in +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -171,10 +172,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -326,6 +328,7 @@ AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h \ ../../shared/include/coverhd.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h @@ -363,9 +366,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -893,6 +896,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1172,7 +1196,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1232,7 +1256,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1281,7 +1305,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1296,15 +1320,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1336,6 +1361,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h index aedbd4d52e..17f4b2c9d4 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h +++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Define some hardware constants here @@ -46,10 +47,6 @@ extern "C" { : "0" (_tmp), "1" (_delay) ); \ } -/* functions */ - -rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/sim68000/preinstall.am b/c/src/lib/libbsp/m68k/sim68000/preinstall.am index bdd3a3e368..d8f202c1f2 100644 --- a/c/src/lib/libbsp/m68k/sim68000/preinstall.am +++ b/c/src/lib/libbsp/m68k/sim68000/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 6fe5787297..6ad14e9afa 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.in b/c/src/lib/libbsp/m68k/uC5282/Makefile.in index f364e77855..69aefc47ef 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.in +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -182,10 +183,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -340,6 +342,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -371,9 +374,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -814,6 +817,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1093,7 +1117,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1153,7 +1177,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1202,7 +1226,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1217,15 +1241,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1257,6 +1282,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index 4365cf33d4..478319c2df 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -71,12 +72,6 @@ const char *bsp_getbenv(const char *a); int bsp_flash_erase_range(volatile unsigned short *flashptr, int start, int end); int bsp_flash_write_range(volatile unsigned short *flashptr, bsp_mnode_t *chain, int offset); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/uC5282/preinstall.am b/c/src/lib/libbsp/m68k/uC5282/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/uC5282/preinstall.am +++ b/c/src/lib/libbsp/m68k/uC5282/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 1094826b55..0ce004aa2f 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -9,6 +9,8 @@ include_bspdir = $(includedir)/bsp include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.in b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.in index 8a0cccbebe..4c92a0e6f2 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.in +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -165,10 +166,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -321,6 +323,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds include_bspdir = $(includedir)/bsp include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -349,9 +352,9 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) \ $(PROJECT_LIB)/crtnn.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -783,6 +786,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1062,7 +1086,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1121,7 +1145,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1170,7 +1194,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1185,15 +1209,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1225,6 +1250,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 3efd580928..8f19ddd0d1 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -25,7 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> - +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -127,12 +127,6 @@ altera_avalon_jtag_uart_regs; /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am index 5e40708306..25ffbef541 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index 4a29945724..fe07392794 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -10,6 +10,8 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in index cc92c77f3e..ed1c21fe6c 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.in @@ -53,7 +53,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -161,11 +162,11 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -323,6 +324,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -347,9 +349,9 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ $(PROJECT_INCLUDE)/$(dirstamp) \ $(PROJECT_INCLUDE)/bsp/$(dirstamp) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds CLEANFILES = $(PREINSTALL_FILES) PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -764,6 +766,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1043,7 +1066,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1103,7 +1126,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-dvi: install-dvi-am @@ -1152,7 +1175,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS .MAKE: install-am install-strip @@ -1167,15 +1190,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ info-am install install-am install-data install-data-am \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-nodist_includeHEADERS \ + install-includeHEADERS install-include_bspHEADERS install-info \ + install-info-am install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS @@ -1205,6 +1229,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 96e248d615..20c8428171 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -36,12 +37,6 @@ extern "C" { /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am index 72d079ac3f..d753521be9 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am @@ -40,6 +40,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 264a30c7bf..54b4136e44 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -9,6 +9,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.in b/c/src/lib/libbsp/powerpc/score603e/Makefile.in index b4b92c1a09..a2af510fba 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.in +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.in @@ -344,6 +344,11 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h ../../shared/tod.h \ ../../shared/include/coverhd.h include/gen2.h +include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h PCI_bus/PCI.h \ + ../../powerpc/shared/residual/residual.h \ + ../../powerpc/shared/residual/pnp.h \ + ../../powerpc/shared/console/consoleIo.h irq/irq.h \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -359,11 +364,6 @@ pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c console_SOURCES = console/85c30.c console/85c30.h console/console.c \ console/tbl85c30.c console/consolebsp.h -include_bsp_HEADERS = ../../powerpc/shared/pci/pci.h PCI_bus/PCI.h \ - ../../powerpc/shared/residual/residual.h \ - ../../powerpc/shared/residual/pnp.h \ - ../../powerpc/shared/console/consoleIo.h irq/irq.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h pci_SOURCES = PCI_bus/flash.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c PCI_bus/PCI.c PCI_bus/universe.c @@ -395,12 +395,12 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) \ $(PROJECT_LIB)/rtems_crti.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/tod.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/gen2.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_INCLUDE)/bsp/pci.h \ - $(PROJECT_INCLUDE)/bsp/PCI.h $(PROJECT_INCLUDE)/bsp/residual.h \ - $(PROJECT_INCLUDE)/bsp/pnp.h \ + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/tod.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_INCLUDE)/gen2.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_INCLUDE)/bsp/pci.h $(PROJECT_INCLUDE)/bsp/PCI.h \ + $(PROJECT_INCLUDE)/bsp/residual.h $(PROJECT_INCLUDE)/bsp/pnp.h \ $(PROJECT_INCLUDE)/bsp/consoleIo.h \ $(PROJECT_INCLUDE)/bsp/irq.h $(PROJECT_INCLUDE)/bsp/irq_supp.h PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools @@ -1362,6 +1362,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am b/c/src/lib/libbsp/powerpc/score603e/preinstall.am index 4d2f767519..ba6fc3f0fc 100644 --- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am +++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 6339206624..b84cf5d468 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.in b/c/src/lib/libbsp/sh/gensh2/Makefile.in index 535fe8aba4..d0de1bd096 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -168,10 +169,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -326,6 +328,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmds.ram startup/linkcmds.rom include_HEADERS = include/bsp.h ../../shared/include/tm27.h \ include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -360,10 +363,10 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ $(PROJECT_INCLUDE)/bsp/$(dirstamp) TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.ram \ - $(PROJECT_LIB)/linkcmds.rom + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/linkcmds.ram $(PROJECT_LIB)/linkcmds.rom PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -770,6 +773,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1050,7 +1074,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1111,7 +1135,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1160,7 +1184,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: all check install install-am install-strip @@ -1175,15 +1199,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1218,6 +1243,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am index 7d4c5ecb59..4f43efb8e3 100644 --- a/c/src/lib/libbsp/sh/gensh2/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh2/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 70b667b2c7..13d88db98a 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.in b/c/src/lib/libbsp/sh/gensh4/Makefile.in index 93bcc4eb2b..d83b5d00b4 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.in @@ -52,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ - $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(include_HEADERS) $(include_bsp_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ @@ -168,10 +169,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) -HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(nodist_include_bsp_HEADERS) +HEADERS = $(include_HEADERS) $(include_bsp_HEADERS) \ + $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -325,6 +327,7 @@ dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmds.rom startup/linkcmds.rom2ram include_HEADERS = include/bsp.h include/tm27.h include/sdram.h \ ../../shared/include/coverhd.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h $(PREINSTALL_DIRS) @@ -355,10 +358,11 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/sdram.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ - $(PROJECT_LIB)/linkcmds.rom $(PROJECT_LIB)/linkcmds.rom2ram + $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/sdram.h $(PROJECT_INCLUDE)/coverhd.h \ + $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.rom \ + $(PROJECT_LIB)/linkcmds.rom2ram PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -748,6 +752,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1027,7 +1052,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1086,7 +1111,7 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1135,7 +1160,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1150,15 +1175,16 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-data install-data-am install-dist_project_libDATA \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ - uninstall-includeHEADERS uninstall-nodist_includeHEADERS \ + uninstall-includeHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA @@ -1190,6 +1216,9 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am index 3821249eef..f49bf44e55 100644 --- a/c/src/lib/libbsp/sh/gensh4/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh4/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index bc039bbeb5..e147d8ba61 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/../../../../automake/compile.am include_bspdir = $(includedir)/bsp include_bsp_HEADERS = include/syscall.h +include_bsp_HEADERS += ../../shared/include/setvec.h dist_project_lib_DATA = bsp_specs diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.in b/c/src/lib/libbsp/sh/shsim/Makefile.in index 31d6a11860..b917b5667b 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.in +++ b/c/src/lib/libbsp/sh/shsim/Makefile.in @@ -323,7 +323,7 @@ AM_CFLAGS = AM_CXXFLAGS = AM_CCASFLAGS = @RTEMS_CCASFLAGS@ include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = include/syscall.h +include_bsp_HEADERS = include/syscall.h ../../shared/include/setvec.h dist_project_lib_DATA = bsp_specs startup/linkcmds \ startup/linkcmds.sim include_HEADERS = include/bsp.h ../../shared/include/tm27.h @@ -359,10 +359,11 @@ PREINSTALL_DIRS = $(PROJECT_LIB)/$(dirstamp) \ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp/syscall.h \ - $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/bspopts.h \ - $(PROJECT_INCLUDE)/bsp/bootcard.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_LIB)/linkcmds $(PROJECT_LIB)/linkcmds.sim + $(PROJECT_INCLUDE)/bsp/setvec.h $(PROJECT_LIB)/bsp_specs \ + $(PROJECT_INCLUDE)/bsp.h $(PROJECT_INCLUDE)/tm27.h \ + $(PROJECT_INCLUDE)/bspopts.h $(PROJECT_INCLUDE)/bsp/bootcard.h \ + $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ + $(PROJECT_LIB)/linkcmds.sim PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -1255,6 +1256,9 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): $(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs diff --git a/c/src/lib/libbsp/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am index 9e08790208..56b869c0ba 100644 --- a/c/src/lib/libbsp/sh/shsim/preinstall.am +++ b/c/src/lib/libbsp/sh/shsim/preinstall.am @@ -37,6 +37,10 @@ $(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs diff --git a/c/src/lib/libbsp/shared/include/setvec.h b/c/src/lib/libbsp/shared/include/setvec.h new file mode 100644 index 0000000000..95f7cd9056 --- /dev/null +++ b/c/src/lib/libbsp/shared/include/setvec.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2011 Gedare Bloom. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifndef LIBBSP_SHARED_SETVEC_H +#define LIBBSP_SHARED_SETVEC_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * @defgroup bsp_set_vector + * + * @ingroup bsp_kit + * + * @brief Install an interrupt handler for simple vectored architectures. + * + * @{ + */ +/** + * Raw trap handler vectors directly to isr handler. + */ +#define BSP_SET_VECTOR_RAW 0 +/** + * RTEMS trap handler vectors through rtems interrupt handler (_ISR_Handler). + */ +#define BSP_SET_VECTOR_RTEMS 1 + +/** + * @brief bsp_set_vector + * + * Installs @a handler as the interrupt handler for vector number @a vector + * with @a type specifying either BSP_SET_VECTOR_RAW or BSP_SET_VECTOR_RTEMS + * + * @return Returns the old vector handler + */ +rtems_isr_entry bsp_set_vector( + rtems_isr_entry handler, + rtems_vector_number vector, + int type +); + +/** @} */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* LIBBSP_SHARED_SETVEC_H */ diff --git a/c/src/lib/libbsp/shared/setvec.c b/c/src/lib/libbsp/shared/setvec.c index 46eba1e222..d8d228389b 100644 --- a/c/src/lib/libbsp/shared/setvec.c +++ b/c/src/lib/libbsp/shared/setvec.c @@ -25,11 +25,12 @@ */ #include <bsp.h> +#include <bsp/setvec.h> -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ +rtems_isr_entry set_vector( + rtems_isr_entry handler, + rtems_vector_number vector, + int type ) { rtems_isr_entry previous_isr; diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index ddb8d94c3b..075d531aa8 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -55,7 +55,8 @@ libbsp_a_SOURCES += timer/timer.c include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../shared/src/irq-default-handler.c \ diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.in b/c/src/lib/libbsp/sparc/erc32/Makefile.in index cdfec88b07..7ca08338fe 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.in +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.in @@ -419,7 +419,8 @@ libbsp_a_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h @HAS_NETWORKING_TRUE@erc32sonic_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @HAS_NETWORKING_TRUE@erc32sonic_rel_SOURCES = erc32sonic/erc32sonic.c @@ -441,7 +442,8 @@ PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_LIB)/linkcmds \ $(PROJECT_LIB)/linkcmds.base \ $(PROJECT_INCLUDE)/bsp/irq-generic.h \ - $(PROJECT_INCLUDE)/bsp/irq-info.h $(PROJECT_INCLUDE)/bsp/irq.h + $(PROJECT_INCLUDE)/bsp/irq-info.h $(PROJECT_INCLUDE)/bsp/irq.h \ + $(PROJECT_INCLUDE)/bsp/setvec.h PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools all: all-am @@ -1721,6 +1723,9 @@ $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INC $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h + +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h preinstall-am: $(PREINSTALL_FILES) preinstall: preinstall-am .PHONY: preinstall preinstall-am diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h index 879e7144e0..0e03478a08 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h @@ -32,6 +32,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* * BSP provides its own Idle thread body @@ -69,12 +70,6 @@ extern int end; /* last address in the program */ /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am index a235296e1f..fe55a593dc 100644 --- a/c/src/lib/libbsp/sparc/erc32/preinstall.am +++ b/c/src/lib/libbsp/sparc/erc32/preinstall.am @@ -85,3 +85,7 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 9699bf1a32..62aee9f1c2 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -65,7 +65,8 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../shared/src/irq-default-handler.c \ diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.in b/c/src/lib/libbsp/sparc/leon2/Makefile.in index a9b2fe1e4e..b27575bf18 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.in +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.in @@ -506,7 +506,8 @@ libbsp_a_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h @HAS_NETWORKING_TRUE@leon_smc91111_rel_SOURCES = leon_smc91111/leon_smc91111.c @HAS_NETWORKING_TRUE@leon_smc91111_rel_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h index e96a63ee90..b63b37cb06 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* SPARC CPU variant: LEON2 */ #define LEON2 1 @@ -89,12 +90,6 @@ extern int end; /* last address in the program */ /* miscellaneous stuff assumed to exist */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index 8b21893fc7..67b3fcf5a6 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -67,7 +67,8 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ startup/eirq.c \ ../../sparc/shared/irq/irq-shared.c \ diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.in b/c/src/lib/libbsp/sparc/leon3/Makefile.in index 9d7a05f238..e3f6f8c677 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.in +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.in @@ -511,7 +511,8 @@ libbsp_a_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h @HAS_NETWORKING_TRUE@leon_smc91111_rel_SOURCES = leon_smc91111/leon_smc91111.c @HAS_NETWORKING_TRUE@leon_smc91111_rel_CPPFLAGS = $(AM_CPPFLAGS) \ @@ -544,7 +545,8 @@ PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/ambapp_ids.h $(PROJECT_INCLUDE)/grlib.h \ $(PROJECT_INCLUDE)/bsp/irq-generic.h \ $(PROJECT_INCLUDE)/bsp/irq-info.h $(PROJECT_INCLUDE)/bsp/irq.h \ - $(PROJECT_INCLUDE)/pci.h $(PROJECT_INCLUDE)/b1553brm.h \ + $(PROJECT_INCLUDE)/bsp/setvec.h $(PROJECT_INCLUDE)/pci.h \ + $(PROJECT_INCLUDE)/b1553brm.h \ $(PROJECT_INCLUDE)/b1553brm_pci.h $(PROJECT_INCLUDE)/occan.h \ $(PROJECT_INCLUDE)/occan_pci.h $(PROJECT_INCLUDE)/grcan.h \ $(PROJECT_INCLUDE)/grspw.h $(PROJECT_INCLUDE)/grspw_pci.h \ @@ -2181,6 +2183,9 @@ $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INC $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h index d883064660..2d75a4216d 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* SPARC CPU variant: LEON3 */ #define LEON3 1 @@ -102,12 +103,6 @@ extern int end; /* last address in the program */ /* miscellaneous stuff assumed to exist */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am index dffbb5aba4..7646150a39 100644 --- a/c/src/lib/libbsp/sparc/leon3/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am @@ -105,6 +105,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 089649d0e6..29366fd357 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -11,6 +11,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += ../shared/include/asm.h +include_bsp_HEADERS = ../shared/include/bsp/setvec.h + include_bootdir = $(includedir)/boot include_boot_HEADERS = ../shared/helenos/boot/include/align.h \ ../shared/helenos/boot/include/balloc.h \ diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.in b/c/src/lib/libbsp/sparc64/niagara/Makefile.in index ee93b7b42e..5f97380df8 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.in +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.in @@ -54,8 +54,8 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ $(include_HEADERS) $(include_boot_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/preinstall.am \ + $(include_bsp_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ $(top_srcdir)/../../../../../../depcomp \ @@ -174,11 +174,12 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(include_bspdir)" + "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(include_bspdir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)" DATA = $(dist_project_lib_DATA) $(project_lib_DATA) HEADERS = $(include_HEADERS) $(include_boot_HEADERS) \ - $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) + $(include_bsp_HEADERS) $(nodist_include_HEADERS) \ + $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -335,6 +336,7 @@ CPPASCOMPILE = $(CCAS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs ../shared/startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h ../shared/include/asm.h +include_bsp_HEADERS = ../shared/include/bsp/setvec.h include_bootdir = $(includedir)/boot include_boot_HEADERS = ../shared/helenos/boot/include/align.h \ ../shared/helenos/boot/include/balloc.h \ @@ -397,6 +399,7 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/asm.h \ + $(PROJECT_INCLUDE)/bsp/setvec.h \ $(PROJECT_INCLUDE)/boot/align.h \ $(PROJECT_INCLUDE)/boot/balloc.h \ $(PROJECT_INCLUDE)/boot/gentypes.h \ @@ -1013,6 +1016,27 @@ uninstall-include_bootHEADERS: @list='$(include_boot_HEADERS)'; test -n "$(include_bootdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(include_bootdir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-nodist_includeHEADERS: $(nodist_include_HEADERS) @$(NORMAL_INSTALL) @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ @@ -1292,7 +1316,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1352,7 +1376,8 @@ info: info-am info-am: install-data-am: install-dist_project_libDATA install-includeHEADERS \ - install-include_bootHEADERS install-nodist_includeHEADERS \ + install-include_bootHEADERS install-include_bspHEADERS \ + install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA install-dvi: install-dvi-am @@ -1401,7 +1426,8 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ - uninstall-include_bootHEADERS uninstall-nodist_includeHEADERS \ + uninstall-include_bootHEADERS uninstall-include_bspHEADERS \ + uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA .MAKE: install-am install-strip @@ -1417,8 +1443,8 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-dist_project_libDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-includeHEADERS install-include_bootHEADERS \ - install-info install-info-am install-man \ - install-nodist_includeHEADERS \ + install-include_bspHEADERS install-info install-info-am \ + install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ install-project_libDATA install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ @@ -1426,7 +1452,7 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-dist_project_libDATA \ uninstall-includeHEADERS uninstall-include_bootHEADERS \ - uninstall-nodist_includeHEADERS \ + uninstall-include_bspHEADERS uninstall-nodist_includeHEADERS \ uninstall-nodist_include_bspHEADERS uninstall-project_libDATA start.$(OBJEXT): ../shared/start/start.S @@ -1463,6 +1489,9 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../shared/include/bsp/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h index 6a2c83e6e2..5f398b4d9e 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h @@ -29,6 +29,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* support for simulated clock tick */ /* @@ -36,13 +37,6 @@ Thread clock_driver_sim_idle_body(uintptr_t); #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body */ -/* this should be defined somewhere */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am index 722ccdd849..c8ecc0f1ec 100644 --- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am +++ b/c/src/lib/libbsp/sparc64/niagara/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../shared/include/bsp/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 6c169e0e64..d03e7706a3 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -12,6 +12,8 @@ include_HEADERS += include/tm27.h include_HEADERS += ../shared/include/asm.h include_HEADERS += ../shared/include/traptable.h +include_bsp_HEADERS = ../../shared/include/setvec.h + ## these are the include files used by the boot process from HelenOS Sparc64 include_bootdir = $(includedir)/boot include_boot_HEADERS = \ diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.in b/c/src/lib/libbsp/sparc64/usiii/Makefile.in index 8a8b53737d..a64d3c7b59 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.in +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.in @@ -56,9 +56,9 @@ DIST_COMMON = README $(am__configure_deps) $(dist_project_lib_DATA) \ $(include_HEADERS) $(include_arch_HEADERS) \ $(include_arch_mm_HEADERS) $(include_arch_mm_sun4u_HEADERS) \ $(include_arch_sun4u_HEADERS) $(include_boot_HEADERS) \ - $(include_genarch_ofw_HEADERS) $(include_kernel_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/preinstall.am \ + $(include_bsp_HEADERS) $(include_genarch_ofw_HEADERS) \ + $(include_kernel_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/preinstall.am \ $(top_srcdir)/../../../../../../config.guess \ $(top_srcdir)/../../../../../../config.sub \ $(top_srcdir)/../../../../../../depcomp \ @@ -182,7 +182,7 @@ am__installdirs = "$(DESTDIR)$(project_libdir)" \ "$(DESTDIR)$(include_arch_mmdir)" \ "$(DESTDIR)$(include_arch_mm_sun4udir)" \ "$(DESTDIR)$(include_arch_sun4udir)" \ - "$(DESTDIR)$(include_bootdir)" \ + "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(include_bspdir)" \ "$(DESTDIR)$(include_genarch_ofwdir)" \ "$(DESTDIR)$(include_kerneldir)" "$(DESTDIR)$(includedir)" \ "$(DESTDIR)$(include_bspdir)" @@ -190,8 +190,9 @@ DATA = $(dist_project_lib_DATA) $(project_lib_DATA) HEADERS = $(include_HEADERS) $(include_arch_HEADERS) \ $(include_arch_mm_HEADERS) $(include_arch_mm_sun4u_HEADERS) \ $(include_arch_sun4u_HEADERS) $(include_boot_HEADERS) \ - $(include_genarch_ofw_HEADERS) $(include_kernel_HEADERS) \ - $(nodist_include_HEADERS) $(nodist_include_bsp_HEADERS) + $(include_bsp_HEADERS) $(include_genarch_ofw_HEADERS) \ + $(include_kernel_HEADERS) $(nodist_include_HEADERS) \ + $(nodist_include_bsp_HEADERS) ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -349,6 +350,7 @@ include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs ../shared/startup/linkcmds include_HEADERS = include/bsp.h include/tm27.h ../shared/include/asm.h \ ../shared/include/traptable.h +include_bsp_HEADERS = ../../shared/include/setvec.h include_bootdir = $(includedir)/boot include_boot_HEADERS = \ ../shared/helenos/boot/include/align.h \ @@ -462,7 +464,8 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/start.$(OBJEXT) CLEANFILES = $(TMPINSTALL_FILES) $(PREINSTALL_FILES) PREINSTALL_FILES = $(PROJECT_LIB)/bsp_specs $(PROJECT_INCLUDE)/bsp.h \ $(PROJECT_INCLUDE)/tm27.h $(PROJECT_INCLUDE)/asm.h \ - $(PROJECT_INCLUDE)/traptable.h $(PROJECT_INCLUDE)/boot/align.h \ + $(PROJECT_INCLUDE)/traptable.h $(PROJECT_INCLUDE)/bsp/setvec.h \ + $(PROJECT_INCLUDE)/boot/align.h \ $(PROJECT_INCLUDE)/boot/balloc.h \ $(PROJECT_INCLUDE)/boot/gentypes.h \ $(PROJECT_INCLUDE)/boot/main.h \ @@ -1224,6 +1227,27 @@ uninstall-include_bootHEADERS: @list='$(include_boot_HEADERS)'; test -n "$(include_bootdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(include_bootdir)'; $(am__uninstall_files_from_dir) +install-include_bspHEADERS: $(include_bsp_HEADERS) + @$(NORMAL_INSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(include_bspdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(include_bspdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(include_bspdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(include_bspdir)" || exit $$?; \ + done + +uninstall-include_bspHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_bsp_HEADERS)'; test -n "$(include_bspdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(include_bspdir)'; $(am__uninstall_files_from_dir) install-include_genarch_ofwHEADERS: $(include_genarch_ofw_HEADERS) @$(NORMAL_INSTALL) @list='$(include_genarch_ofw_HEADERS)'; test -n "$(include_genarch_ofwdir)" || list=; \ @@ -1545,7 +1569,7 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local installdirs: - for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_archdir)" "$(DESTDIR)$(include_arch_mmdir)" "$(DESTDIR)$(include_arch_mm_sun4udir)" "$(DESTDIR)$(include_arch_sun4udir)" "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(include_genarch_ofwdir)" "$(DESTDIR)$(include_kerneldir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ + for dir in "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(project_libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_archdir)" "$(DESTDIR)$(include_arch_mmdir)" "$(DESTDIR)$(include_arch_mm_sun4udir)" "$(DESTDIR)$(include_arch_sun4udir)" "$(DESTDIR)$(include_bootdir)" "$(DESTDIR)$(include_bspdir)" "$(DESTDIR)$(include_genarch_ofwdir)" "$(DESTDIR)$(include_kerneldir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(include_bspdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1608,7 +1632,7 @@ install-data-am: install-dist_project_libDATA install-includeHEADERS \ install-include_archHEADERS install-include_arch_mmHEADERS \ install-include_arch_mm_sun4uHEADERS \ install-include_arch_sun4uHEADERS install-include_bootHEADERS \ - install-include_genarch_ofwHEADERS \ + install-include_bspHEADERS install-include_genarch_ofwHEADERS \ install-include_kernelHEADERS install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-project_libDATA @@ -1661,7 +1685,7 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ uninstall-include_archHEADERS uninstall-include_arch_mmHEADERS \ uninstall-include_arch_mm_sun4uHEADERS \ uninstall-include_arch_sun4uHEADERS \ - uninstall-include_bootHEADERS \ + uninstall-include_bootHEADERS uninstall-include_bspHEADERS \ uninstall-include_genarch_ofwHEADERS \ uninstall-include_kernelHEADERS \ uninstall-nodist_includeHEADERS \ @@ -1683,7 +1707,7 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ install-include_arch_mmHEADERS \ install-include_arch_mm_sun4uHEADERS \ install-include_arch_sun4uHEADERS install-include_bootHEADERS \ - install-include_genarch_ofwHEADERS \ + install-include_bspHEADERS install-include_genarch_ofwHEADERS \ install-include_kernelHEADERS install-info install-info-am \ install-man install-nodist_includeHEADERS \ install-nodist_include_bspHEADERS install-pdf install-pdf-am \ @@ -1696,7 +1720,7 @@ uninstall-am: uninstall-dist_project_libDATA uninstall-includeHEADERS \ uninstall-include_arch_mmHEADERS \ uninstall-include_arch_mm_sun4uHEADERS \ uninstall-include_arch_sun4uHEADERS \ - uninstall-include_bootHEADERS \ + uninstall-include_bootHEADERS uninstall-include_bspHEADERS \ uninstall-include_genarch_ofwHEADERS \ uninstall-include_kernelHEADERS \ uninstall-nodist_includeHEADERS \ @@ -1739,6 +1763,9 @@ $(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) $(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h index 31768df339..fe308436f1 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* support for simulated clock tick */ /* @@ -38,13 +39,6 @@ Thread clock_driver_sim_idle_body(uintptr_t); #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body */ -/* this should be defined somewhere */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am index 73f10f9f2b..7f78895353 100644 --- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am +++ b/c/src/lib/libbsp/sparc64/usiii/preinstall.am @@ -53,6 +53,10 @@ $(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index dc8b22b204..739cd0dff4 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -26,8 +26,7 @@ #if !defined(OPENETH_NOT_SUPPORTED) #include <bsp.h> #include <rtems.h> - -#include <bsp.h> +#include <bsp/setvec.h> #include <inttypes.h> #include <stdlib.h> @@ -55,8 +54,6 @@ #undef free #endif -extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - /* #define OPEN_ETH_DEBUG */ @@ -322,7 +319,11 @@ open_eth_initialize_hardware (struct open_eth_softc *sc) regs->mac_addr0 = mac_addr0; /* install interrupt vector */ - set_vector (open_eth_interrupt_handler, sc->vector, 1); + set_vector( + open_eth_interrupt_handler, + sc->vector, + 1 + ); /* clear all pending interrupts */ diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c index 183dfb405d..edc8de5aba 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -34,6 +34,7 @@ #include <rtems.h> #include <rtems/rtems_bsdnet.h> #include <libchip/sonic.h> +#include <bsp/setvec.h> #include <stdio.h> #include <string.h> @@ -52,8 +53,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - #if (SONIC_DEBUG & SONIC_DEBUG_DUMP_MBUFS) #include <rtems/dumpbuf.h> #endif @@ -1400,7 +1399,11 @@ SONIC_STATIC void sonic_initialize_hardware(struct sonic_softc *sc) */ /* Ignore returned old handler */ - (void) set_vector(sonic_interrupt_handler, sc->vector, 1); + (void) set_vector( + sonic_interrupt_handler, + sc->vector, + 1 + ); /* * Remainder of hardware initialization is diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 58dfa0d413..b697aad5f2 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -23,6 +23,10 @@ #include <libchip/sersupp.h> #include "mc68681_p.h" +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) +#include <bsp/setvec.h> +#endif + /* * Flow control is only supported when using interrupts */ @@ -53,11 +57,6 @@ console_fns mc68681_fns_polled = false, /* deviceOutputUsesInterrupts */ }; - -#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -#endif - /* * Console Device Driver Entry Points */ @@ -434,7 +433,11 @@ MC68681_STATIC void mc68681_initialize_interrupts(int minor) Console_Port_Data[minor].bActive = FALSE; #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - set_vector(mc68681_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + mc68681_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); #endif mc68681_enable_interrupts(minor,MC68681_IMR_ENABLE_ALL_EXCEPT_TX); diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index 59aa45b224..1d18f4764e 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -36,6 +36,10 @@ #include <libchip/sersupp.h> #include "z85c30_p.h" +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) +#include <bsp/setvec.h> +#endif + /* * Flow control is only supported when using interrupts */ @@ -78,10 +82,6 @@ console_fns z85c30_fns_polled = { false /* deviceOutputUsesInterrupts */ }; -#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -#endif - /* * z85c30_initialize_port * @@ -723,7 +723,11 @@ Z85C30_STATIC void z85c30_initialize_interrupts( } #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - set_vector(z85c30_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + z85c30_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); #endif z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX); |