2274 #ifndef screwed things up.

This patch breaks 2274 support, but fixes everything else.

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

diff --git a/firmware/Makefile b/firmware/Makefile
index 75ada15..3e8271d 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,9 +1,12 @@
 
 

-PORT=/dev/ttyUSB0
-BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(PORT) --speed=38400
+#include `uname`.mak

 
 

+GOODFET?=/dev/ttyUSB0
+BSL=../../contrib/tos-bsl --invert-reset --invert-test -c $(GOODFET) --speed=38400
+
+#mcu=msp430x2274

 #mcu=msp430x2618
 #mcu=msp430x2618

-mcu=msp430x1612
+mcu?=msp430x1612

 
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
 
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.

diff --git a/firmware/configure b/firmware/configure
new file mode 100755 (executable)
index 0000000..8767af6
--- /dev/null
+++ b/firmware/configure
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cat <<EOF
+Set $GOODFET to be the port of your GoodFET, such as
+GOODFET=/dev/cu.usbserial-*      #Darwin
+GOODFET=/dev/ttyUSB*             #Linux (Default)
+
+The MSP430F161x is targetted by default.  Build for others
+by setting one of the following.
+mcu=msp430x2618
+mcu=msp430x1612                  #MSP430F1612 or 1611
+mcu=msp430x2274                  #2272 or 2274
+
+EOF

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index c7ec7dd..8ce6108 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -5,9 +5,6 @@
 #include "command.h"\r
 #include "apps.h"\r
 \r
 #include "command.h"\r
 #include "apps.h"\r
 \r

-#include <signal.h>\r
-#include <io.h>\r
-#include <iomacros.h>\r

 \r
 \r
 //LED on P1.0\r
 \r
 \r
 //LED on P1.0\r

diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index f7e9246..f8efd75 100644 (file)
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -1,5 +1,19 @@
 //! \file platform.h
 
 //! \file platform.h
 

+#include <signal.h>
+#include <io.h>
+#include <iomacros.h>
+
+
+//Use P3 instead of P5 for target I/O on chips without P5.
+//#ifndef P5OUT
+//#warning "P5OUT undefined, using P3 instead."
+//#define P5OUT P3OUT
+//#define P5DIR P3DIR
+//#define P5REN P3REN
+//#define P5IN P3IN
+//#endif
+

 unsigned char serial_rx();
 void serial_tx(unsigned char);
 
 unsigned char serial_rx();
 void serial_tx(unsigned char);
 

diff --git a/firmware/lib/msp430x2274.c b/firmware/lib/msp430x2274.c
new file mode 100644 (file)
index 0000000..823cf02
--- /dev/null
+++ b/firmware/lib/msp430x2274.c
@@ -0,0 +1,4 @@
+
+//platform.h will handle patching Port 5 to be Port 3.
+
+#include "msp430x2618.c"