[PATCH] no_cpu: replace no_cpu_isr with rtems_isr

[Joel Sherrill]

These are largely mechanical. If you are compiling as you go
and they do not introduce errors or warnings, I am OK with
them. Please just go ahead and commit.

--joel

On 04/16/2012 06:39 PM, Gedare Bloom wrote:
> ---
>   c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h    |    2 +-
>   c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c |    4 ++--
>   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 8513f7d..c137ab4 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 e72a92f..deb2b13 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 c1fdc6d..2fb960c 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


-- 
Joel Sherrill, Ph.D.             Director of Research&   Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
     Support Available             (256) 722-9985