From 510fbfc314a5eb50ce68bb7c2df2b3056e479e99 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 8 Nov 2018 15:31:03 +0100
Subject: sh: Remove use of proc_ptr

Update #3585.
---
 bsps/sh/gensh1/start/cpu_asm.c   | 3 ---
 bsps/sh/gensh1/start/ispsh7032.c | 4 ++--
 bsps/sh/gensh2/start/cpu_asm.c   | 3 ---
 bsps/sh/gensh2/start/ispsh7045.c | 4 ++--
 bsps/sh/gensh4/start/cpu_asm.c   | 3 ---
 bsps/sh/shared/start/setvec.c    | 2 +-
 bsps/sh/shsim/start/ispshgdb.c   | 4 ++--
 7 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'bsps')

diff --git a/bsps/sh/gensh1/start/cpu_asm.c b/bsps/sh/gensh1/start/cpu_asm.c
index 57c5c11796..2556623c47 100644
--- a/bsps/sh/gensh1/start/cpu_asm.c
+++ b/bsps/sh/gensh1/start/cpu_asm.c
@@ -41,9 +41,6 @@
 #include <rtems/score/iosh7032.h>
 #include <rtems/score/sh_io.h>
 
-/* from cpu_isps.c */
-extern proc_ptr         _Hardware_isr_Table[];
-
 unsigned long *_old_stack_ptr;
 
 register unsigned long  *stack_ptr __asm__ ("r15");
diff --git a/bsps/sh/gensh1/start/ispsh7032.c b/bsps/sh/gensh1/start/ispsh7032.c
index 05ba2f1e90..9857b755ab 100644
--- a/bsps/sh/gensh1/start/ispsh7032.c
+++ b/bsps/sh/gensh1/start/ispsh7032.c
@@ -25,7 +25,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems/system.h>
+#include <rtems/score/cpu.h>
 #include <rtems/score/ispsh7032.h>
 
 /*
@@ -33,7 +33,7 @@
  *
  * It has the same structure like the actual vector table (vectab)
  */
-proc_ptr _Hardware_isr_Table[256]={
+CPU_ISR_raw_handler _Hardware_isr_Table[256]={
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
 _dummy_isp, _dummy_isp, _dummy_isp,
diff --git a/bsps/sh/gensh2/start/cpu_asm.c b/bsps/sh/gensh2/start/cpu_asm.c
index 7d6e09c4c4..479b771d73 100644
--- a/bsps/sh/gensh2/start/cpu_asm.c
+++ b/bsps/sh/gensh2/start/cpu_asm.c
@@ -39,9 +39,6 @@
 #include <rtems/score/iosh7045.h>
 #include <rtems/score/sh_io.h>
 
-/* from cpu_isps.c */
-extern proc_ptr         _Hardware_isr_Table[];
-
 unsigned long *_old_stack_ptr;
 
 register unsigned long  *stack_ptr __asm__ ("r15");
diff --git a/bsps/sh/gensh2/start/ispsh7045.c b/bsps/sh/gensh2/start/ispsh7045.c
index 4e6dabed3f..874d930ba1 100644
--- a/bsps/sh/gensh2/start/ispsh7045.c
+++ b/bsps/sh/gensh2/start/ispsh7045.c
@@ -37,7 +37,7 @@
  *	by the authors or by TGA Technologies.
  */
 
-#include <rtems/system.h>
+#include <rtems/score/cpu.h>
 
 /*
  * This is a exception vector table
@@ -49,7 +49,7 @@
 /* SH-2 ISR Table */
 #include <rtems/score/ispsh7045.h>
 
-proc_ptr _Hardware_isr_Table[256]={
+CPU_ISR_raw_handler _Hardware_isr_Table[256]={
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,		/* PWRon Reset, Maual Reset,...*/
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
 _dummy_isp, _dummy_isp, _dummy_isp,
diff --git a/bsps/sh/gensh4/start/cpu_asm.c b/bsps/sh/gensh4/start/cpu_asm.c
index 7618db3e27..6b530fe8b7 100644
--- a/bsps/sh/gensh4/start/cpu_asm.c
+++ b/bsps/sh/gensh4/start/cpu_asm.c
@@ -39,9 +39,6 @@
 #include <rtems/score/sh4_regs.h>
 #include <rtems/score/sh_io.h>
 
-/* from cpu_isps.c */
-extern proc_ptr         _Hardware_isr_Table[];
-
 unsigned long *_old_stack_ptr;
 
 register unsigned long  *stack_ptr __asm__ ("r15");
diff --git a/bsps/sh/shared/start/setvec.c b/bsps/sh/shared/start/setvec.c
index c3f4071aea..5d11e64f72 100644
--- a/bsps/sh/shared/start/setvec.c
+++ b/bsps/sh/shared/start/setvec.c
@@ -48,7 +48,7 @@ sh_isr_entry set_vector(      		/* returns old vector */
   if ( type )
     rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );
   else {
-    _CPU_ISR_install_raw_handler( vector, handler, (proc_ptr*) &previous_isr );
+    _CPU_ISR_install_raw_handler( vector, handler, &previous_isr );
   }
 
   return previous_isr;
diff --git a/bsps/sh/shsim/start/ispshgdb.c b/bsps/sh/shsim/start/ispshgdb.c
index 09843172d9..f69ea10955 100644
--- a/bsps/sh/shsim/start/ispshgdb.c
+++ b/bsps/sh/shsim/start/ispshgdb.c
@@ -27,7 +27,7 @@
  *  Modified to reflect dummy isp entries for GDB SH simulator by Joel.
  */
 
-#include <rtems/system.h>
+#include <rtems/score/cpu.h>
 
 /*
  * This is a exception vector table
@@ -37,7 +37,7 @@
 
 void _dummy_isp(uint32_t);
 
-proc_ptr _Hardware_isr_Table[256]={
+CPU_ISR_raw_handler _Hardware_isr_Table[256]={
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,	/* PWRon Reset, Maual Reset,...*/
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
 _dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
-- 
cgit v1.2.3