aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports/IAR/ARMCMx
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-08 13:40:44 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-08 13:40:44 +0000
commite01b1f1f1eeff80a2670e0c7d52619e7dd5a85e2 (patch)
tree94a0a5f68e38513ec4a38d986ae40b8e511443b7 /os/ports/IAR/ARMCMx
parentf1c970760f8cf9e5346a6dd02f0a6fbef88c0a6b (diff)
downloadChibiOS-e01b1f1f1eeff80a2670e0c7d52619e7dd5a85e2.tar.gz
ChibiOS-e01b1f1f1eeff80a2670e0c7d52619e7dd5a85e2.tar.bz2
ChibiOS-e01b1f1f1eeff80a2670e0c7d52619e7dd5a85e2.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2617 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/IAR/ARMCMx')
-rw-r--r--os/ports/IAR/ARMCMx/chcore_v6m.h4
-rw-r--r--os/ports/IAR/ARMCMx/chcoreasm_v6m.s4
2 files changed, 2 insertions, 6 deletions
diff --git a/os/ports/IAR/ARMCMx/chcore_v6m.h b/os/ports/IAR/ARMCMx/chcore_v6m.h
index fe6c68a92..9209fbaf4 100644
--- a/os/ports/IAR/ARMCMx/chcore_v6m.h
+++ b/os/ports/IAR/ARMCMx/chcore_v6m.h
@@ -190,12 +190,12 @@ struct intctx {
/**
* @brief Disables all the interrupt sources.
*/
-#define port_disable() __enable_interrupt()
+#define port_disable() __disable_interrupt()
/**
* @brief Disables the interrupt sources below kernel-level priority.
*/
-#define port_suspend() __enable_interrupt()
+#define port_suspend() __disable_interrupt()
/**
* @brief Enables all the interrupt sources.
diff --git a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
index c9ee6a0c8..5f0887960 100644
--- a/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
+++ b/os/ports/IAR/ARMCMx/chcoreasm_v6m.s
@@ -30,10 +30,6 @@
#define CORTEX_PRIORITY_MASK(n) ((n) << (8 - CORTEX_PRIORITY_BITS))
-#ifndef CORTEX_PRIORITY_SVCALL
-#define CORTEX_PRIORITY_SVCALL 1
-#endif
-
EXTCTX_SIZE SET 32
CONTEXT_OFFSET SET 12