[rtems commit] nios2: Remove use of proc_ptr

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    12dfa5e26fff003cea0115381797e9daa5ceb633
Changeset: http://git.rtems.org/rtems/commit/?id=12dfa5e26fff003cea0115381797e9daa5ceb633

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Nov  8 16:03:10 2018 +0100

nios2: Remove use of proc_ptr

Update #3585.

---

 cpukit/Makefile.am                                 |  1 -
 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 ++---------------
 4 files changed, 7 insertions(+), 87 deletions(-)

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index ead5636..815c927 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1643,7 +1643,6 @@ librtemscpu_a_SOURCES += score/cpu/nios2/nios2-iic-low-level.S
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-iic-irq.c
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-initialize.c
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-isr-get-level.c
-librtemscpu_a_SOURCES += score/cpu/nios2/nios2-isr-install-raw-handler.c
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-isr-install-vector.c
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-isr-is-in-progress.c
 librtemscpu_a_SOURCES += score/cpu/nios2/nios2-isr-set-level.c
diff --git a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
index c86b13b..4a71987 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 2834372..0000000
--- 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 <rtems/score/cpu.h>
-
-/*
- *  _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 578634c..b207c1c 100644
--- a/cpukit/score/cpu/nios2/nios2-isr-install-vector.c
+++ b/cpukit/score/cpu/nios2/nios2-isr-install-vector.c
@@ -21,42 +21,15 @@
 
 #include <rtems/score/isr.h>
 
-/*
- *  _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.
     */