X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fspi%2Fspi.c;h=eed955333c6b42dc0cfb175b08c51602ce7cddb1;hp=fc310389e2f0f1fbf551e59d81cfa619528ea83b;hb=30b52ae1a038f8ad3c563bf8e12f3a849abf8704;hpb=0351243d52f70e34790269e600c65413ddb4bc7c

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index fc31038..eed9553 100644
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -23,13 +23,14 @@
 
 //! 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;
+  DIRSS;
   
   //Begin a new transaction.
-  P5OUT&=~SS; 
-  P5OUT|=SS;
+  CLRSS; 
+  SETSS;
 }
 
 
@@ -53,7 +54,6 @@ unsigned char spitrans8(unsigned char byte){
     byte |= READMISO;
     CLRCLK;
   }
-  
   return byte;
 }
 
@@ -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.
 }
 
 
@@ -219,6 +219,21 @@ void spiflash_erasesector(unsigned long adr){
 }
 
 
+//! Wake an EM260 Radio
+void em260_wake(){
+  //debugstr("Waking EM260.");
+  #define RST BIT6
+  P2DIR|=RST;
+  SETRST;
+  delay(1024);
+  
+  CLRRST;//Wake chip.
+  while(P4IN&1);
+  SETRST;//Woken.
+  //debugstr("EM260 is now awake.");
+  delay(1024);  //DO NOT REMOVE, fails without.
+}
+
 //! Handles a monitor command.
 void spihandle(unsigned char app,
 	       unsigned char verb,
@@ -226,32 +241,63 @@ 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_RW_EM260:  //SPI exchange with an EM260
+    P4DIR=0; //TODO ASAP remove P4 references.
+    P4OUT=0;
+    
+    //See GoodFETEM260.py for details.
+    //The EM260 requires that the host wait for the client.
+    
+    em260_wake();
+    
+    SETMOSI; //Autodetected SPI mode.
+    CLRSS; //Drop !SS to begin transaction.
+    //Host to slave.  Ignore data.
+    for(i=0;i<len;i++)
+      spitrans8(cmddata[i]);
+    //debugstr("Finished transmission to EM260.");
+    
+    //Could also wait for nHOST_INT to drop.
+    i=0xffff;
+    while((cmddata[0]=spitrans8(0xFF))==0xFF
+	  && --i);
+    if(!i)
+      debugstr("Gave up on host interrupt.");
+        
+    len=32;
+    for(i=1;i<len;i++)
+      cmddata[i]=spitrans8(0xFF);
+    
+    
+    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;
-
-
+    
   case PEEK://Grab 128 bytes from an SPI Flash ROM
     spiflash_peek(app,verb,len);
     break;
@@ -268,9 +314,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