LPC2xxx: Add Vectored Interrupt Controller (VIC) driver.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3417 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/arm/drv/vic_lpc2.c b/bertos/cpu/arm/drv/vic_lpc2.c
new file mode 100644 (file)
index 0000000..066e7fe
--- /dev/null
+++ b/bertos/cpu/arm/drv/vic_lpc2.c
@@ -0,0 +1,51 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ *
+ * \brief Vectored Interrupt Controller VIC driver.
+ *
+ * notest:arm
+ */
+#include "vic_lpc2.h"
+#include <cfg/log.h>
+
+
+void NORETURN vic_defaultHandler(void)
+{
+       IRQ_DISABLE;
+       LOG_ERR("Unhandled IRQ\n"
+               "VICIRQStatus %08lX\n"
+               "VICFIQStatus %08lX\n", VICIRQStatus, VICFIQStatus);
+       while (1)
+               PAUSE;
+}

diff --git a/bertos/cpu/arm/drv/vic_lpc2.h b/bertos/cpu/arm/drv/vic_lpc2.h
new file mode 100644 (file)
index 0000000..22a2bda
--- /dev/null
+++ b/bertos/cpu/arm/drv/vic_lpc2.h
@@ -0,0 +1,78 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ *
+ * \brief Vectored Interrupt Controller VIC driver.
+ */
+ 
+#ifndef DRV_VIC_LPC2_H
+#define DRV_VIC_LPC2_H
+
+#include <cfg/compiler.h>
+#include <cpu/irq.h>
+
+#if CPU_ARM_LPC2378
+       #include <io/lpc23xx.h>
+       #define vic_vector(i)   (*(&VICVectAddr0 + i))
+       #define vic_priority(i) (*(&VICVectCntl0 + i))
+       #define VIC_SRC_CNT 32
+       #define vic_enable(i)  do { ASSERT(i < VIC_SRC_CNT); VICIntEnable = BV(i); } while (0)
+       #define vic_disable(i) do { ASSERT(i < VIC_SRC_CNT); VICIntEnClr  = BV(i); } while (0)
+
+       typedef void vic_handler_t(void);
+       void vic_defaultHandler(void);
+
+       INLINE void vic_init(void)
+       {
+               IRQ_DISABLE;
+               /* Assign all sources to IRQ (not to FIQ) */
+               VICIntSelect = 0;
+               /* Disable all sw interrupts */
+               VICSoftIntClr = 0xFFFFFFFF;
+               /* Disable all interrupts */
+               VICIntEnClr = 0xFFFFFFFF;
+
+               for (int i = 0; i < VIC_SRC_CNT; i++)
+                       vic_vector(i) = (reg32_t)vic_defaultHandler;
+       }
+
+       INLINE void vic_setVector(int id, vic_handler_t *handler)
+       {
+               ASSERT(id < VIC_SRC_CNT);
+               vic_vector(id) = (reg32_t)handler;
+       }
+#else
+       #error Unknown CPU
+#endif
+
+#endif /* DRV_VIC_LPC2_H */

diff --git a/bertos/cpu/arm/hw/init_lpc2.c b/bertos/cpu/arm/hw/init_lpc2.c
index f08d2a326e032999590ec74193320a9eaddca728..033216d1d93540be4ea4430367c003c2f5022e38 100644 (file)
--- a/bertos/cpu/arm/hw/init_lpc2.c
+++ b/bertos/cpu/arm/hw/init_lpc2.c
@@ -36,6 +36,7 @@
  * notest:arm
  */
 #include <cpu/irq.h>
+#include <drv/vic_lpc2.h>
 #include <io/lpc23xx.h>
 
 #if CPU_FREQ != 72000000UL
@@ -119,3 +120,10 @@ void __init1(void)
        /* Memory accelerator module fully enabled */
        MAMCR = 0x02;
 }
+
+void __init2(void);
+
+void __init2(void)
+{
+       vic_init();
+}

diff --git a/bertos/cpu/arm/hw/vectors_lpc2.S b/bertos/cpu/arm/hw/vectors_lpc2.S
index d5568fb971dcc2225b2aac2628f73546c7f4b40c..1e6d3eb48bb71d182a027d6344efe968d7e8674b 100644 (file)
--- a/bertos/cpu/arm/hw/vectors_lpc2.S
+++ b/bertos/cpu/arm/hw/vectors_lpc2.S
@@ -35,6 +35,7 @@
  * \brief NXP LPC2xxx interrupt vectors.
  */
 
+#include <cpu/detect.h>
 #include "cfg/cfg_arch.h"
 #if defined(ARCH_NIGHTTEST) && (ARCH & ARCH_NIGHTTEST)
        /* Avoid errors during nigthly test */
@@ -54,8 +55,12 @@ __vectors:
         ldr     pc, _prefetch_abort  /* Prefetch abort */
         ldr     pc, _data_abort      /* Data abort */
         .word  0xb9205f88           /* In LPX2xxx, this location holds the checksum of the previous vectors */
-
+#if CPU_ARM_LPC2378
+        ldr     pc, [pc, #-0x120]    /* Use VIC */
+#else
+       #warning Check correct VICAddress register for this CPU, default set to 0xFFFFF030
         ldr     pc, [pc, #-0xFF0]    /* Use VIC */
+#endif
         ldr     pc, _fiq            /* Fast interrupt request */
 _init:
         .word   __init