From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Fri, 23 Dec 2011 16:28:55 +0000 (+0000)
Subject: More fixed for TelosB and telosbbt.
X-Git-Url: http://git.rot13.org//?p=goodfet;a=commitdiff_plain;h=2ff5698bfa62a906813b899f91e1c89b30242798

More fixed for TelosB and telosbbt.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1073 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/config.mk b/firmware/config.mk
index 0392839..2a26346 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -42,18 +42,16 @@ mcu := msp430x5510
 platform := goodfet
 endif
 
-ifneq (,$(findstring $(board),telosb))
-mcu :=msp430x1612
-platform := goodfet
-CFLAGS := -Dtelosb
-#CFLAGS+= -Werror
+ifeq ($(board),telosb)
+mcu := msp430x1612
+platform := telosb
 config := monitor spi ccspi
+CFLAGS += -Duseuart1
 endif
 
-ifneq (,$(findstring $(board),telosbbt))
+ifeq ($(board),telosbbt)
 mcu :=msp430x1612
-platform := goodfet
-#CFLAGS+= -Werror
+platform := telosb
 config := monitor spi ccspi
 endif
 
diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index c138e0d..75f84a4 100644
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -32,14 +32,14 @@ void led_toggle();
 
 #include "config.h"
 
-#ifdef telosb
+#ifdef useuart1
 //TelosB uses second serial port.
 #define serial_tx serial1_tx
 #define serial_rx serial1_rx
 #define setbaud setbaud1
 #define msp430_init_uart msp430_init_uart1
 #else
-//Other targets use first.
+//Other targets use first uart.
 #define serial_tx serial0_tx
 #define serial_rx serial0_rx
 #define setbaud setbaud0
diff --git a/firmware/lib/msp430_serial.c b/firmware/lib/msp430_serial.c
index 9a9885d..856a2e1 100644
--- a/firmware/lib/msp430_serial.c
+++ b/firmware/lib/msp430_serial.c
@@ -5,6 +5,8 @@
  * serput{c,s} sergetc functionality as on UNIX
  */
 
+//FIXME This should switch to the standard GoodFET functions for the msp430f161x chips.
+
 #include "platform.h"
 #include <signal.h>
 #include <io.h>