From 5c6edeed512b84d065fb9eff34c03558457b408f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Nov 2018 15:44:56 +0100 Subject: m68k: Remove use of proc_ptr Update #3585. --- cpukit/score/cpu/m68k/cpu.c | 32 ++++++++++++------------- cpukit/score/cpu/m68k/include/rtems/score/cpu.h | 27 +++++++-------------- 2 files changed, 25 insertions(+), 34 deletions(-) (limited to 'cpukit/score/cpu/m68k') diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c index 87e0fe384d..be63351e9c 100644 --- a/cpukit/score/cpu/m68k/cpu.c +++ b/cpukit/score/cpu/m68k/cpu.c @@ -50,8 +50,8 @@ _CPU_ISR_jump_table[ CPU_INTERRUPT_NUMBER_OF_VECTORS ]; #if (M68K_HAS_FPSP_PACKAGE == 1) int (*_FPSP_install_raw_handler)( uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + CPU_ISR_raw_handler new_handler, + CPU_ISR_raw_handler *old_handler ); #endif @@ -97,17 +97,17 @@ uint32_t _CPU_ISR_Get_level( void ) return level; } -/* - * _CPU_ISR_install_raw_handler - */ - void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + uint32_t vector, + CPU_ISR_raw_handler new_handler, + CPU_ISR_raw_handler *old_handler ) { - proc_ptr *interrupt_table = NULL; +#if ( M68K_HAS_VBR == 1 ) + CPU_ISR_raw_handler *interrupt_table = NULL; +#else + _CPU_ISR_handler_entry *interrupt_table = NULL; +#endif #if (M68K_HAS_FPSP_PACKAGE == 1) /* @@ -141,20 +141,20 @@ void _CPU_ISR_install_raw_handler( * load it appropriately to vector to the RTEMS jump table. */ - *old_handler = (proc_ptr) _CPU_ISR_jump_table[vector].isr_handler; + *old_handler = (CPU_ISR_raw_handler) _CPU_ISR_jump_table[vector].isr_handler; _CPU_ISR_jump_table[vector].isr_handler = (uint32_t) new_handler; if ( (uint32_t) interrupt_table != 0xFFFFFFFF ) - interrupt_table[ vector ] = (proc_ptr) &_CPU_ISR_jump_table[vector]; + interrupt_table[ vector ] = &_CPU_ISR_jump_table[vector]; #endif /* M68K_HAS_VBR */ } void _CPU_ISR_install_vector( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + uint32_t vector, + CPU_ISR_handler new_handler, + CPU_ISR_handler *old_handler ) { - proc_ptr ignored = 0; /* to avoid warning */ + CPU_ISR_raw_handler ignored = 0; /* to avoid warning */ *old_handler = _ISR_Vector_table[ vector ]; diff --git a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h index cd3f55fe0a..08690f20bd 100644 --- a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h @@ -564,29 +564,20 @@ extern const unsigned char _CPU_m68k_BFFFO_table[256]; void _CPU_Initialize(void); -/* - * _CPU_ISR_install_raw_handler - * - * This routine installs a "raw" interrupt handler directly into the - * processor's vector table. - */ +typedef void ( *CPU_ISR_raw_handler )( void ); void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + uint32_t vector, + CPU_ISR_raw_handler new_handler, + CPU_ISR_raw_handler *old_handler ); -/* - * _CPU_ISR_install_vector - * - * This routine installs an interrupt vector. - */ +typedef void ( *CPU_ISR_handler )( uint32_t ); void _CPU_ISR_install_vector( uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + CPU_ISR_handler new_handler, + CPU_ISR_handler *old_handler ); /* @@ -677,8 +668,8 @@ void M68KFPSPInstallExceptionHandlers (void); extern int (*_FPSP_install_raw_handler)( uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler + CPU_ISR_raw_handler new_handler, + CPU_ISR_raw_handler *old_handler ); #endif -- cgit v1.2.3