diff options
author | Gedare Bloom <gedare@rtems.org> | 2012-04-15 22:48:31 -0400 |
---|---|---|
committer | Gedare Bloom <gedare@rtems.org> | 2012-04-15 22:48:31 -0400 |
commit | 146a37f68c4a68384f3dcbbd7341a2f1a4fa121d (patch) | |
tree | ce00171e95a991b6cf6fef7bb3648dadd743f18b | |
parent | e40b82cd7bfc5cc812c6c0ec942af1a74aec7980 (diff) |
bsps: create shared setvec.h for set_vector prototypes
136 files changed, 359 insertions, 285 deletions
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am index 6b15ad1077..1c03431285 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am @@ -14,6 +14,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/include/bsp.h b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h index 9e25a272cd..1faed48a56 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h +++ b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h @@ -29,7 +29,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: @@ -66,12 +66,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 6fb0ebfc4d..ff4eb76c97 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -13,6 +13,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/include/bsp.h b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h index 2fe7c6f96f..e95289b314 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h +++ b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h @@ -30,6 +30,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) @@ -92,12 +94,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 901966c7dc..a943229e14 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -14,6 +14,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/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index 29427afb00..d562670988 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -30,6 +30,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: @@ -105,12 +106,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 6198f2d910..81d34a5614 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -12,6 +12,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 @@ -37,7 +38,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../shared/startup/bspstart.c \ ../../shared/bspreset.c ../../shared/bsppretaskinghook.c \ ../../shared/bspgetworkarea.c ../../shared/bootcard.c \ - ../../shared/sbrk.c ../../shared/startup/setvec.c \ + ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/gnatinstallhandler.c # clock libbsp_a_SOURCES += ../../lm32/shared/clock/ckinit.c 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 a7674f9866..6d311ed4f2 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h +++ b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h @@ -26,6 +26,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> @@ -68,15 +69,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 e9ef8a15da..2290678254 100644 --- a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c +++ b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c @@ -134,9 +134,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 */ @@ -536,7 +533,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 7c1d52f69e..421bffc583 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -12,6 +12,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/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 a537907878..7a3164da97 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 7b6b352dd0..48ff17b00e 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -112,6 +112,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); @@ -157,12 +158,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 fe1a77cdfd..734fd2dcaa 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 2e75297b09..e3af16f75e 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -27,6 +27,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. @@ -65,12 +66,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 689ce53d02..881ec46c95 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index e0eb9a7337..a3a8f23bfd 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -30,6 +30,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. @@ -53,14 +54,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 ae439ca6c0..05a537b24f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 4b5c8588f0..c8b1269d9f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -36,6 +36,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Network driver configuration @@ -72,12 +73,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 d020eb74c4..c74b2d8c6f 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -12,6 +12,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/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 c1979c3652..a589a59b25 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index aace39c825..05c7a68cba 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -13,6 +13,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> @@ -26,13 +27,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 54a027078b..bb7c17e241 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index a418ee3006..8af68a2218 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -128,6 +128,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" @@ -166,14 +167,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 a37ac2b88b..ddcbeddbeb 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -12,6 +12,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/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 4a7082db96..23217a8832 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h index 9f24087542..b00f525548 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h @@ -18,6 +18,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> @@ -64,12 +65,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 a1cbb4ce24..fa0ce0f9d0 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -12,6 +12,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/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 b242072731..9a69a99536 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -12,6 +12,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/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 2d9ec395ec..61aa9ec905 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index 88d2e6c94a..73edfc4e56 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -24,6 +24,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> @@ -93,12 +94,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 9390a5c571..7a024466d3 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index 15d37cb4cb..8dcc373f90 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -23,6 +23,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -82,14 +83,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 4328aaa422..4434ad2809 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 8ebbeffcfe..69f050f09a 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/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> @@ -108,12 +109,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 04d42d1a27..b542cbf446 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 246e4e0126..78f500af56 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/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> @@ -183,12 +184,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 988245a1e1..d847f4e514 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 7dfd0fe1a2..571fcc7bbd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -30,6 +30,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -189,12 +190,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 b6f76a66e3..01a2dfb09e 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index 5c0ec6a3b0..b14ad3a7b2 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -29,6 +29,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> @@ -296,12 +297,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 3cd01c37e1..04b17a6028 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -13,6 +13,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/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 1e08d4f6a6..672d8fa849 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -26,6 +26,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 @@ -70,14 +71,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 c8d5223fca..a863b3bfd3 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -12,6 +12,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/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h index 3d6b71cc84..5f9473feef 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h +++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h @@ -26,6 +26,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Define some hardware constants here @@ -48,10 +49,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 51c0c24f4f..7f183e4aea 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -12,6 +12,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/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/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index e5671bf50f..f29430a1c8 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -17,6 +17,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h index 5044f6fcaa..eaeb2e4425 100644 --- a/c/src/lib/libbsp/mips/csb350/include/bsp.h +++ b/c/src/lib/libbsp/mips/csb350/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> #include <libcpu/au1x00.h> #define BSP_FEATURE_IRQ_EXTENSION @@ -44,11 +45,6 @@ int rtems_au1x00_emac_attach(struct rtems_bsdnet_ifconfig *config, #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" #define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_au1x00_emac_attach -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/csb350/preinstall.am b/c/src/lib/libbsp/mips/csb350/preinstall.am index 244a22887f..45955ef593 100644 --- a/c/src/lib/libbsp/mips/csb350/preinstall.am +++ b/c/src/lib/libbsp/mips/csb350/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am index 1f27e45682..459699690d 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am @@ -17,6 +17,7 @@ include_bsp_HEADERS = start/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/genmongoosev/include/bsp.h b/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h index 575eb6b1e7..5d262b9988 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/include/bsp.h +++ b/c/src/lib/libbsp/mips/genmongoosev/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> #include <libcpu/mongoose-v.h> #define BSP_FEATURE_IRQ_EXTENSION @@ -58,9 +59,6 @@ extern void assertSoftwareInterrupt(uint32_t); /* functions */ -rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - - /* from start.S */ extern void promCopyIcacheFlush(void); extern void promCopyDcacheFlush(void); diff --git a/c/src/lib/libbsp/mips/genmongoosev/preinstall.am b/c/src/lib/libbsp/mips/genmongoosev/preinstall.am index b2e46152c7..a8aa9f0a1c 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/preinstall.am +++ b/c/src/lib/libbsp/mips/genmongoosev/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index 9b67d34115..27731fbd37 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -18,6 +18,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/hurricane/include/bsp.h b/c/src/lib/libbsp/mips/hurricane/include/bsp.h index 28b8be6553..1b981750b9 100644 --- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h +++ b/c/src/lib/libbsp/mips/hurricane/include/bsp.h @@ -27,6 +27,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <libcpu/rm5231.h> extern void WriteDisplay( char * string ); @@ -67,11 +68,6 @@ extern uint32_t mips_get_timer( void ); #define RAM_START 0 #define RAM_END 0x100000 -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/hurricane/preinstall.am b/c/src/lib/libbsp/mips/hurricane/preinstall.am index ae6cd49a8d..65c2108a6f 100644 --- a/c/src/lib/libbsp/mips/hurricane/preinstall.am +++ b/c/src/lib/libbsp/mips/hurricane/preinstall.am @@ -65,6 +65,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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/mips/hurricane/startup/setvec.c b/c/src/lib/libbsp/mips/hurricane/startup/setvec.c index 091617d49c..9584e0bcd5 100644 --- a/c/src/lib/libbsp/mips/hurricane/startup/setvec.c +++ b/c/src/lib/libbsp/mips/hurricane/startup/setvec.c @@ -25,6 +25,7 @@ #include <rtems.h> #include <bsp.h> +/* FIXME: use shared version */ mips_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector, /* vector number */ diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 540c123215..b6fae136af 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -17,6 +17,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 0d226a6675..f16eb87097 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h @@ -29,16 +29,12 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <libcpu/tx3904.h> #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/jmr3904/preinstall.am b/c/src/lib/libbsp/mips/jmr3904/preinstall.am index 244a22887f..45955ef593 100644 --- a/c/src/lib/libbsp/mips/jmr3904/preinstall.am +++ b/c/src/lib/libbsp/mips/jmr3904/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index 0c5da15e71..72bbed794d 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -16,6 +16,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.h +include_bsp_HEADERS = ../../shared/include/setvec.h #pci include_bsp_HEADERS += include/pci.h #irq diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/c/src/lib/libbsp/mips/malta/include/bsp.h index b05b2c4a10..f1b7549966 100644 --- a/c/src/lib/libbsp/mips/malta/include/bsp.h +++ b/c/src/lib/libbsp/mips/malta/include/bsp.h @@ -27,6 +27,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 @@ -98,9 +99,6 @@ uint32_t simple_in_32( uint32_t base, uint32_t addr ); void simple_out_le16( uint32_t base, uint32_t addr, uint16_t val ); void simple_out_16( uint32_t base, uint32_t addr, uint16_t val ); -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/malta/preinstall.am b/c/src/lib/libbsp/mips/malta/preinstall.am index 8d22a8ca44..7ed508f770 100644 --- a/c/src/lib/libbsp/mips/malta/preinstall.am +++ b/c/src/lib/libbsp/mips/malta/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/bsp/pci.h: include/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index fe53813f12..28bcfdc123 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -17,6 +17,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/rbtx4925/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h index 3c275c9fe7..6378496f0c 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4925/include/bsp.h @@ -28,16 +28,12 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <libcpu/tx4925.h> #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/mips/rbtx4925/preinstall.am b/c/src/lib/libbsp/mips/rbtx4925/preinstall.am index b2d7806975..4930fece05 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/preinstall.am +++ b/c/src/lib/libbsp/mips/rbtx4925/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index fe53813f12..28bcfdc123 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -17,6 +17,7 @@ include_bsp_HEADERS = ../shared/liblnk/regs.h include_bsp_HEADERS += ../../shared/include/irq-generic.h include_bsp_HEADERS += ../../shared/include/irq-info.h include_bsp_HEADERS += include/irq.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/mips/rbtx4938/include/bsp.h b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h index 04639114fc..32a94379fa 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h +++ b/c/src/lib/libbsp/mips/rbtx4938/include/bsp.h @@ -28,15 +28,12 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <libcpu/tx4938.h> #define BSP_FEATURE_IRQ_EXTENSION #define BSP_SHARED_HANDLER_SUPPORT 1 -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry, rtems_vector_number, int ); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/mips/rbtx4938/preinstall.am b/c/src/lib/libbsp/mips/rbtx4938/preinstall.am index b2d7806975..4930fece05 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/preinstall.am +++ b/c/src/lib/libbsp/mips/rbtx4938/preinstall.am @@ -61,6 +61,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(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)/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 8fa60851e8..06d2f2efbf 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -13,6 +13,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/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 7f1e247e17..0741a15691 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -27,7 +27,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. @@ -129,12 +129,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 2a7958b134..d8f4599bdb 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -14,6 +14,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/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 8513f7daed..56cd0a7c6a 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 @@ -26,6 +26,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. @@ -38,12 +39,6 @@ extern "C" { /* functions */ -no_cpu_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/haleakala/include/bsp.h b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h index f1a52a0490..9e67120960 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/haleakala/include/bsp.h @@ -64,6 +64,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> + #include <bsp/setvec.h> #include <libcpu/io.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -84,14 +85,6 @@ extern "C" { #define BSP_UART_BAUD_BASE (11059200 / 16) /* Kilauea ext clock, max speed */ - /* 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 */ - ); - #endif /* ASM */ #ifdef __cplusplus diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h index eb7c624b87..e57ce3b4e3 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h @@ -26,6 +26,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <mpc8260.h> #include <mpc8260/cpm.h> #include <mpc8260/mmu.h> @@ -81,12 +82,6 @@ void *M8260AllocateRiscTimers( int count ); extern char M8260DefaultWatchdogFeeder; #endif -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/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 3a6b0704df..e8896b18f1 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -13,6 +13,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/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/powerpc/virtex/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h index 52c9648101..d967d0aede 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/virtex/include/bsp.h @@ -60,6 +60,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <bsp/irq.h> +#include <bsp/setvec.h> #include <bsp/vectors.h> /* miscellaneous stuff assumed to exist */ @@ -77,13 +78,6 @@ extern xilTemac_driver_attach(struct rtems_bsdnet_ifconfig*, int ); #define BSP_PPC403_CLOCK_HOOK_EXCEPTION ASM_BOOKE_DEC_VECTOR -/* 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 */ -); #endif /* ASM */ #ifdef __cplusplus diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index bc54b0a17d..ed05d7e8c8 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -12,6 +12,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/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 b73a2da227..37605c88ad 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -12,6 +12,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/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 85c8e07401..7dde1bcf73 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -8,6 +8,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/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 dda3c91b53..4d895961cc 100644 --- a/c/src/lib/libbsp/shared/setvec.c +++ b/c/src/lib/libbsp/shared/setvec.c @@ -16,22 +16,21 @@ * RETURNS: * address of previous interrupt handler * - * COPYRIGHT (c) 1989-2009. + * COPYRIGHT (c) 1989-2012. * On-Line Applications Research Corporation (OAR). * * 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. - * - * $Id$ */ #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 615a3e098a..d1f41b026b 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -59,7 +59,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/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 2acca78685..aa5522e59a 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -70,7 +70,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/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/leon2/preinstall.am b/c/src/lib/libbsp/sparc/leon2/preinstall.am index 00ed05ea78..a5e6487602 100644 --- a/c/src/lib/libbsp/sparc/leon2/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon2/preinstall.am @@ -157,6 +157,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)/i2cmst.h: ../../sparc/shared/include/i2cmst.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/i2cmst.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/i2cmst.h diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index ebbeb46b18..8ef422bef3 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -59,7 +59,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/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h index e5ae2c1912..61028da62b 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 @@ -99,12 +100,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 8c27b81933..dad935fbda 100644 --- a/c/src/lib/libbsp/sparc/leon3/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am @@ -97,6 +97,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 099591ae7d..b2207c9596 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -15,6 +15,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/include/bsp.h b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h index 5a55a89e03..63cb0545c3 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/niagara/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/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 2a25510886..942d7e38b2 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -16,6 +16,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/include/bsp.h b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h index e622b3a62b..0019908a52 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h @@ -33,6 +33,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* support for simulated clock tick */ /* @@ -40,13 +41,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 d9007570ba..074e077895 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -36,6 +36,7 @@ #include <rtems.h> #include <rtems/rtems_bsdnet.h> #include <libchip/sonic.h> +#include <bsp/setvec.h> #include <stdio.h> #include <string.h> @@ -54,8 +55,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 @@ -1402,7 +1401,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 1a2e2f178f..a8f6df703c 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -24,6 +24,7 @@ #include <libchip/mc68681.h> #include <libchip/sersupp.h> #include "mc68681_p.h" +#include <bsp/setvec.h> /* * Flow control is only supported when using interrupts @@ -55,8 +56,6 @@ console_fns mc68681_fns_polled = false, /* deviceOutputUsesInterrupts */ }; -extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); - /* * Console Device Driver Entry Points */ @@ -432,7 +431,11 @@ MC68681_STATIC void mc68681_initialize_interrupts(int minor) Console_Port_Data[minor].bActive = FALSE; - set_vector(mc68681_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + mc68681_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); 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 e6adf337a1..d0114aa383 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -37,6 +37,7 @@ #include <libchip/serial.h> #include <libchip/sersupp.h> #include "z85c30_p.h" +#include <bsp/setvec.h> /* * Flow control is only supported when using interrupts @@ -80,8 +81,6 @@ console_fns z85c30_fns_polled = { false /* deviceOutputUsesInterrupts */ }; -extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); - /* * z85c30_initialize_port * @@ -722,7 +721,11 @@ Z85C30_STATIC void z85c30_initialize_interrupts( z85c30_negate_RTS(minor); } - set_vector(z85c30_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + z85c30_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX); |