From 12dfa5e26fff003cea0115381797e9daa5ceb633 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 8 Nov 2018 16:03:10 +0100 Subject: nios2: Remove use of proc_ptr Update #3585. --- cpukit/score/cpu/nios2/include/rtems/score/cpu.h | 18 +++------- .../cpu/nios2/nios2-isr-install-raw-handler.c | 42 ---------------------- cpukit/score/cpu/nios2/nios2-isr-install-vector.c | 33 ++--------------- 3 files changed, 7 insertions(+), 86 deletions(-) delete mode 100644 cpukit/score/cpu/nios2/nios2-isr-install-raw-handler.c (limited to 'cpukit/score/cpu') diff --git a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h index c86b13bb73..4a71987a32 100644 --- a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h @@ -296,22 +296,12 @@ void _CPU_Fatal_halt( uint32_t _source, uint32_t _error ) */ void _CPU_Initialize( void ); -/** - * @brief CPU ISR install raw handler. - */ -void _CPU_ISR_install_raw_handler( - uint32_t vector, - proc_ptr new_handler, - proc_ptr *old_handler -); +typedef void ( *CPU_ISR_handler )( uint32_t ); -/** - * @brief CPU ISR install vector. - */ 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 ); diff --git a/cpukit/score/cpu/nios2/nios2-isr-install-raw-handler.c b/cpukit/score/cpu/nios2/nios2-isr-install-raw-handler.c deleted file mode 100644 index 2834372940..0000000000 --- a/cpukit/score/cpu/nios2/nios2-isr-install-raw-handler.c +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file - * - * @brief NIOS2 CPU ISR Install Raw Handler - */ - -/* - * Copyright (c) 2006 Kolja Waschk (rtemsdev/ixo.de) - * - * COPYRIGHT (c) 1989-2006 - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - -#include - -/* - * _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 -) -{ - /* - * This is where we install the interrupt handler into the "raw" interrupt - * table used by the CPU to dispatch interrupt handlers. - */ -} diff --git a/cpukit/score/cpu/nios2/nios2-isr-install-vector.c b/cpukit/score/cpu/nios2/nios2-isr-install-vector.c index 578634c7cc..b207c1c752 100644 --- a/cpukit/score/cpu/nios2/nios2-isr-install-vector.c +++ b/cpukit/score/cpu/nios2/nios2-isr-install-vector.c @@ -21,41 +21,14 @@ #include -/* - * _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 ) { *old_handler = _ISR_Vector_table[ vector ]; - /* - * If the interrupt vector table is a table of pointer to isr entry - * points, then we need to install the appropriate RTEMS interrupt - * handler for this vector number. - */ - - _CPU_ISR_install_raw_handler( vector, new_handler, old_handler ); - /* * We put the actual user ISR address in '_ISR_vector_table'. This will * be used by the _ISR_Handler so the user gets control. -- cgit v1.2.3