From c58fc8c9fb5e1d937dd554ac25462750275b73dd Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Tue, 14 Aug 2012 18:58:48 +0000
Subject: [PATCH] Fixed Z1 wiring, eliminated unused TelosB/Z1 definitions.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1220 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 firmware/platforms/telosb.h |  7 -------
 firmware/platforms/z1.h     | 15 +++++----------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 56595ab..9f99ab1 100644
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -97,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) | \
diff --git a/firmware/platforms/z1.h b/firmware/platforms/z1.h
index 999aa63..cce9b5f 100644
--- a/firmware/platforms/z1.h
+++ b/firmware/platforms/z1.h
@@ -40,12 +40,14 @@
 #define INITPLATFORM \
   P1DIR = 0xe0;\
   P1OUT = 0x00;\
+  P1REN = 0x0F;\
   P2DIR = 0x7b;\
   P2OUT = 0x10;\
   P3DIR = 0xf1;\
   P3OUT = 0x00;\
   P4DIR = 0xfd;\
-  P4OUT = 0xFd;\
+  P4OUT = ~0x02;\
+  P4REN = 0x02;\
   P5DIR = 0xff;\
   P5OUT = 0xff;\
   P6DIR = 0xff;\
@@ -72,17 +74,10 @@
 #define DIRCE P4DIR|=BIT6
 
 //CC2420 signals
-#define SFD   (P4IN&BIT1)
-#define FIFOP (P1IN&BIT0)
+#define SFD   (P4IN&BIT1) //Might be broken on the Z1.
+#define FIFOP (P1IN&BIT2) // Was 1.0, mistakenly.
 #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) | \
-- 
2.20.1