Generalizing IO.

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

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index fc31038..3da3135 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -23,13 +23,13 @@
 
 //! Set up the pins for SPI mode.
 void spisetup(){
-  P5OUT|=SS;
-  P5DIR|=MOSI+SCK+SS;
+  SETSS;
+  P5DIR|=MOSI+SCK+BIT0; //BIT0 might be SS
   P5DIR&=~MISO;
   
   //Begin a new transaction.
-  P5OUT&=~SS; 
-  P5OUT|=SS;
+  CLRSS; 
+  SETSS;
 }
 
 
@@ -62,24 +62,24 @@ unsigned char spitrans8(unsigned char byte){
 void spiflash_wrten(){
   SETSS;
   /*
-  P5OUT&=~SS; //Drop !SS to begin transaction.
+  CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x04);//Write Disable
-  P5OUT|=SS;  //Raise !SS to end transaction.
+  SETSS;  //Raise !SS to end transaction.
   */
-  P5OUT&=~SS; //Drop !SS to begin transaction.
+  CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x06);//Write Enable
-  P5OUT|=SS;  //Raise !SS to end transaction.
+  SETSS;  //Raise !SS to end transaction.
 }
 
 
 //! Grab the SPI flash status byte.
 unsigned char spiflash_status(){
   unsigned char c;
-  P5OUT|=SS;  //Raise !SS to end transaction.
-  P5OUT&=~SS; //Drop !SS to begin transaction.
+  SETSS;  //Raise !SS to end transaction.
+  CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x05);//GET STATUS
   c=spitrans8(0xFF);
-  P5OUT|=SS;  //Raise !SS to end transaction.
+  SETSS;  //Raise !SS to end transaction.
   return c;
 }
 
@@ -179,7 +179,7 @@ void spiflash_peek(unsigned char app,
                   unsigned char verb,
                   unsigned long len){
   unsigned int i;
-  P5OUT&=~SS; //Drop !SS to begin transaction.
+  CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x03);//Flash Read Command
   len=3;//write 3 byte pointer
   for(i=0;i<len;i++)
@@ -192,7 +192,7 @@ void spiflash_peek(unsigned char app,
   while(len--)
     serial_tx(spitrans8(0));
   
-  P5OUT|=SS;  //Raise !SS to end transaction.
+  SETSS;  //Raise !SS to end transaction.
 }
 
 
@@ -226,29 +226,29 @@ void spihandle(unsigned char app,
   unsigned long i;
   
   //Raise !SS to end transaction, just in case we forgot.
-  P5OUT|=SS;
+  SETSS;
   spisetup();
   
   switch(verb){
     //PEEK and POKE might come later.
   case READ:
   case WRITE:
-    P5OUT&=~SS; //Drop !SS to begin transaction.
+    CLRSS; //Drop !SS to begin transaction.
     for(i=0;i<len;i++)
       cmddata[i]=spitrans8(cmddata[i]);
-    P5OUT|=SS;  //Raise !SS to end transaction.
+    SETSS;  //Raise !SS to end transaction.
     txdata(app,verb,len);
     break;
 
 
   case SPI_JEDEC://Grab 3-byte JEDEC ID.
-    P5OUT&=~SS; //Drop !SS to begin transaction.
+    CLRSS; //Drop !SS to begin transaction.
     spitrans8(0x9f);
     len=3;  //Length is variable in some chips, 3 minimum.
     for(i=0;i<len;i++)
       cmddata[i]=spitrans8(cmddata[i]);
     txdata(app,verb,len);
-    P5OUT|=SS;  //Raise !SS to end transaction.
+    SETSS;  //Raise !SS to end transaction.
     break;
 
 
@@ -268,9 +268,9 @@ void spihandle(unsigned char app,
 
   case SPI_ERASE://Erase the SPI Flash ROM.
     spiflash_wrten();
-    P5OUT&=~SS; //Drop !SS to begin transaction.
+    CLRSS; //Drop !SS to begin transaction.
     spitrans8(0xC7);//Chip Erase
-    P5OUT|=SS;  //Raise !SS to end transaction.
+    SETSS;  //Raise !SS to end transaction.
     
     
     while(spiflash_status()&0x01)//while busy

diff --git a/firmware/include/gfports.h b/firmware/include/gfports.h
index 90214fa..8891c1a 100644 (file)
--- a/firmware/include/gfports.h
+++ b/firmware/include/gfports.h
@@ -12,19 +12,6 @@
 
 // N.B., only asm-clean CPP definitions allowed.
 
-
-//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
-#endif
-
-
 //Use false P5REN for 1612.
 #ifdef __MSP430_HAS_PORT5__
 #ifndef __MSP430_HAS_PORT5_R__

diff --git a/firmware/include/spi.h b/firmware/include/spi.h
index e96bef3..02e548a 100644 (file)
--- a/firmware/include/spi.h
+++ b/firmware/include/spi.h
@@ -5,14 +5,11 @@
 
 
 //Pins and I/O
-#define SS   BIT0
+//#define SS BIT0
 #define MOSI BIT1
 #define MISO BIT2
 #define SCK  BIT3
 
-#define SETSS P5OUT|=SS
-#define CLRSS P5OUT&=~SS
-
 #define SETMOSI P5OUT|=MOSI
 #define CLRMOSI P5OUT&=~MOSI
 #define SETCLK P5OUT|=SCK

diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 6c22608..e661085 100644 (file)
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -12,3 +12,20 @@
 #define PLEDDIR P1DIR
 #define PLEDPIN BIT0
 
+
+//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
+#endif
+
+//No longer works for Hope badge.
+#define SETSS P5OUT|=BIT0
+#define CLRSS P5OUT&=~BIT0
+
+

diff --git a/firmware/platforms/telosb.h b/firmware/platforms/telosb.h
index 129b852..a482125 100644 (file)
--- a/firmware/platforms/telosb.h
+++ b/firmware/platforms/telosb.h
@@ -14,3 +14,8 @@
 #define PLEDDIR P5DIR
 #define PLEDPIN BIT4
 
+
+//Radio CS is P4.2
+#define SETSS P4OUT|=BIT2
+#define CLRSS P4OUT&=~BIT2
+