bsps: Move interrupt controller support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

2 files changed, 4 insertions, 51 deletions

diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index ccffd01669..84dabfd775 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -32,10 +32,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/console/console-io.
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/btimer/btimer.c
 #isr
-librtemsbsp_a_SOURCES += ../shared/irq/vectorexceptions.c
-librtemsbsp_a_SOURCES += ../shared/irq/irq.c
-librtemsbsp_a_SOURCES += irq/vectorisrs.c
-librtemsbsp_a_SOURCES += ../shared/irq/interruptmask.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c b/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
deleted file mode 100644
index 629c4c45f8..0000000000
--- a/c/src/lib/libbsp/mips/jmr3904/irq/vectorisrs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *  @file
- *  
- *  TX3904 Interrupt Vectoring
- */
-
-/*
- *  COPYRIGHT (c) 1989-2012.
- *  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.
- */
-
-#include <rtems.h>
-#include <stdlib.h>
-#include <bsp/irq.h>
-#include <rtems/bspIo.h>  /* for printk */
-#include <bsp/irq-generic.h>
-#include <libcpu/isr_entries.h>
-
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
-{
-  unsigned int sr;
-  unsigned int cause;
-
-  mips_get_sr( sr );
-  mips_get_cause( cause );
-
-  cause &= (sr & SR_IMASK);
-  cause >>= CAUSE_IPSHIFT;
-
-  if ( cause & 0x80 )       /* IP[5] ==> INT0 */
-    bsp_interrupt_handler_dispatch( TX3904_IRQ_INT0 );
-
-  if ( cause & 0x40 ) {     /* (IP[4] == 1) ==> IP[0-3] are valid */
-    unsigned int v = (cause >> 2) & 0x0f;
-    bsp_interrupt_handler_dispatch( MIPS_INTERRUPT_BASE + v );
-  }
-
-  if ( cause & 0x02 )       /* SW[0] */
-    bsp_interrupt_handler_dispatch( TX3904_IRQ_SOFTWARE_1 );
-
-  if ( cause & 0x01 )       /* IP[1] */
-    bsp_interrupt_handler_dispatch( TX3904_IRQ_SOFTWARE_2 );
-}