diff options
Diffstat (limited to 'c/src/lib/libbsp/sh')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/include/Makefile.in | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/include/bsp.h | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/startup/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shared/setvec.c | 5 |
4 files changed, 15 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/sh/gensh1/include/Makefile.in b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in index 2a2cd51b24..e632fca2f1 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/include/Makefile.in @@ -30,8 +30,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg CLEAN_ADDITIONS += CLOBBER_ADDITIONS += -all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) +all: preinstall -install: all +preinstall: $(SRCS) + @INSTALL@ $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE) diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index ea7c370d77..8f676d07fe 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -55,7 +55,11 @@ extern "C" { #define MUST_WAIT_FOR_INTERRUPT 0 -#define Install_tm27_vector( handler ) set_vector( (handler), 0, 1 ) +#define Install_tm27_vector( handler ) \ +{ \ + rtems_isr_entry ignored ; \ + rtems_interrupt_catch( (handler), 0, &ignored ) ; \ +} #define Cause_tm27_intr() @@ -110,12 +114,14 @@ extern void bsp_cleanup( void ); /* * FIXME: Should this go to libcpu/sh/sh7032 ? */ +#if 0 /* functions */ sh_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 } diff --git a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in index 52be4a84fb..08adccc862 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in +++ b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.in @@ -11,7 +11,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ PGM=${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES=bsplibc bsppost bspstart bspclean sbrk setvec main +C_PIECES=bsplibc bsppost bspstart bspclean sbrk main C_FILES=$(C_PIECES:%=%.c) C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/sh/shared/setvec.c b/c/src/lib/libbsp/sh/shared/setvec.c index 20bc080e23..e6c778b6a3 100644 --- a/c/src/lib/libbsp/sh/shared/setvec.c +++ b/c/src/lib/libbsp/sh/shared/setvec.c @@ -1,5 +1,9 @@ /* set_vector * + * NOTE: This function is considered OBSOLETE and may vanish soon. + * Calls to set_vector should be replaced by calls to + * rtems_interrupt_catch or _CPU_ISR_install_raw_handler. + * * This routine installs an interrupt vector on the target Board/CPU. * This routine is allowed to be as board dependent as necessary. * @@ -52,4 +56,3 @@ sh_isr_entry set_vector( /* returns old vector */ return previous_isr; } - |