From 2640f9bf267318fc356980bdda106efa36a3b1b5 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Wed, 18 Nov 2009 13:24:12 +0000
Subject: [PATCH] Must check error flag before reading. Removed leds debug.

---
 cpu/msp430/dev/uart1.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cpu/msp430/dev/uart1.c b/cpu/msp430/dev/uart1.c
index 2e8033640..e6b5f12d1 100644
--- a/cpu/msp430/dev/uart1.c
+++ b/cpu/msp430/dev/uart1.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: uart1.c,v 1.14 2009/10/30 15:06:27 adamdunkels Exp $
+ * @(#)$Id: uart1.c,v 1.15 2009/11/18 13:24:12 nifi Exp $
  */
 
 /*
@@ -37,7 +37,6 @@
 #include <io.h>
 #include <signal.h>
 
-#include "dev/leds.h"
 #include "sys/energest.h"
 #include "dev/uart1.h"
 #include "dev/watchdog.h"
@@ -174,14 +173,12 @@ uart1_rx_interrupt(void)
     rx_in_progress = 1;
     LPM4_EXIT;
   } else {
-    c = RXBUF1;
     rx_in_progress = 0;
     /* Check status register for receive errors. */
     if(URCTL1 & RXERR) {
-      volatile unsigned dummy;
-      leds_invert(LEDS_ALL);
-      //      dummy = RXBUF1;   /* Clear error flags by forcing a dummy read. */
+      c = RXBUF1;   /* Clear error flags by forcing a dummy read. */
     } else {
+      c = RXBUF1;
       if(uart1_input_handler != NULL) {
 	if(uart1_input_handler(c)) {
 	  LPM4_EXIT;