[PATCH 19/19] x86_64: Remove use of proc_ptr

[Sebastian Huber]

Update #3585.
---
 cpukit/score/cpu/x86_64/cpu.c                       | 21 ---------------------
 cpukit/score/cpu/x86_64/include/rtems/score/cpu.h   | 12 ------------
 cpukit/score/cpu/x86_64/x86_64-context-initialize.c |  2 +-
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/cpukit/score/cpu/x86_64/cpu.c b/cpukit/score/cpu/x86_64/cpu.c
index 88c4a98a3e..05517b2089 100644
--- a/cpukit/score/cpu/x86_64/cpu.c
+++ b/cpukit/score/cpu/x86_64/cpu.c
@@ -53,27 +53,6 @@ void _CPU_Initialize(void)
 {
 }
 
-void _CPU_ISR_install_raw_handler(
-  uint32_t    vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-  amd64_install_raw_interrupt(
-    vector,
-    (uintptr_t) new_handler,
-    (uintptr_t*) old_handler
-  );
-}
-
-void _CPU_ISR_install_vector(
-  uint32_t    vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-)
-{
-}
-
 void *_CPU_Thread_Idle_body(uintptr_t ignored)
 {
   for ( ; ; ) { }
diff --git a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
index 7f3aed3bb1..5716b7a200 100644
--- a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
@@ -284,18 +284,6 @@ void _CPU_Context_Initialize(
 
 void _CPU_Initialize(void);
 
-void _CPU_ISR_install_raw_handler(
-  uint32_t    vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-);
-
-void _CPU_ISR_install_vector(
-  uint32_t    vector,
-  proc_ptr    new_handler,
-  proc_ptr   *old_handler
-);
-
 void *_CPU_Thread_Idle_body( uintptr_t ignored );
 
 void _CPU_Context_switch(
diff --git a/cpukit/score/cpu/x86_64/x86_64-context-initialize.c b/cpukit/score/cpu/x86_64/x86_64-context-initialize.c
index 35e7d7cb60..21aed023c5 100644
--- a/cpukit/score/cpu/x86_64/x86_64-context-initialize.c
+++ b/cpukit/score/cpu/x86_64/x86_64-context-initialize.c
@@ -89,7 +89,7 @@ void _CPU_Context_Initialize(
   _stack &= ~(CPU_STACK_ALIGNMENT - 1);
   _stack -= sizeof(uintptr_t); /* fake return address for entry_point's frame;
                                 * this allows rsp+8 to be an aligned boundary */
-  *((proc_ptr *) _stack) = entry_point;
+  *((void (*)(void)) _stack) = entry_point;
 
   the_context->rbp     = (void *) 0;
   the_context->rsp     = (void *) _stack;
-- 
2.16.4