Fixed 2274 support.

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

diff --git a/firmware/apps/jtag/jtag430asm.S b/firmware/apps/jtag/jtag430asm.S
index 7e4aabf..397cf38 100644 (file)
--- a/firmware/apps/jtag/jtag430asm.S
+++ b/firmware/apps/jtag/jtag430asm.S
@@ -2,7 +2,7 @@
 .type jtag430_tclk_flashpulses,@function //for linking
 
 #define _GNU_ASSEMBLER_
-#include "gfports.h"
+#include "config.h"
 
 //This detects model, chooses appropriate timing.
 jtag430_tclk_flashpulses:

diff --git a/firmware/apps/jtag/sbw.c b/firmware/apps/jtag/sbw.c
index bdc025c..efbc401 100644 (file)
--- a/firmware/apps/jtag/sbw.c
+++ b/firmware/apps/jtag/sbw.c
@@ -23,7 +23,6 @@ void sbwsetup(){
   */
 
   // tdio up, tck low
-  //   
   P5OUT &= ~SBWTCK;
   P5OUT |= SBWTDIO;
   P5DIR |= SBWTDIO|SBWTCK;

diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c
index bf68a58..6fdea29 100644 (file)
--- a/firmware/apps/radios/ccspi.c
+++ b/firmware/apps/radios/ccspi.c
@@ -1,6 +1,11 @@
 /*! \file ccspi.c
   \author Travis Goodspeed
   \brief Chipcon SPI Register Interface
+  
+  Unfortunately, there is very little similarity between the CC2420
+  and the CC2500, to name just two of the myriad of Chipcon SPI
+  radios.  Auto-detection will be a bit difficult, but more to the
+  point, all high level functionality must be moved into the client.
 */
 
 //Higher level left to client application.

diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index 26deae8..04c37a7 100644 (file)
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -7,7 +7,6 @@
 */
 
 #include "config.h"
-
 #include "gfports.h"
 
 #ifdef telosb

diff --git a/firmware/include/sbw.h b/firmware/include/sbw.h
index 3ca6063..4e1756c 100644 (file)
--- a/firmware/include/sbw.h
+++ b/firmware/include/sbw.h
@@ -3,6 +3,8 @@
   \brief Spy-Bi-Wire Stuff
 */
 
+#include "platform.h"
+
 //IO Pins; these are for EZ430, not GoodFET/UIF
 #define SBWTCK  BIT3
 #define SBWTDIO BIT2
@@ -41,7 +43,6 @@ void sbwSETTCLK();
 void sbwCLRTCLK();
 
 // Macros
-
 #define SBWCLK() do { \
     P5OUT &= ~SBWTCK; \
     asm("nop");              \

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 1408ed0..3186ef2 100644 (file)
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -14,7 +14,6 @@
 #define PLEDDIR P1DIR
 #define PLEDPIN BIT0
 
-
 //Use P3 instead of P5 for target I/O on chips without P5.
 #ifndef __MSP430_HAS_PORT5__
 //#warning "No P5, using P3 instead.  Will break 2618 and 1612 support."