[PATCH 07/26] bsps/mips: Use <libcpu/isr_entries.h>

[Sebastian Huber]

Avoid duplicate mips_vector_isr_handlers() declarations.
---
 c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c         | 2 +-
 c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c      | 2 +-
 c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c        | 3 +--
 c/src/lib/libbsp/mips/malta/irq/vectorisrs.c          | 2 +-
 c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c       | 2 +-
 c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c       | 2 +-
 c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h | 2 ++
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c b/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c
index 182efaa..d8e0712 100644
--- a/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/csb350/irq/vectorisrs.c
@@ -16,11 +16,11 @@
 #include <rtems.h>
 #include <stdlib.h>
 #include <libcpu/au1x00.h>
+#include <libcpu/isr_entries.h>
 #include <rtems/irq.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 static void call_vectored_isr(CPU_Interrupt_frame *, uint32_t , void *);
 
 #include <rtems/bspIo.h>  /* for printk */
diff --git a/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c b/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c
index 838f959..e555666 100644
--- a/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/hurricane/irq/vectorisrs.c
@@ -15,13 +15,13 @@
 
 #include <rtems.h>
 #include <stdlib.h>
+#include <libcpu/isr_entries.h>
 #include <libcpu/rm5231.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 
 #include <rtems/bspIo.h>  /* for printk */
 
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 void mips_default_isr( int vector );
 
 void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
diff --git a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c b/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
index abb9b30..629c4c4 100644
--- a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
@@ -18,8 +18,7 @@
 #include <bsp/irq.h>
 #include <rtems/bspIo.h>  /* for printk */
 #include <bsp/irq-generic.h>
-
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
+#include <libcpu/isr_entries.h>
 
 void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
 {
diff --git a/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c b/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c
index 5853e5e..a2b9288 100644
--- a/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/malta/irq/vectorisrs.c
@@ -18,9 +18,9 @@
 #include <bsp/pci.h>
 #include <bsp/i8259.h>
 #include <bsp.h>
+#include <libcpu/isr_entries.h>
 
 void mips_default_isr( int vector );
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 
 #include <rtems/bspIo.h>  /* for printk */
 
diff --git a/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c b/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c
index f130f70..09020c5 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/rbtx4925/irq/vectorisrs.c
@@ -15,12 +15,12 @@
 
 #include <rtems.h>
 #include <stdlib.h>
+#include <libcpu/isr_entries.h>
 #include <libcpu/tx4925.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 #include <rtems/bspIo.h>  /* for printk */
 
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 void mips_default_isr( int vector );
 
 void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
diff --git a/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c b/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
index e13a776..d38e4f8 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
+++ b/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
@@ -15,12 +15,12 @@
 
 #include <rtems.h>
 #include <stdlib.h>
+#include <libcpu/isr_entries.h>
 #include <libcpu/tx4938.h>
 #include <bsp/irq.h>
 #include <bsp/irq-generic.h>
 #include <rtems/bspIo.h>  /* for printk */
 
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 void mips_default_isr( int vector );
 
 void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h b/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
index d31c334..e142018 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
+++ b/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.h
@@ -15,6 +15,8 @@
 #ifndef _ISR_ENTRIES_H
 #define _ISR_ENTRIES_H 1
 
+#include <rtems/score/cpuimpl.h>
+
 extern void mips_install_isr_entries( void );
 extern void mips_vector_isr_handlers( CPU_Interrupt_frame *frame );
 
-- 
1.8.4.5