X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fplatforms%2Ftelosb.h;h=9f99ab195d24bddf2ad79bdd4ba6bd6bf5d595a1;hp=51c07224cfd409a8546a7b6ccc34a97aae203f5d;hb=570814d366bb09abdb5e727538c06502752b419c;hpb=ed8fe6653a821e893857c9491d576b8c6dee8dad

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 51c0722..9f99ab1 100644
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -8,8 +8,8 @@
 
 */
 
-#ifdef MSP430
-#include <io.h>
+#ifndef _GNU_ASSEMBLER_
+#include <msp430.h>
 #endif
 
 //LED on P5.4 (LED1 red)
@@ -31,6 +31,26 @@
 #define SPIIN  P3IN
 #define SPIREN P3REN
 
+/* INITPLATFORM         PX.7  PX.6  PX.5  PX.4  PX.3  PX.2  PX.1  PX.0
+                        HUM   HUM   HUM   RGIO1 RGIO0 PDVCC UART1TX PKT_INT
+  P1DIR = 0xe0 11100000 Out   Out   Out   In    In    In    In    In
+  P1OUT = 0x00                                              Out??
+                        UsrInt GIO3 NC    1Wire GIO2 UART1RX GIO1 GIO0
+  P2DIR = 0x7b 01111011 In    Out   Out   Out   Out   In    Out   Out
+  P2OUT = 0x10 00010000                   Hi
+                        U1RX  U1TX  U0RX  U0TX  RSCLK R_SO  R_SI  NC
+  P3DIR = 0xf1 11110001 Out   Out   Out   Out   In    In    In    Out
+  P3OUT = 0x00
+                        FHold RRST RVREFEN F_CS NC    R_CS  R_SFD NC
+  P4DIR = 0xfd 11111101 Out   Out   Out   Out   Out   Out   In    Out
+  P4OUT = 0xfd 11111101 Hi    Hi    Hi    Hi    Hi    Hi    Lo    Hi
+                        SVSoutLED3  LED2  LED1  NC    NC    NC    NC
+  P5DIR = 0xff 11111111 Out   Out   Out   Out   Out   Out   Out   Out
+  P5OUT = 0xff 11111111 Hi    Hi    Hi    Hi    Hi    Hi    Hi    Hi
+                        SVSin DAC0  ADC5  ADC4  ADC3  ADC2  ADC1  ADC0
+  P6DIR = 0xff 11111111 Out   Out   Out   Out   Out   Out   Out   Out
+  P6OUT = 0x00
+*/
 
 /* For the radio to be used:
    4.6 (!RST) must be low
@@ -77,13 +97,6 @@
 #define FIFOP (P1IN&BIT0)
 #define FIFO  (P1IN&BIT3)
 
-//GPIO Expansion Pins
-#define GIO0  (P2OUT&BIT0)
-#define GIO0HIGH P2OUT|=BIT0
-#define GIO0LOW P2OUT&=~BIT0
-#define GIO0OUT P2OUT
-#define GIO0DIR P2DIR
-#define GIO0PIN BIT0
 
 // network byte order converters
 #define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \