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

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index e9ba90e..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,7 +21,7 @@
 #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