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

AVR includes were unmodified.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1086 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/apps/i2c/i2c.c b/firmware/apps/i2c/i2c.c
index c598f54..e58b266 100644 (file)
--- a/firmware/apps/i2c/i2c.c
+++ b/firmware/apps/i2c/i2c.c
@@ -14,7 +14,7 @@
 #include "i2c.h"
 
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 
 

diff --git a/firmware/apps/jscan/jscan.c b/firmware/apps/jscan/jscan.c
index 896a05f..44b43ff 100644 (file)
--- a/firmware/apps/jscan/jscan.c
+++ b/firmware/apps/jscan/jscan.c
@@ -10,7 +10,7 @@
 
 #if (platform != donbfet)
 # include <signal.h>
-# include <io.h>
+# include <msp430.h>
 # include <iomacros.h>
 #endif
 

diff --git a/firmware/apps/radios/nrf.c b/firmware/apps/radios/nrf.c
index e607bf6..76c396c 100644 (file)
--- a/firmware/apps/radios/nrf.c
+++ b/firmware/apps/radios/nrf.c
@@ -9,7 +9,7 @@
 #include "command.h"
 
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 
 #include "nrf.h"

diff --git a/firmware/apps/slc2/slc2.c b/firmware/apps/slc2/slc2.c
index 66b2fdd..5562b04 100644 (file)
--- a/firmware/apps/slc2/slc2.c
+++ b/firmware/apps/slc2/slc2.c
@@ -9,7 +9,7 @@
 #include <msp430.h>
 #else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #endif
 

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index b552ae7..bb1753a 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -12,7 +12,7 @@
 #include <msp430.h>
 #else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #endif
 

diff --git a/firmware/apps/twe/twe.c b/firmware/apps/twe/twe.c
index a51818e..dfd40a7 100644 (file)
--- a/firmware/apps/twe/twe.c
+++ b/firmware/apps/twe/twe.c
@@ -6,7 +6,7 @@
 #include "command.h"
 
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 
 #include "twe.h"

diff --git a/firmware/include/gfports.h b/firmware/include/gfports.h
index d38dd21..c491601 100644 (file)
--- a/firmware/include/gfports.h
+++ b/firmware/include/gfports.h
@@ -6,7 +6,7 @@
 #ifndef GFPORTS
 #define GFPORTS
 
-//#include <io.h>
+//#include <msp430.h>
 
 
 // N.B., only asm-clean CPP definitions allowed.

diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index 75f84a4..dfc4681 100644 (file)
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -19,7 +19,7 @@
 #include <msp430.h>
 #else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #endif
 

diff --git a/firmware/lib/msp430_serial.c b/firmware/lib/msp430_serial.c
index 856a2e1..7335a73 100644 (file)
--- a/firmware/lib/msp430_serial.c
+++ b/firmware/lib/msp430_serial.c
@@ -9,7 +9,7 @@
 
 #include "platform.h"
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #include "msp430_serial.h"
 

diff --git a/firmware/lib/msp430f1611.c b/firmware/lib/msp430f1611.c
index d577e50..945e330 100644 (file)
--- a/firmware/lib/msp430f1611.c
+++ b/firmware/lib/msp430f1611.c
@@ -6,7 +6,7 @@
 #include <msp430.h>
 #else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #endif
 

diff --git a/firmware/lib/tilaunchpad.c b/firmware/lib/tilaunchpad.c
index f858f39..40d2350 100644 (file)
--- a/firmware/lib/tilaunchpad.c
+++ b/firmware/lib/tilaunchpad.c
@@ -5,7 +5,7 @@
 
 #include "platform.h"
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 
 #define MSP430_CPU_SPEED 6000000UL

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index b2b5bec..46e0ecb 100644 (file)
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -7,7 +7,7 @@
 #include <msp430.h>
 #else
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 #endif
 

diff --git a/firmware/platforms/nhbadge.h b/firmware/platforms/nhbadge.h
index aee7dde..29e19a1 100644 (file)
--- a/firmware/platforms/nhbadge.h
+++ b/firmware/platforms/nhbadge.h
@@ -5,7 +5,7 @@
 
 
 #ifdef MSP430
-#include <io.h>
+#include <msp430.h>
 #endif
 
 

diff --git a/firmware/platforms/nhbadgeb.h b/firmware/platforms/nhbadgeb.h
index 771d288..1b86e4f 100644 (file)
--- a/firmware/platforms/nhbadgeb.h
+++ b/firmware/platforms/nhbadgeb.h
@@ -5,7 +5,7 @@
 
 
 #ifdef MSP430
-#include <io.h>
+#include <msp430.h>
 #endif
 
 //This nonsense is deprecated.

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 51c0722..213aa4b 100644 (file)
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -9,7 +9,7 @@
 */
 
 #ifdef MSP430
-#include <io.h>
+#include <msp430.h>
 #endif
 
 //LED on P5.4 (LED1 red)

diff --git a/firmware/platforms/tilaunchpad.h b/firmware/platforms/tilaunchpad.h
index 13a2572..fc28b60 100644 (file)
--- a/firmware/platforms/tilaunchpad.h
+++ b/firmware/platforms/tilaunchpad.h
@@ -46,7 +46,7 @@ P1.0 LED
 #define TI_LAUNCHPAD 1
 
 #include <signal.h>
-#include <io.h>
+#include <msp430.h>
 #include <iomacros.h>
 
 // Here is how I try to remember rs232 signaling