From 8203db45d525b782a258e2ba866283832fdf182a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 9 Nov 2018 07:59:57 +0100 Subject: bfin: Remove use of proc_ptr Update #3585. --- cpukit/score/cpu/bfin/cpu.c | 46 ++++++------------------- cpukit/score/cpu/bfin/include/rtems/score/cpu.h | 41 ++++++---------------- 2 files changed, 20 insertions(+), 67 deletions(-) diff --git a/cpukit/score/cpu/bfin/cpu.c b/cpukit/score/cpu/bfin/cpu.c index 0771b4b3cd..f658d1f353 100644 --- a/cpukit/score/cpu/bfin/cpu.c +++ b/cpukit/score/cpu/bfin/cpu.c @@ -56,7 +56,7 @@ void _CPU_Initialize(void) - proc_ptr ignored; + CPU_ISR_raw_handler ignored; #if 0 /* occassionally useful debug stuff */ @@ -101,21 +101,14 @@ uint32_t _CPU_ISR_Get_level( void ) return (_tmpimask & 0xffe0) ? 0 : 1; } -/* - * _CPU_ISR_install_raw_handler - * - * NO_CPU Specific Information: - * - * XXX document implementation including references if appropriate - */ - 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; + CPU_ISR_raw_handler *interrupt_table; + /* * This is where we install the interrupt handler into the "raw" interrupt * table used by the CPU to dispatch interrupt handlers. @@ -129,32 +122,13 @@ void _CPU_ISR_install_raw_handler( } -/* - * _CPU_ISR_install_vector - * - * This kernel routine installs the RTEMS handler for the - * specified vector. - * - * Input parameters: - * vector - interrupt vector number - * old_handler - former ISR for this vector number - * new_handler - replacement ISR for this vector number - * - * Output parameters: NONE - * - * - * NO_CPU Specific Information: - * - * XXX document implementation including references if appropriate - */ - 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; + CPU_ISR_raw_handler ignored; *old_handler = _ISR_Vector_table[ vector ]; diff --git a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h index 329a1b6762..481762d7b8 100644 --- a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h @@ -656,41 +656,20 @@ void _CPU_Context_Initialize( */ void _CPU_Initialize(void); -/** - * @ingroup CPUInterrupt - * This routine installs a "raw" interrupt handler directly into the - * processor's vector table. - * - * @param[in] vector is the vector number - * @param[in] new_handler is the raw ISR handler to install - * @param[in] old_handler is the previously installed ISR Handler - * - * Port Specific Information: - * - * XXX document implementation including references if appropriate - */ +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 ); -/** - * @ingroup CPUInterrupt - * This routine installs an interrupt vector. - * - * @param[in] vector is the vector number - * @param[in] new_handler is the RTEMS ISR handler to install - * @param[in] old_handler is the previously installed ISR Handler - * - * Port Specific Information: - * - * XXX document implementation including references if appropriate - */ +typedef void ( *CPU_ISR_handler )( uint32_t ); + 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 ); void *_CPU_Thread_Idle_body( uintptr_t ignored ); -- cgit v1.2.3