bsps: Move interrupt controller support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

2 files changed, 5 insertions, 69 deletions

diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index d8b53efe8b..2eeb2d39b5 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -30,7 +30,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/start/inittlb.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
-librtemsbsp_a_SOURCES += ../shared/irq/exception.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/exception.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4938/clock/clockdrv.c
 # console
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/console/console-io
 librtemsbsp_a_SOURCES += ../shared/liblnk/lnklib.S
 librtemsbsp_a_SOURCES += ../shared/liblnk/pmon.S
 #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_TX49.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/vectorexceptions.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/irq/vectorisrs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/interruptmask_TX49.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/rbtx4938/irq/vectorisrs.c b/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
deleted file mode 100644
index d38e4f81c2..0000000000
--- a/c/src/lib/libbsp/mips/rbtx4938/irq/vectorisrs.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *  @file
- *  
- *  TX4925 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 <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_default_isr( int vector );
-
-void mips_vector_isr_handlers( CPU_Interrupt_frame *frame )
-{
-  unsigned int sr;
-  unsigned int cause;
-  unsigned int pending;
-
-  mips_get_sr( sr );
-  mips_get_cause( cause );
-
-  pending = (cause & sr & 0x700) >> CAUSE_IPSHIFT;
-
-  if ( pending & 0x4 ) {     /* (IP[2] == 1) ==> IP[3-7] are valid */
-    unsigned int v = (cause >> (CAUSE_IPSHIFT + 3)) & 0x1f;
-    bsp_interrupt_handler_dispatch( MIPS_INTERRUPT_BASE + v );
-  }
-
-  if ( pending & 0x01 )       /* IP[0] */
-    bsp_interrupt_handler_dispatch( TX4938_IRQ_SOFTWARE_1 );
-
-  if ( pending & 0x02 )       /* IP[1] */
-    bsp_interrupt_handler_dispatch( TX4938_IRQ_SOFTWARE_2 );
-}
-
-void mips_default_isr( int vector )
-{
-  unsigned int sr;
-  unsigned int cause;
-
-  mips_get_sr( sr );
-  mips_get_cause( cause );
-
-  printk( "Unhandled isr exception: vector 0x%02x, cause 0x%08X, sr 0x%08X\n",
-      vector, cause, sr );
-
-  while(1);	/* Lock it up */
-
-  rtems_fatal_error_occurred(1);
-}
-