io.h is deprecated, so now msp430.h is included instead.

[goodfet] / firmware / include / gfports.h

diff --git a/firmware/include/gfports.h b/firmware/include/gfports.h
index 59fe4ce..c491601 100644 (file)
--- a/firmware/include/gfports.h
+++ b/firmware/include/gfports.h
@@ -6,29 +6,21 @@
 #ifndef GFPORTS
 #define GFPORTS
 
-#include <io.h>
+//#include <msp430.h>
 
-// N.B., only asm-clean CPP definitions allowed.
 
-//Use P3 instead of P5 for target I/O on chips without P5.
-#ifndef __MSP430_HAS_PORT5__
-#ifndef __MSP430_HAS_PORT5_R__
-#warning "No P5, using P3 instead.  Will break 2618 and 1612 support."
-#define P5OUT P3OUT
-#define P5DIR P3DIR
-#define P5REN P3REN
-#define P5IN P3IN
+// N.B., only asm-clean CPP definitions allowed.
 
-#endif
-#endif
 
-//Use false P5REN for 1612.
-#ifdef __MSP430_HAS_PORT5__
-#ifndef __MSP430_HAS_PORT5_R__
-#warning "1xx, using fake P5REN for external pulling resistors."
-#define P5REN P5OUT
-#endif
+/*
+//Use these instead of the explicit names.
+#ifdef MSP430
+#define gfout P5OUT
+#define gfin  P5IN
+#define gfdir P5DIR
+#define gfren P5REN
 #endif
+*/
 
 
 #endif //GFPORTS