From a043ff859d9f22dafea5c166acb26668b09df259 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Nov 2018 15:33:47 +0100 Subject: epiphany: Remove use of proc_ptr Update #3585. --- bsps/epiphany/epiphany_sim/btimer/btimer.c | 3 +-- cpukit/score/cpu/epiphany/cpu.c | 18 ------------- .../score/cpu/epiphany/include/rtems/score/cpu.h | 30 ---------------------- 3 files changed, 1 insertion(+), 50 deletions(-) diff --git a/bsps/epiphany/epiphany_sim/btimer/btimer.c b/bsps/epiphany/epiphany_sim/btimer/btimer.c index 5df9448e01..9cb8526822 100644 --- a/bsps/epiphany/epiphany_sim/btimer/btimer.c +++ b/bsps/epiphany/epiphany_sim/btimer/btimer.c @@ -56,8 +56,7 @@ void benchmark_timer_initialize( void ) { /* Install interrupt handler for timer 1 */ - proc_ptr *table = - (proc_ptr *) bsp_start_vector_table_begin; + void (**table)(void) = (void (**)(void)) bsp_start_vector_table_begin; table[TIMER1] = benchmark_timer1_interrupt_handler; diff --git a/cpukit/score/cpu/epiphany/cpu.c b/cpukit/score/cpu/epiphany/cpu.c index 489576cfc7..d025d92a6e 100644 --- a/cpukit/score/cpu/epiphany/cpu.c +++ b/cpukit/score/cpu/epiphany/cpu.c @@ -65,24 +65,6 @@ uint32_t _CPU_ISR_Get_level( void ) return 0; } -void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -) -{ - /* Do nothing */ -} - -void _CPU_ISR_install_vector( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -) -{ - /* Do nothing */ -} - CPU_Counter_ticks _CPU_Counter_read( void ) { static CPU_Counter_ticks counter; diff --git a/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h index d5c046a1fa..fe42c1f80d 100644 --- a/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/epiphany/include/rtems/score/cpu.h @@ -582,36 +582,6 @@ void _CPU_Initialize( void ); -/* - * _CPU_ISR_install_raw_handler - * - * This routine installs a "raw" interrupt handler directly into the - * processor's vector table. - * - */ - -void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -); - -/* - * _CPU_ISR_install_vector - * - * This routine installs an interrupt vector. - * - * 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 -); - void *_CPU_Thread_Idle_body( uintptr_t ignored ); /* -- cgit v1.2.3