From 3ae01fd47b63b190ee6d7588d8721e8edad3d150 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 19 Nov 2010 18:45:11 +0000
Subject: ARM7/9 port update, other improvements.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2389 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/ports/GCC/ARM/AT91SAM7/armparams.h | 55 +++++++++++++++++++++++++++++++++++
 os/ports/GCC/ARM/AT91SAM7/vectors.s   | 31 +++++++++++++++++++-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 os/ports/GCC/ARM/AT91SAM7/armparams.h

(limited to 'os/ports/GCC/ARM/AT91SAM7')

diff --git a/os/ports/GCC/ARM/AT91SAM7/armparams.h b/os/ports/GCC/ARM/AT91SAM7/armparams.h
new file mode 100644
index 000000000..8b53605ea
--- /dev/null
+++ b/os/ports/GCC/ARM/AT91SAM7/armparams.h
@@ -0,0 +1,55 @@
+/*
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+
+    This file is part of ChibiOS/RT.
+
+    ChibiOS/RT 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 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/RT 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, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file    ARM/AT91SAM7/armparams.h
+ * @brief   ARM7 AT91SAM7 Specific Parameters.
+ *
+ * @defgroup ARM_AT91SAM7 AT91SAM7 Specific Parameters
+ * @ingroup ARM_SPECIFIC
+ * @details This file contains the ARM specific parameters for the
+ *          AT91SAM7 platform.
+ * @{
+ */
+
+#ifndef _ARMPARAMS_H_
+#define _ARMPARAMS_H_
+
+/**
+ * @brief   ARM core model.
+ */
+#define ARM_CORE                ARM_CORE_ARM7TDMI
+
+/**
+ * @brief   AT91SAM7-specific wait for interrupt.
+ * @details This implementation writes 1 into the PMC_SCDR register.
+ */
+#if !defined(port_wait_for_interrupt) || defined(__DOXYGEN__)
+#if ENABLE_WFI_IDLE || defined(__DOXYGEN__)
+#define port_wait_for_interrupt() {                                         \
+  (*((volatile uint32_t *)0xFFFFFC04)) = 1;                                 \
+}
+#else
+#define port_wait_for_interrupt()
+#endif
+#endif
+
+#endif /* _ARMPARAMS_H_ */
+
+/** @} */
diff --git a/os/ports/GCC/ARM/AT91SAM7/vectors.s b/os/ports/GCC/ARM/AT91SAM7/vectors.s
index ee0c01a19..f27ecd0dd 100644
--- a/os/ports/GCC/ARM/AT91SAM7/vectors.s
+++ b/os/ports/GCC/ARM/AT91SAM7/vectors.s
@@ -17,6 +17,29 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/**
+ * @file    ARM/AT91SAM7/vectors.s
+ * @brief   Interrupt vectors for the AT91SAM7 family.
+ *
+ * @defgroup ARM_AT91SAM7_VECTORS AT91SAM7 Interrupt Vectors
+ * @ingroup ARM_SPECIFIC
+ * @details Interrupt vectors for the AT91SAM7 family.
+ * @{
+ */
+
+#if defined(__DOXYGEN__)
+/**
+ * @brief   Unhandled exceptions handler.
+ * @details Any undefined exception vector points to this function by default.
+ *          This function simply stops the system into an infinite loop.
+ *
+ * @notapi
+ */
+void _unhandled_exception(void) {}
+#endif
+
+#if !defined(__DOXYGEN__)
+
 .section vectors
 .code 32
 .balign 4
@@ -71,4 +94,10 @@ AbortHandler:
 .weak FiqHandler
 FiqHandler:
 
-.loop:  b       .loop
+.global _unhandled_exception
+_unhandled_exception:
+        b       _unhandled_exception
+
+#endif
+
+/** @} */
-- 
cgit v1.2.3