From e01b1f1f1eeff80a2670e0c7d52619e7dd5a85e2 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 8 Jan 2011 13:40:44 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2617 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/IAR/ARMCMx/chcore_v6m.h | 4 ++-- os/ports/IAR/ARMCMx/chcoreasm_v6m.s | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'os/ports/IAR/ARMCMx') 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 -- cgit v1.2.3