Add modified LPM3_EXIT_ISR to work around FLL IRQ wake-up problem

[oswald.git] / metawatch / mw_main.h

diff --git a/metawatch/mw_main.h b/metawatch/mw_main.h
index 902c4693347ca77fb972cf0ccdd780f9b760c8ba..8d02f7d1906dcbbf50926eba0ec28206e513cc12 100644 (file)
--- a/metawatch/mw_main.h
+++ b/metawatch/mw_main.h
@@ -1,6 +1,8 @@
 #ifndef _GCCFWTEST_LCD_H
 #define _GCCFWTEST_LCD_H
 
+#define MW_MAIN_VERSION "MW v0.4"
+
 #if defined MW_DEVBOARD_V2
 #include "hal_devboard_v2_defs.h"
 #elif defined MW_DIGITAL_V2
@@ -10,6 +12,7 @@
 #endif
 #include "hal_io_macros.h"
 
+#define LPM3_EXIT_ISR() { _BIC_SR_IRQ(SCG1+OSCOFF+CPUOFF); nop(); }
 
 #define WATCHDOG_EVENT         1 << 0
 #define RTC_1HZ_EVENT          1 << 1
@@ -19,6 +22,8 @@
 #define TIMER_100MS_EVENT      1 << 5
 #define POWER_SRC_EVENT                1 << 6
 #define BT_UART_RCV_EVENT      1 << 7
+#define BT_UART_WAKEUP_EVENT   1 << 8
+#define ACCEL_EVENT            1 << 9
 
 extern unsigned int _event_src;