From 20bac141ca69e620c72e259707679d93a5c007e8 Mon Sep 17 00:00:00 2001
From: bg- <bg->
Date: Thu, 17 Aug 2006 15:41:13 +0000
Subject: [PATCH] Use LPM4_EXIT to return from sleep on msp430.

---
 cpu/msp430/button.c       | 6 ++----
 cpu/msp430/cc2420_uart0.c | 5 ++---
 cpu/msp430/clock.c        | 6 ++----
 cpu/msp430/slip_uart1.c   | 5 ++---
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/cpu/msp430/button.c b/cpu/msp430/button.c
index 65764af72..00f57bce6 100644
--- a/cpu/msp430/button.c
+++ b/cpu/msp430/button.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: button.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
+ * @(#)$Id: button.c,v 1.2 2006/08/17 15:41:13 bg- Exp $
  */
 
 #include <io.h>
@@ -34,8 +34,6 @@
 
 #include "contiki.h"
 
-#include "dev/lpm.h"
-
 #include "dev/button.h"
 
 #define BUTTON_PORT 2
@@ -75,6 +73,6 @@ __button_interrupt(void)
     if(selecting_proc != NULL) {
       process_post(selecting_proc, PROCESS_EVENT_MSG, &button_msg);
     }
-    LPM_AWAKE();
+    LPM4_EXIT;
   }
 }
diff --git a/cpu/msp430/cc2420_uart0.c b/cpu/msp430/cc2420_uart0.c
index d828b907c..0498d85e0 100644
--- a/cpu/msp430/cc2420_uart0.c
+++ b/cpu/msp430/cc2420_uart0.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: cc2420_uart0.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
+ * @(#)$Id: cc2420_uart0.c,v 1.2 2006/08/17 15:41:13 bg- Exp $
  */
 
 #include <io.h>
@@ -35,7 +35,6 @@
 #include "contiki.h"
 #include "contiki-net.h"
 
-#include "dev/lpm.h"
 #include "dev/spi.h"
 #include "dev/cc2420.h"
 
@@ -43,7 +42,7 @@ interrupt(PORT1_VECTOR)
 __fifop_interrupt(void)
 {
   if(__cc2420_intr())
-    LPM_AWAKE();
+    LPM4_EXIT;
 }
 
 void
diff --git a/cpu/msp430/clock.c b/cpu/msp430/clock.c
index 5e47da13e..30a2dd5c4 100644
--- a/cpu/msp430/clock.c
+++ b/cpu/msp430/clock.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: clock.c,v 1.2 2006/08/17 15:25:46 bg- Exp $
+ * @(#)$Id: clock.c,v 1.3 2006/08/17 15:41:13 bg- Exp $
  */
 
 
@@ -37,8 +37,6 @@
 
 #include "contiki-conf.h"
 
-#include "dev/lpm.h"
-
 #include "sys/clock.h"
 #include "sys/etimer.h"
 
@@ -58,7 +56,7 @@ interrupt(TIMERA1_VECTOR) timera1 (void) {
     if(etimer_pending()
        && (etimer_next_expiration_time() - count) >= MAX_TICKS) {
       etimer_request_poll();
-      LPM_AWAKE();
+      LPM4_EXIT;
     }
   }
 }
diff --git a/cpu/msp430/slip_uart1.c b/cpu/msp430/slip_uart1.c
index aedd34e47..46e4faa49 100644
--- a/cpu/msp430/slip_uart1.c
+++ b/cpu/msp430/slip_uart1.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: slip_uart1.c,v 1.1 2006/06/17 22:41:21 adamdunkels Exp $
+ * @(#)$Id: slip_uart1.c,v 1.2 2006/08/17 15:41:13 bg- Exp $
  */
 
 /*
@@ -38,7 +38,6 @@
 
 #include "contiki.h"
 
-#include "dev/lpm.h"
 #include "dev/slip.h"
 
 void
@@ -160,6 +159,6 @@ __uart1_intr()
     dummy = RXBUF1;   /* Clear error flags by forcing a dummy read. */
   } else {
     if(slip_input_byte(RXBUF1))
-      LPM_AWAKE();
+      LPM4_EXIT;
   }
 }