EM260 SPI support. Really needs to be cleaned up.

[goodfet] / firmware / platforms / goodfet.h

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 1408ed0..ba9b0c2 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


@@ -14,9 +13,8 @@
 #define PLEDDIR P1DIR
 #define PLEDPIN BIT0
 
 #define PLEDDIR P1DIR
 #define PLEDPIN BIT0
 

-

 //Use P3 instead of P5 for target I/O on chips without P5.
 //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


@@ -24,6 +22,11 @@
 #define P5REN P3REN
 #endif
 
 #define P5REN P3REN
 #endif
 

+//This is how things used to work, don't do it anymore.
+//#ifdef msp430x1612
+//#define P5REN somedamnedextern
+//#endif
+

 //No longer works for Hope badge.
 #define SETSS P5OUT|=BIT0
 #define CLRSS P5OUT&=~BIT0
 //No longer works for Hope badge.
 #define SETSS P5OUT|=BIT0
 #define CLRSS P5OUT&=~BIT0


@@ -35,3 +38,4 @@
 #define SETCE P5OUT|=BIT5
 #define CLRCE P5OUT&=~BIT5
 #define DIRCE P5DIR|=BIT5
 #define SETCE P5OUT|=BIT5
 #define CLRCE P5OUT&=~BIT5
 #define DIRCE P5DIR|=BIT5

+