diff options
| author | Gedare Bloom <gedare@rtems.org> | 2012-04-15 22:23:59 -0400 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2012-04-16 13:11:20 -0400 |
| commit | 416f1efbd2dfa82529fe2f1fc53c56eba51f5361 (patch) | |
| tree | 40dbd6a1428e0a4e51855b98d774aeeb2b86bd34 | |
| parent | m68k: replace m68k_isr with rtems_isr (diff) | |
| download | rtems-416f1efbd2dfa82529fe2f1fc53c56eba51f5361.tar.bz2 | |
lm32: replace lm32_isr with rtems_isr
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/startup/setvec.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c | 2 | ||||
| -rw-r--r-- | c/src/libchip/network/open_eth.c | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/lm32/rtems/score/types.h | 6 |
4 files changed, 3 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/lm32/shared/startup/setvec.c b/c/src/lib/libbsp/lm32/shared/startup/setvec.c index b7818d3699..5dc8e61dc7 100644 --- a/c/src/lib/libbsp/lm32/shared/startup/setvec.c +++ b/c/src/lib/libbsp/lm32/shared/startup/setvec.c @@ -26,13 +26,13 @@ #include <rtems.h> #include <bsp.h> -lm32_isr_entry set_vector( /* returns old vector */ +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 */ ) { - lm32_isr_entry previous_isr; + rtems_isr_entry previous_isr; if ( type ) rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); diff --git a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c index 568b413058..e9ef8a15da 100644 --- a/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c +++ b/c/src/lib/libbsp/lm32/shared/tsmac/tsmac.c @@ -134,7 +134,7 @@ static inline void tsmacregwrite(unsigned int reg, uint16_t value) rtems_isr tsmac_interrupt_handler(rtems_vector_number vector); -extern lm32_isr_entry set_vector(rtems_isr_entry handler, +extern rtems_isr_entry set_vector(rtems_isr_entry handler, rtems_vector_number vector, int type); /* diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index b9d178cf0f..dc8b22b204 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -55,11 +55,7 @@ #undef free #endif -#if defined(__lm32__) -extern lm32_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); -#else extern rtems_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); -#endif /* #define OPEN_ETH_DEBUG diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/cpukit/score/cpu/lm32/rtems/score/types.h index a46dd75220..949f9e2d9d 100644 --- a/cpukit/score/cpu/lm32/rtems/score/types.h +++ b/cpukit/score/cpu/lm32/rtems/score/types.h @@ -37,12 +37,6 @@ extern "C" { /** This defines the type for a priority bit map entry. */ typedef uint16_t Priority_bit_map_Control; -/** This defines the return type for an ISR entry point. */ -typedef void lm32_isr; - -/** This defines the prototype for an ISR entry point. */ -typedef lm32_isr ( *lm32_isr_entry )( void ); - #ifdef __cplusplus } #endif |