From e124c142f2e1bd19841dd3652046499157a31717 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 27 Jul 2011 00:18:23 +0200 Subject: [PATCH] Fix more instances of wrong define used --- firmware/applications/iggy.c | 2 +- firmware/core/lpc134x.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/applications/iggy.c b/firmware/applications/iggy.c index 97b03b4..6523f0a 100644 --- a/firmware/applications/iggy.c +++ b/firmware/applications/iggy.c @@ -142,7 +142,7 @@ void main_iggy(void) { gpioSetValue (RB_LCD_BL, 0); SCB_SCR |= SCB_SCR_SLEEPDEEP; PMU_PMUCTRL = PMU_PMUCTRL_DPDEN_DEEPPOWERDOWN; -#ifdef ARM +#ifdef __arm__ __asm volatile ("WFI"); #endif }else{ diff --git a/firmware/core/lpc134x.h b/firmware/core/lpc134x.h index 5a7332e..96903ae 100644 --- a/firmware/core/lpc134x.h +++ b/firmware/core/lpc134x.h @@ -1937,7 +1937,7 @@ typedef struct #define NVIC ((NVIC_Type *) NVIC_BASE_ADDRESS) -#ifdef ARM +#ifdef __arm__ static inline void __enable_irq() { __asm volatile ("cpsie i"); } static inline void __disable_irq() { __asm volatile ("cpsid i"); } #else