X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fplatforms%2Fgoodfet.h;h=14f9df823d423c2af9b91fe3d534e3ef43411c8c;hp=9364dbb173b2b977da620e596a694e2c5eb4b32e;hb=19c84b41b9fbde102aee56bc137a8a2885194ebf;hpb=87fdfdcad02b7ada70fc1681d63e2ed2359dbfe9;ds=sidebyside

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 9364dbb..14f9df8 100644
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -3,10 +3,17 @@
   \brief Port descriptions for the GoodFET platform.
 */
 
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
+/* #ifdef __MSPGCC__ */
+/* #include <msp430.h> */
+/* #else */
+/* #include <signal.h> */
+/* #include <msp430.h> */
+/* #include <iomacros.h> */
+/* #endif */
 
+#ifndef _GNU_ASSEMBLER_
+#include <msp430.h>
+#endif
 
 //LED on P1.0
 #define PLEDOUT P1OUT
@@ -14,12 +21,24 @@
 #define PLEDPIN BIT0
 
 //Use P3 instead of P5 for target I/O on chips without P5.
-#ifdef msp430x2274
+#ifdef msp430f2274
 //#warning "No P5, using P3 instead.  Will break 2618 and 1612 support."
 #define P5OUT P3OUT
 #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.
@@ -32,9 +51,19 @@
 #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
+