diff options
| author | Gedare Bloom <gedare@rtems.org> | 2012-04-15 22:48:31 -0400 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2012-08-02 15:16:15 -0400 |
| commit | d97b3a2533e30aa179a4325242b2e50e57dc7b07 (patch) | |
| tree | 44728a87ac1dce0bbfcffce7d829a5356ec1260a | |
| parent | b46cca0e54123124f0fe3023e47fd6285cdd28c8 (diff) | |
bsps: create shared setvec.h for set_vector prototypes
110 files changed, 313 insertions, 235 deletions
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am index a913042d22..8b058537f3 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am @@ -10,6 +10,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += include/cplb.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h index c4a28c5e93..0605630295 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h +++ b/c/src/lib/libbsp/bfin/TLL6527M/include/bsp.h @@ -27,7 +27,7 @@ extern "C" { #include <rtems/score/bfin.h> #include <rtems/bfin/bf52x.h> #include <bf52x.h> - +#include <bsp/setvec.h> /* * PLL and clock setup values: @@ -64,12 +64,6 @@ extern "C" { #define ODD_PARITY 0x08 /* Enable ODD parity */ #define TWO_STP_BIT 0x04 /* 2 stop bits */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am index 557599a694..f67f6bb6d6 100644 --- a/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am +++ b/c/src/lib/libbsp/bfin/TLL6527M/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index d128ca43a9..631cbaa2de 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -9,6 +9,8 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h index 9d96bb8b71..ea165297c6 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h +++ b/c/src/lib/libbsp/bfin/bf537Stamp/include/bsp.h @@ -28,6 +28,8 @@ extern "C" { #include <libcpu/bf537.h> #include <libcpu/memoryRegs.h> +#include <bsp/setvec.h> + /* configure data cache to use 16K of each SRAM bank when enabled */ #define BSP_DATA_CACHE_CONFIG (3 << DMEM_CONTROL_DMC_SHIFT) @@ -90,12 +92,6 @@ void setLED(uint8_t value); */ uint8_t getLED(void); -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Network driver configuration */ diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am index bdd3a3e368..d8f202c1f2 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index 7d08f25d17..3230b4e666 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -10,6 +10,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += include/cplb.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h index e4dc27ef52..43e928dc68 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h +++ b/c/src/lib/libbsp/bfin/eZKit533/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/score/bfin.h> #include <rtems/bfin/bf533.h> +#include <bsp/setvec.h> /* * PLL and clock setup values: @@ -103,12 +104,6 @@ void setLED (uint8_t value); */ uint8_t getLED (void); -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am index 557599a694..f67f6bb6d6 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/preinstall.am +++ b/c/src/lib/libbsp/bfin/eZKit533/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/cplb.h: include/cplb.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/cplb.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/cplb.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am index d7922263ac..6484139cf4 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h index d13d42fb92..432ed3ab11 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h +++ b/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h @@ -24,6 +24,7 @@ #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #if defined(RTEMS_NETWORKING) #include <rtems/rtems_bsdnet.h> @@ -66,15 +67,6 @@ extern int rtems_tsmac_driver_attach(struct rtems_bsdnet_ifconfig *config, { \ } -/* functions */ -#if 0 -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); -#endif - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am index a95af392b2..b0b61488af 100644 --- a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am +++ b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c index b8be8be0de..09bd86c9cd 100644 --- a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c +++ b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c @@ -132,9 +132,6 @@ static inline void tsmacregwrite(unsigned int reg, uint16_t value) rtems_isr tsmac_interrupt_handler(rtems_vector_number vector); -extern rtems_isr_entry set_vector(rtems_isr_entry handler, - rtems_vector_number vector, int type); - /* * Macros to access PHY registers through the (G)MII */ @@ -534,7 +531,11 @@ void tsmac_init(void *arg) /* * Setup interrupt handler */ - set_vector( tsmac_interrupt_handler, TSMAC_VECTOR, 1 ); + set_vector( + tsmac_interrupt_handler, + TSMAC_VECTOR, + 1 + ); /* Interrupt line for TSMAC */ lm32_interrupt_unmask(TSMAC_IRQMASK); diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 3c37eda2cf..c7baa947d9 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/av5282/include/bsp.h b/c/src/lib/libbsp/m68k/av5282/include/bsp.h index 84d79b6237..8e8c8e4542 100644 --- a/c/src/lib/libbsp/m68k/av5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/av5282/include/bsp.h @@ -13,6 +13,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/av5282/preinstall.am b/c/src/lib/libbsp/m68k/av5282/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/av5282/preinstall.am +++ b/c/src/lib/libbsp/m68k/av5282/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index ca2047b524..e51eaf2e19 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h index 8f364dc4be..b7bbe3a8c0 100644 --- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h @@ -110,6 +110,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> struct rtems_bsdnet_ifconfig; extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config); @@ -155,12 +156,6 @@ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/csb360/preinstall.am b/c/src/lib/libbsp/m68k/csb360/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/csb360/preinstall.am +++ b/c/src/lib/libbsp/m68k/csb360/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index d36190c005..a7eccda78c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 6b3b397c29..0b6dc6f73a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -63,12 +64,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/gen68302/preinstall.am b/c/src/lib/libbsp/m68k/gen68302/preinstall.am index 540e452166..58185ccbcd 100644 --- a/c/src/lib/libbsp/m68k/gen68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68302/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index a7f3150fce..2f91d82227 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index e8b2c98f8c..ae18d5972c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -51,14 +52,6 @@ extern "C" { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/gen68340/preinstall.am b/c/src/lib/libbsp/m68k/gen68340/preinstall.am index 0c891ea32e..de312ec2e8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68340/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 710c16308f..d8889e571b 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h index 4de5a4f362..7fc8659a4a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h @@ -34,6 +34,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Network driver configuration @@ -70,12 +71,6 @@ extern char M360DefaultWatchdogFeeder; extern int m360_clock_rate; /* BRG clock rate, defined in console.c */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Definitions for Atlas Computer Equipment Inc. High Speed Bridge (HSB) */ diff --git a/c/src/lib/libbsp/m68k/gen68360/preinstall.am b/c/src/lib/libbsp/m68k/gen68360/preinstall.am index 24d5ce9420..f59c3f677d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/preinstall.am +++ b/c/src/lib/libbsp/m68k/gen68360/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index 0cd50c21d4..565f721a4f 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h index dba6f5ae4c..8b18f96c80 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h +++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h @@ -55,6 +55,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -81,12 +82,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am index d6a779e080..548222b391 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index f13f028768..1845c379ec 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/idp/include/bsp.h b/c/src/lib/libbsp/m68k/idp/include/bsp.h index 72795f99e2..21c0293a1a 100644 --- a/c/src/lib/libbsp/m68k/idp/include/bsp.h +++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h @@ -11,6 +11,7 @@ #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/motorola/mc68230.h> #include <rtems/motorola/mc68681.h> @@ -24,13 +25,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - void init_pit( void ); void transmit_char( char ch ); diff --git a/c/src/lib/libbsp/m68k/idp/preinstall.am b/c/src/lib/libbsp/m68k/idp/preinstall.am index 1bcb5b692a..f8852a8073 100644 --- a/c/src/lib/libbsp/m68k/idp/preinstall.am +++ b/c/src/lib/libbsp/m68k/idp/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am index 56876c6f30..716bcc487c 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h index 074e05c589..c49bbb2da1 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h @@ -126,6 +126,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/rtc.h> #include "i2c.h" @@ -164,14 +165,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ extern rtems_isr (*rtems_clock_hook)(rtems_vector_number); -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am index 5454d9d0b0..42dbffda25 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index 7ef44e6ccb..310833b3af 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h index 701e604327..9bc7891141 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf52235/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern "C" { uint32_t bsp_get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf52235/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am index 1758c1a3f6..1a9ddc278a 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h index 13a189f5d2..d68ccfcea1 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h @@ -16,6 +16,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -62,12 +63,6 @@ extern "C" { uint32_t bsp_get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5225x/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 403b47f6b0..986e88d9ea 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h index b822b8d59a..fffb53e816 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5235/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -37,11 +38,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at /* functions */ uint32_t get_CPU_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); /* * Interrupt assignments diff --git a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am index 916e8d1f3c..26aaf1fc60 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5235/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index cb23cb99aa..39bc949f67 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h index 7a7db3b575..205c516005 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h @@ -14,6 +14,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -43,12 +44,6 @@ extern int rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config, int at uint32_t bsp_get_CPU_clock_speed(void); uint32_t bsp_get_BUS_clock_speed(void); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am index aaadcccd1e..845327fdff 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/preinstall.am +++ b/c/src/lib/libbsp/m68k/mcf5329/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 6b36feb8d9..57f13b6d64 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h index c792c3695e..8df4373d60 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #include <rtems.h> #include <rtems/bspIo.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> #include <mrm332.h> @@ -91,12 +92,6 @@ extern int stack_start; /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - void Spurious_Initialize(void); void _UART_flush(void); diff --git a/c/src/lib/libbsp/m68k/mrm332/preinstall.am b/c/src/lib/libbsp/m68k/mrm332/preinstall.am index 4a71e7df99..cd1c5e178c 100644 --- a/c/src/lib/libbsp/m68k/mrm332/preinstall.am +++ b/c/src/lib/libbsp/m68k/mrm332/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index a887fcccfe..6422697940 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index 4b10ecefd7..7d56b339e1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -21,6 +21,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -80,14 +81,6 @@ struct w_m681_info { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme136/preinstall.am b/c/src/lib/libbsp/m68k/mvme136/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme136/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme136/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index a9464f0f3c..23e45b6862 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h index 51c8d5907f..6392cf033f 100644 --- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -106,12 +107,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme147/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 8ca16d547c..2a9aa1d591 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 1627457ddc..9b258828a1 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -25,6 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -181,12 +182,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am index ed791553cd..02301638bf 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 5272bd4fc2..cf8dad7180 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index ccbac9ecae..1e269c632d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -28,6 +28,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> @@ -187,12 +188,6 @@ extern rtems_isr_entry M68Kvec[]; /* vector table address */ /* functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am index 528c115219..f7242272d3 100644 --- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme162/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 0ba3aa269f..f21976cbb9 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index 9a3324a682..ad4da09f47 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -27,6 +27,7 @@ extern "C" { #include <rtems.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -294,12 +295,6 @@ typedef volatile struct cd2401_regs_ { /* BSP-wide functions */ -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef M167_INIT #undef EXTERN #define EXTERN diff --git a/c/src/lib/libbsp/m68k/mvme167/preinstall.am b/c/src/lib/libbsp/m68k/mvme167/preinstall.am index 332fc9c9a2..8cf68cf235 100644 --- a/c/src/lib/libbsp/m68k/mvme167/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme167/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 7c773205a1..2180f1d191 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -9,6 +9,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 394c166d1c..560ede392a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems/console.h> #include <rtems/iosupp.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/m68k/m68302.h> #ifndef VARIANT @@ -68,14 +69,6 @@ extern "C" { extern rtems_isr_entry M68Kvec[]; /* vector table address */ -/* functions */ - -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/ods68302/preinstall.am b/c/src/lib/libbsp/m68k/ods68302/preinstall.am index f95a8437f0..2f98702783 100644 --- a/c/src/lib/libbsp/m68k/ods68302/preinstall.am +++ b/c/src/lib/libbsp/m68k/ods68302/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index ba7d98df1b..f2ecdce77a 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h index aedbd4d52e..17f4b2c9d4 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h +++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Define some hardware constants here @@ -46,10 +47,6 @@ extern "C" { : "0" (_tmp), "1" (_delay) ); \ } -/* functions */ - -rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/m68k/sim68000/preinstall.am b/c/src/lib/libbsp/m68k/sim68000/preinstall.am index bdd3a3e368..d8f202c1f2 100644 --- a/c/src/lib/libbsp/m68k/sim68000/preinstall.am +++ b/c/src/lib/libbsp/m68k/sim68000/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am index 6fe5787297..6ad14e9afa 100644 --- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h index 4365cf33d4..478319c2df 100644 --- a/c/src/lib/libbsp/m68k/uC5282/include/bsp.h +++ b/c/src/lib/libbsp/m68k/uC5282/include/bsp.h @@ -22,6 +22,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> #include <rtems/iosupp.h> #include <rtems/bspIo.h> @@ -71,12 +72,6 @@ const char *bsp_getbenv(const char *a); int bsp_flash_erase_range(volatile unsigned short *flashptr, int start, int end); int bsp_flash_write_range(volatile unsigned short *flashptr, bsp_mnode_t *chain, int offset); -rtems_isr_entry set_vector( - rtems_isr_entry handler, - rtems_vector_number vector, - int type -); - /* * Interrupt assignments * Highest-priority listed first diff --git a/c/src/lib/libbsp/m68k/uC5282/preinstall.am b/c/src/lib/libbsp/m68k/uC5282/preinstall.am index 73323b55bf..3fc2f2f75e 100644 --- a/c/src/lib/libbsp/m68k/uC5282/preinstall.am +++ b/c/src/lib/libbsp/m68k/uC5282/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 1094826b55..0ce004aa2f 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -9,6 +9,8 @@ include_bspdir = $(includedir)/bsp include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 3efd580928..8f19ddd0d1 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -25,7 +25,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> - +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -127,12 +127,6 @@ altera_avalon_jtag_uart_regs; /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am index 5e40708306..25ffbef541 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index 4a29945724..fe07392794 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am @@ -10,6 +10,8 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 96e248d615..20c8428171 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h @@ -24,6 +24,7 @@ extern "C" { #include <rtems.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* * Simple spin delay in microsecond units for device drivers. @@ -36,12 +37,6 @@ extern "C" { /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - #ifdef __cplusplus } #endif diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am index 72d079ac3f..d753521be9 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/preinstall.am @@ -40,6 +40,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 264a30c7bf..54b4136e44 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -9,6 +9,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am b/c/src/lib/libbsp/powerpc/score603e/preinstall.am index 4d2f767519..ba6fc3f0fc 100644 --- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am +++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 6339206624..b84cf5d468 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am index 7d4c5ecb59..4f43efb8e3 100644 --- a/c/src/lib/libbsp/sh/gensh2/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh2/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 70b667b2c7..13d88db98a 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = ../../shared/include/setvec.h nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h diff --git a/c/src/lib/libbsp/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am index 3821249eef..f49bf44e55 100644 --- a/c/src/lib/libbsp/sh/gensh4/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh4/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index bc039bbeb5..e147d8ba61 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/../../../../automake/compile.am include_bspdir = $(includedir)/bsp include_bsp_HEADERS = include/syscall.h +include_bsp_HEADERS += ../../shared/include/setvec.h dist_project_lib_DATA = bsp_specs diff --git a/c/src/lib/libbsp/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am index 9e08790208..56b869c0ba 100644 --- a/c/src/lib/libbsp/sh/shsim/preinstall.am +++ b/c/src/lib/libbsp/sh/shsim/preinstall.am @@ -37,6 +37,10 @@ $(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs diff --git a/c/src/lib/libbsp/shared/include/setvec.h b/c/src/lib/libbsp/shared/include/setvec.h new file mode 100644 index 0000000000..95f7cd9056 --- /dev/null +++ b/c/src/lib/libbsp/shared/include/setvec.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2011 Gedare Bloom. + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifndef LIBBSP_SHARED_SETVEC_H +#define LIBBSP_SHARED_SETVEC_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** + * @defgroup bsp_set_vector + * + * @ingroup bsp_kit + * + * @brief Install an interrupt handler for simple vectored architectures. + * + * @{ + */ +/** + * Raw trap handler vectors directly to isr handler. + */ +#define BSP_SET_VECTOR_RAW 0 +/** + * RTEMS trap handler vectors through rtems interrupt handler (_ISR_Handler). + */ +#define BSP_SET_VECTOR_RTEMS 1 + +/** + * @brief bsp_set_vector + * + * Installs @a handler as the interrupt handler for vector number @a vector + * with @a type specifying either BSP_SET_VECTOR_RAW or BSP_SET_VECTOR_RTEMS + * + * @return Returns the old vector handler + */ +rtems_isr_entry bsp_set_vector( + rtems_isr_entry handler, + rtems_vector_number vector, + int type +); + +/** @} */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* LIBBSP_SHARED_SETVEC_H */ diff --git a/c/src/lib/libbsp/shared/setvec.c b/c/src/lib/libbsp/shared/setvec.c index 46eba1e222..d8d228389b 100644 --- a/c/src/lib/libbsp/shared/setvec.c +++ b/c/src/lib/libbsp/shared/setvec.c @@ -25,11 +25,12 @@ */ #include <bsp.h> +#include <bsp/setvec.h> -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ +rtems_isr_entry set_vector( + rtems_isr_entry handler, + rtems_vector_number vector, + int type ) { rtems_isr_entry previous_isr; diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index ddb8d94c3b..075d531aa8 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -55,7 +55,8 @@ libbsp_a_SOURCES += timer/timer.c include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../shared/src/irq-default-handler.c \ diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h index 879e7144e0..0e03478a08 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h @@ -32,6 +32,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* * BSP provides its own Idle thread body @@ -69,12 +70,6 @@ extern int end; /* last address in the program */ /* functions */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/erc32/preinstall.am b/c/src/lib/libbsp/sparc/erc32/preinstall.am index a235296e1f..fe55a593dc 100644 --- a/c/src/lib/libbsp/sparc/erc32/preinstall.am +++ b/c/src/lib/libbsp/sparc/erc32/preinstall.am @@ -85,3 +85,7 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am index 9699bf1a32..62aee9f1c2 100644 --- a/c/src/lib/libbsp/sparc/leon2/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am @@ -65,7 +65,8 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ ../../sparc/shared/irq/irq-shared.c \ ../../shared/src/irq-default-handler.c \ diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h index e96a63ee90..b63b37cb06 100644 --- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* SPARC CPU variant: LEON2 */ #define LEON2 1 @@ -89,12 +90,6 @@ extern int end; /* last address in the program */ /* miscellaneous stuff assumed to exist */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am index 8b21893fc7..67b3fcf5a6 100644 --- a/c/src/lib/libbsp/sparc/leon3/Makefile.am +++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am @@ -67,7 +67,8 @@ libbsp_a_SOURCES += ../../shared/clockdrv_shell.h include_bsp_HEADERS = \ ../../shared/include/irq-generic.h \ ../../shared/include/irq-info.h \ - include/bsp/irq.h + include/bsp/irq.h \ + ../../shared/include/setvec.h libbsp_a_SOURCES += \ startup/eirq.c \ ../../sparc/shared/irq/irq-shared.c \ diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h index d883064660..2d75a4216d 100644 --- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/clockdrv.h> #include <rtems/console.h> #include <rtems/irq-extension.h> +#include <bsp/setvec.h> /* SPARC CPU variant: LEON3 */ #define LEON3 1 @@ -102,12 +103,6 @@ extern int end; /* last address in the program */ /* miscellaneous stuff assumed to exist */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - void BSP_fatal_return( void ); void bsp_spurious_initialize( void ); diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am index dffbb5aba4..7646150a39 100644 --- a/c/src/lib/libbsp/sparc/leon3/preinstall.am +++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am @@ -105,6 +105,10 @@ $(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/pci.h: ../../sparc/shared/include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.h diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am index 089649d0e6..29366fd357 100644 --- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am +++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am @@ -11,6 +11,8 @@ include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h include_HEADERS += ../shared/include/asm.h +include_bsp_HEADERS = ../shared/include/bsp/setvec.h + include_bootdir = $(includedir)/boot include_boot_HEADERS = ../shared/helenos/boot/include/align.h \ ../shared/helenos/boot/include/balloc.h \ diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h index 6a2c83e6e2..5f398b4d9e 100644 --- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h @@ -29,6 +29,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* support for simulated clock tick */ /* @@ -36,13 +37,6 @@ Thread clock_driver_sim_idle_body(uintptr_t); #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body */ -/* this should be defined somewhere */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am index 722ccdd849..c8ecc0f1ec 100644 --- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am +++ b/c/src/lib/libbsp/sparc64/niagara/preinstall.am @@ -49,6 +49,10 @@ $(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../shared/include/bsp/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am index 6c169e0e64..d03e7706a3 100644 --- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am +++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am @@ -12,6 +12,8 @@ include_HEADERS += include/tm27.h include_HEADERS += ../shared/include/asm.h include_HEADERS += ../shared/include/traptable.h +include_bsp_HEADERS = ../../shared/include/setvec.h + ## these are the include files used by the boot process from HelenOS Sparc64 include_bootdir = $(includedir)/boot include_boot_HEADERS = \ diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h index 31768df339..fe308436f1 100644 --- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h +++ b/c/src/lib/libbsp/sparc64/usiii/include/bsp.h @@ -31,6 +31,7 @@ extern "C" { #include <rtems/iosupp.h> #include <rtems/console.h> #include <rtems/clockdrv.h> +#include <bsp/setvec.h> /* support for simulated clock tick */ /* @@ -38,13 +39,6 @@ Thread clock_driver_sim_idle_body(uintptr_t); #define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body */ -/* this should be defined somewhere */ -rtems_isr_entry set_vector( /* returns old vector */ - rtems_isr_entry handler, /* isr routine */ - rtems_vector_number vector, /* vector number */ - int type /* RTEMS or RAW intr */ -); - /* * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am index 73f10f9f2b..7f78895353 100644 --- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am +++ b/c/src/lib/libbsp/sparc64/usiii/preinstall.am @@ -53,6 +53,10 @@ $(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h +$(PROJECT_INCLUDE)/bsp/setvec.h: ../../shared/include/setvec.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/setvec.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/setvec.h + $(PROJECT_INCLUDE)/boot/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/boot @: > $(PROJECT_INCLUDE)/boot/$(dirstamp) diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index dc8b22b204..739cd0dff4 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -26,8 +26,7 @@ #if !defined(OPENETH_NOT_SUPPORTED) #include <bsp.h> #include <rtems.h> - -#include <bsp.h> +#include <bsp/setvec.h> #include <inttypes.h> #include <stdlib.h> @@ -55,8 +54,6 @@ #undef free #endif -extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - /* #define OPEN_ETH_DEBUG */ @@ -322,7 +319,11 @@ open_eth_initialize_hardware (struct open_eth_softc *sc) regs->mac_addr0 = mac_addr0; /* install interrupt vector */ - set_vector (open_eth_interrupt_handler, sc->vector, 1); + set_vector( + open_eth_interrupt_handler, + sc->vector, + 1 + ); /* clear all pending interrupts */ diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c index 183dfb405d..edc8de5aba 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -34,6 +34,7 @@ #include <rtems.h> #include <rtems/rtems_bsdnet.h> #include <libchip/sonic.h> +#include <bsp/setvec.h> #include <stdio.h> #include <string.h> @@ -52,8 +53,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); - #if (SONIC_DEBUG & SONIC_DEBUG_DUMP_MBUFS) #include <rtems/dumpbuf.h> #endif @@ -1400,7 +1399,11 @@ SONIC_STATIC void sonic_initialize_hardware(struct sonic_softc *sc) */ /* Ignore returned old handler */ - (void) set_vector(sonic_interrupt_handler, sc->vector, 1); + (void) set_vector( + sonic_interrupt_handler, + sc->vector, + 1 + ); /* * Remainder of hardware initialization is diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 58dfa0d413..b697aad5f2 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -23,6 +23,10 @@ #include <libchip/sersupp.h> #include "mc68681_p.h" +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) +#include <bsp/setvec.h> +#endif + /* * Flow control is only supported when using interrupts */ @@ -53,11 +57,6 @@ console_fns mc68681_fns_polled = false, /* deviceOutputUsesInterrupts */ }; - -#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -#endif - /* * Console Device Driver Entry Points */ @@ -434,7 +433,11 @@ MC68681_STATIC void mc68681_initialize_interrupts(int minor) Console_Port_Data[minor].bActive = FALSE; #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - set_vector(mc68681_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + mc68681_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); #endif mc68681_enable_interrupts(minor,MC68681_IMR_ENABLE_ALL_EXCEPT_TX); diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index 59aa45b224..1d18f4764e 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -36,6 +36,10 @@ #include <libchip/sersupp.h> #include "z85c30_p.h" +#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) +#include <bsp/setvec.h> +#endif + /* * Flow control is only supported when using interrupts */ @@ -78,10 +82,6 @@ console_fns z85c30_fns_polled = { false /* deviceOutputUsesInterrupts */ }; -#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -#endif - /* * z85c30_initialize_port * @@ -723,7 +723,11 @@ Z85C30_STATIC void z85c30_initialize_interrupts( } #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE) - set_vector(z85c30_isr, Console_Port_Tbl[minor]->ulIntVector, 1); + set_vector( + z85c30_isr, + Console_Port_Tbl[minor]->ulIntVector, + 1 + ); #endif z85c30_enable_interrupts(minor, SCC_ENABLE_ALL_INTR_EXCEPT_TX); |