aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-08-07 11:06:32 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-08-07 11:06:32 +0000
commit64373e1f79a015b0c95355b5f6f0d9f09292b5a3 (patch)
tree8c88585e39f3902910d674a04edf110d344883ce
parentad4879051e7498324fe220e972de35e35b6cc473 (diff)
downloadChibiOS-64373e1f79a015b0c95355b5f6f0d9f09292b5a3.tar.gz
ChibiOS-64373e1f79a015b0c95355b5f6f0d9f09292b5a3.tar.bz2
ChibiOS-64373e1f79a015b0c95355b5f6f0d9f09292b5a3.zip
Fixed bug 3041117.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2117 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v6m.h6
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v7m.h6
-rw-r--r--readme.txt2
3 files changed, 6 insertions, 8 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.h b/os/ports/GCC/ARMCMx/chcore_v6m.h
index 1a086b2bf..c2d9cb618 100644
--- a/os/ports/GCC/ARMCMx/chcore_v6m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v6m.h
@@ -159,16 +159,14 @@ struct intctx {
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_IRQ_HANDLER(id) \
- __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_IRQ_HANDLER(id) void id(void)
/**
* @brief Fast IRQ handler function declaration.
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_FAST_IRQ_HANDLER(id) \
- __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_FAST_IRQ_HANDLER(id) void id(void)
/**
* @brief Port-related initialization code.
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index 8b52152bd..10e076b4f 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -133,16 +133,14 @@ struct intctx {
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_IRQ_HANDLER(id) \
- __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_IRQ_HANDLER(id) void id(void)
/**
* @brief Fast IRQ handler function declaration.
* @note @p id can be a function name or a vector number depending on the
* port implementation.
*/
-#define PORT_FAST_IRQ_HANDLER(id) \
- __attribute__((interrupt("IRQ"))) void id(void)
+#define PORT_FAST_IRQ_HANDLER(id) void id(void)
/**
* @brief Port-related initialization code.
diff --git a/readme.txt b/readme.txt
index eef15c675..ea28c9a99 100644
--- a/readme.txt
+++ b/readme.txt
@@ -62,6 +62,8 @@
*****************************************************************************
*** 2.1.2 ***
+- FIX: Corrupted IRQ stack in Cortex-Mx port (bug 3041117)(backported to
+ 2.0.3).
- FIX: Fixed a documentation error regarding the ADC driver function
adcStartConversion() (bug 3039890)(backported to 2.0.3).
- NEW: Added a simple STM32 ADC demo under ./testhal/STM32/ADC.