Fixed Port 5 bug, critical.

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

diff --git a/firmware/include/gfports.h b/firmware/include/gfports.h
index 8891c1a..a55e787 100644 (file)
--- a/firmware/include/gfports.h
+++ b/firmware/include/gfports.h
@@ -6,9 +6,7 @@
 #ifndef GFPORTS
 #define GFPORTS
 
 #ifndef GFPORTS
 #define GFPORTS
 

-#ifdef MSP430

 #include <io.h>
 #include <io.h>

-#endif

 
 // N.B., only asm-clean CPP definitions allowed.
 
 
 // N.B., only asm-clean CPP definitions allowed.
 

diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index 04c37a7..134a082 100644 (file)
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -6,9 +6,15 @@
   definition file, such as msp430x1612.c or msp430x2618.c.
 */
 
   definition file, such as msp430x1612.c or msp430x2618.c.
 */
 

-#include "config.h"
+

 #include "gfports.h"
 
 #include "gfports.h"
 

+#include <signal.h>
+#include <io.h>
+#include <iomacros.h>
+
+#include "config.h"
+

 #ifdef telosb
 //TelosB uses second serial port.
 #define serial_tx serial1_tx
 #ifdef telosb
 //TelosB uses second serial port.
 #define serial_tx serial1_tx

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 3186ef2..5358759 100644 (file)
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -3,10 +3,9 @@
   \brief Port descriptions for the GoodFET platform.
 */
 
   \brief Port descriptions for the GoodFET platform.
 */
 

-#ifdef MSP430
+#include <signal.h>

 #include <io.h>
 #include <io.h>

-#endif
-
+#include <iomacros.h>

 
 
 //LED on P1.0
 
 
 //LED on P1.0


@@ -15,7 +14,7 @@
 #define PLEDPIN BIT0
 
 //Use P3 instead of P5 for target I/O on chips without P5.
 #define PLEDPIN BIT0
 
 //Use P3 instead of P5 for target I/O on chips without P5.

-#ifndef __MSP430_HAS_PORT5__
+#ifdef msp430x2274

 //#warning "No P5, using P3 instead.  Will break 2618 and 1612 support."
 #define P5OUT P3OUT
 #define P5DIR P3DIR
 //#warning "No P5, using P3 instead.  Will break 2618 and 1612 support."
 #define P5OUT P3OUT
 #define P5DIR P3DIR