diff options
author | Gedare Bloom <gedare@rtems.org> | 2012-04-16 19:35:25 -0400 |
---|---|---|
committer | Gedare Bloom <gedare@rtems.org> | 2012-04-16 19:39:22 -0400 |
commit | e99dbaa7cd201edcf5e157299f11323c793375ad (patch) | |
tree | b7ab559a4266d4635021b741cef4d6a4067147cc | |
parent | libqos: generate preinstall.am (diff) | |
download | rtems-e99dbaa7cd201edcf5e157299f11323c793375ad.tar.bz2 |
no_cpu: replace no_cpu_isr with rtems_isr
-rw-r--r-- | c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/no_cpu/rtems/score/types.h | 6 |
3 files changed, 3 insertions, 9 deletions
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..c137ab4978 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 @@ -38,7 +38,7 @@ extern "C" { /* functions */ -no_cpu_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 */ diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c index e72a92fb24..deb2b13a7f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c @@ -25,13 +25,13 @@ #include <rtems.h> #include <bsp.h> -no_cpu_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 */ ) { - no_cpu_isr_entry previous_isr; + rtems_isr_entry previous_isr; if ( type ) rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/rtems/score/types.h index c1fdc6d9a4..2fb960c899 100644 --- a/cpukit/score/cpu/no_cpu/rtems/score/types.h +++ b/cpukit/score/cpu/no_cpu/rtems/score/types.h @@ -34,12 +34,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 no_cpu_isr; - -/** This defines the prototype for an ISR entry point. */ -typedef no_cpu_isr ( *no_cpu_isr_entry )( void ); - #ifdef __cplusplus } #endif |