From e9fb7dbba0d1abc23d14559e566da903331f1e8a Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Tue, 15 Jun 2010 01:52:23 +0000
Subject: [PATCH] Proper I/O ports with new firmware.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@632 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 firmware/platforms/goodfet.h | 8 ++++----
 firmware/platforms/nhbadge.h | 5 +++++
 firmware/platforms/telosb.h  | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 230b8b8..1408ed0 100644
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -1,9 +1,11 @@
 /*! \file goodfet.h
   \author Travis Goodspeed
   \brief Port descriptions for the GoodFET platform.
-  
 */
 
+#ifdef MSP430
+#include <io.h>
+#endif
 
 
 
@@ -15,13 +17,11 @@
 
 //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
-#endif
+#define P5REN P3REN
 #endif
 
 //No longer works for Hope badge.
diff --git a/firmware/platforms/nhbadge.h b/firmware/platforms/nhbadge.h
index 39f7964..24544b3 100644
--- a/firmware/platforms/nhbadge.h
+++ b/firmware/platforms/nhbadge.h
@@ -4,6 +4,11 @@
 */
 
 
+#ifdef MSP430
+#include <io.h>
+#endif
+
+
 //LED on P1.0
 #define PLEDOUT P1OUT
 #define PLEDDIR P1DIR
diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index c536b1c..59495eb 100644
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -8,6 +8,10 @@
 
 */
 
+#ifdef MSP430
+#include <io.h>
+#endif
+
 
 //LED on P1.0
 #define PLEDOUT P5OUT
-- 
2.20.1