X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fplatforms%2Fgoodfet.h;h=8e4249c7aa3c089146b056c7b1f6f8211e64dbd6;hb=c2f96e2641f1cc8c2bc900c01432232c55568c72;hp=53587598f752f881df1ac6fa512b7bd6669cfc7e;hpb=71abac14fc0eab6aa9f2d6f26c54fe1236b1d6bd;p=goodfet

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 5358759..8e4249c 100644
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -3,10 +3,13 @@
   \brief Port descriptions for the GoodFET platform.
 */
 
+#ifdef __MSPGCC__
+#include <msp430.h>
+#else
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
-
+#endif
 
 //LED on P1.0
 #define PLEDOUT P1OUT
@@ -20,16 +23,43 @@
 #define P5DIR P3DIR
 #define P5IN P3IN
 #define P5REN P3REN
+
+#define SPIOUT P3OUT
+#define SPIDIR P3DIR
+#define SPIIN  P3IN
+#define SPIREN P3REN
+#else
+
+#define SPIOUT P5OUT
+#define SPIDIR P5DIR
+#define SPIIN  P5IN
+#define SPIREN P5REN
+
 #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
 #define DIRSS P5DIR|=BIT0;
 
-//BIT5 is Chip Enable.  Need to document this
-//#define RADIOACTIVE  P5OUT|=BIT5
-//#define RADIOPASSIVE P5OUT&=~BIT5
-#define SETCE P5OUT|=BIT5
-#define CLRCE P5OUT&=~BIT5
-#define DIRCE P5DIR|=BIT5
+//Used for the Nordic port, !RST pin on regular GoodFET.
+#define SETCE P2OUT|=BIT6
+#define CLRCE P2OUT&=~BIT6
+#define DIRCE P2DIR|=BIT6
+
+// network byte order converters
+#define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \
+				 (((uint16_t)(x) & 0x00FF) << 8))
+#define htonl(x) ((((uint32_t)(x) & 0xFF000000) >> 24) | \
+				  (((uint32_t)(x) & 0x00FF0000) >> 8) | \
+				  (((uint32_t)(x) & 0x0000FF00) << 8) | \
+				  (((uint32_t)(x) & 0x000000FF) << 24))
+
+#define ntohs htons
+#define ntohl htonl
+