X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fplatforms%2Fgoodfet.h;h=14f9df823d423c2af9b91fe3d534e3ef43411c8c;hp=8e4249c7aa3c089146b056c7b1f6f8211e64dbd6;hb=f4a366d95f96109559f0903611d7103c50cde3f7;hpb=350c674c6bcd97ec2f883b07e0cf49eb8a480183

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 8e4249c..14f9df8 100644
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -3,12 +3,16 @@
   \brief Port descriptions for the GoodFET platform.
 */
 
-#ifdef __MSPGCC__
+/* #ifdef __MSPGCC__ */
+/* #include <msp430.h> */
+/* #else */
+/* #include <signal.h> */
+/* #include <msp430.h> */
+/* #include <iomacros.h> */
+/* #endif */
+
+#ifndef _GNU_ASSEMBLER_
 #include <msp430.h>
-#else
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
 #endif
 
 //LED on P1.0
@@ -17,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