bsps: Move interrupt controller support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

3 files changed, 4 insertions, 174 deletions

diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index c1f33ae67f..57ffe00383 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -65,10 +65,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspstart.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq.c
-librtemsbsp_a_SOURCES += ../shared/armv7m/irq/armv7m-irq-dispatch.c
-librtemsbsp_a_SOURCES += irq/irq.c
-librtemsbsp_a_SOURCES += irq/irq-dispatch.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/irq/irq-dispatch-armv7m.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/irq/irq-dispatch.c
 
 # Console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termios-init.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c b/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c
deleted file mode 100644
index 66d05fdf9d..0000000000
--- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq-dispatch.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief LPC24XX interrupt support.
- */
-
-/*
- * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
- *
- * 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/score/armv4.h>
-
-#include <bsp.h>
-#include <bsp/irq.h>
-#include <bsp/irq-generic.h>
-#include <bsp/lpc24xx.h>
-
-#ifdef ARM_MULTILIB_ARCH_V4
-
-void bsp_interrupt_dispatch(void)
-{
-  /* Read current vector number */
-  rtems_vector_number vector = VICVectAddr;
-
-  /* Enable interrupts in program status register */
-  uint32_t psr = _ARMV4_Status_irq_enable();
-
-  /* Dispatch interrupt handlers */
-  bsp_interrupt_handler_dispatch(vector);
-
-  /* Restore program status register */
-  _ARMV4_Status_restore(psr);
-
-  /* Acknowledge interrupt */
-  VICVectAddr = 0;
-}
-
-#endif /* ARM_MULTILIB_ARCH_V4 */
diff --git a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c b/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
deleted file mode 100644
index 7801c37843..0000000000
--- a/c/src/lib/libbsp/arm/lpc24xx/irq/irq.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief LPC24XX interrupt support.
- */
-
-/*
- * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
- *
- * 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/score/armv4.h>
-#include <rtems/score/armv7m.h>
-
-#include <bsp.h>
-#include <bsp/irq.h>
-#include <bsp/irq-generic.h>
-#include <bsp/lpc24xx.h>
-#include <bsp/linker-symbols.h>
-
-static inline bool lpc24xx_irq_is_valid(rtems_vector_number vector)
-{
-  return vector <= BSP_INTERRUPT_VECTOR_MAX;
-}
-
-void lpc24xx_irq_set_priority(rtems_vector_number vector, unsigned priority)
-{
-  if (lpc24xx_irq_is_valid(vector)) {
-    if (priority > LPC24XX_IRQ_PRIORITY_VALUE_MAX) {
-      priority = LPC24XX_IRQ_PRIORITY_VALUE_MAX;
-    }
-
-    #ifdef ARM_MULTILIB_ARCH_V4
-      VICVectPriorityBase [vector] = priority;
-    #else
-      _ARMV7M_NVIC_Set_priority((int) vector, (int) (priority << 3));
-    #endif
-  }
-}
-
-unsigned lpc24xx_irq_get_priority(rtems_vector_number vector)
-{
-  if (lpc24xx_irq_is_valid(vector)) {
-    #ifdef ARM_MULTILIB_ARCH_V4
-      return VICVectPriorityBase [vector];
-    #else
-      return (unsigned) (_ARMV7M_NVIC_Get_priority((int) vector) >> 3);
-    #endif
-  } else {
-    return LPC24XX_IRQ_PRIORITY_VALUE_MIN - 1U;
-  }
-}
-
-#ifdef ARM_MULTILIB_ARCH_V4
-
-void bsp_interrupt_vector_enable(rtems_vector_number vector)
-{
-  bsp_interrupt_assert(bsp_interrupt_is_valid_vector(vector));
-  VICIntEnable = 1U << vector;
-}
-
-void bsp_interrupt_vector_disable(rtems_vector_number vector)
-{
-  bsp_interrupt_assert(bsp_interrupt_is_valid_vector(vector));
-  VICIntEnClear = 1U << vector;
-}
-
-rtems_status_code bsp_interrupt_facility_initialize(void)
-{
-  volatile uint32_t *addr = VICVectAddrBase;
-  volatile uint32_t *prio = VICVectPriorityBase;
-  rtems_vector_number i = 0;
-
-  /* Disable all interrupts */
-  VICIntEnClear = 0xffffffff;
-
-  /* Clear all software interrupts */
-  VICSoftIntClear = 0xffffffff;
-
-  /* Use IRQ category */
-  VICIntSelect = 0;
-
-  for (i = BSP_INTERRUPT_VECTOR_MIN; i <= BSP_INTERRUPT_VECTOR_MAX; ++i) {
-    /* Use the vector address register to store the vector number */
-    addr [i] = i;
-
-    /* Give vector lowest priority */
-    prio [i] = 15;
-  }
-
-  /* Reset priority mask register */
-  VICSWPrioMask = 0xffff;
-
-  /* Acknowledge interrupts for all priorities */
-  for (
-    i = LPC24XX_IRQ_PRIORITY_VALUE_MIN;
-    i <= LPC24XX_IRQ_PRIORITY_VALUE_MAX;
-    ++i
-  ) {
-    VICVectAddr = 0;
-  }
-
-  /* Install the IRQ exception handler */
-  _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL);
-
-  return RTEMS_SUCCESSFUL;
-}
-
-#endif /* ARM_MULTILIB_ARCH_V4 */