X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fspi%2Fspi.c;h=b552ae7617a8cbca64a554898fbfd767144b3ba7;hp=3da313539d8a9059a93f7d32d8454d0586b7c005;hb=350c674c6bcd97ec2f883b07e0cf49eb8a480183;hpb=ba4e9392ba615ed84d47576fe973057f89bb8998

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index 3da3135..b552ae7 100644
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -5,30 +5,61 @@
 
 //Higher level left to client application.
 
-#include "platform.h"
+
 #include "command.h"
 
+#ifdef __MSPGCC__
+#include <msp430.h>
+#else
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
+#endif
 
 #include "spi.h"
 
+#define SPIAPPLICATION
+
+#include "platform.h"
+
+//! Handles a monitor command.
+void spi_handle_fn( uint8_t const app,
+					uint8_t const verb,
+					uint32_t const len);
+
+// define the spi app's app_t
+app_t const spi_app = {
+
+	/* app number */
+	SPI,
+
+	/* handle fn */
+	spi_handle_fn,
+
+	/* name */
+	"SPI",
+
+	/* desc */
+	"\tThe SPI app handles the SPI bus protocol, turning\n"
+	"\tyour GoodFET into a USB-to-SPI adapter.\n"
+};
+
 //This could be more accurate.
 //Does it ever need to be?
 #define SPISPEED 0
-#define SPIDELAY(x)
-//delay(x)
+#define SPIDELAY(x) delay(x)
 
 
 //! Set up the pins for SPI mode.
 void spisetup(){
   SETSS;
-  P5DIR|=MOSI+SCK+BIT0; //BIT0 might be SS
-  P5DIR&=~MISO;
-  
+  SPIDIR|=MOSI+SCK+BIT0; //BIT0 might be SS
+  SPIDIR&=~MISO;
+  DIRSS;
+
   //Begin a new transaction.
-  CLRSS; 
+
+  CLRSS;
   SETSS;
 }
 
@@ -38,7 +69,7 @@ unsigned char spitrans8(unsigned char byte){
   register unsigned int bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
-  
+
   for (bit = 0; bit < 8; bit++) {
     /* write MOSI on trailing edge of previous clock */
     if (byte & 0x80)
@@ -46,14 +77,15 @@ unsigned char spitrans8(unsigned char byte){
     else
       CLRMOSI;
     byte <<= 1;
- 
+
+    //SPIDELAY(100);
     SETCLK;
-  
+    //SPIDELAY(100);
+
     /* read MISO on trailing edge */
     byte |= READMISO;
     CLRCLK;
   }
-  
   return byte;
 }
 
@@ -100,16 +132,16 @@ void spiflash_peekblock(unsigned long adr,
 			unsigned char *buf,
 			unsigned int len){
   unsigned char i;
-  
+
   SETSS;
   CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x03);//Flash Read Command
-  
+
   //Send address
   spitrans8((adr&0xFF0000)>>16);
   spitrans8((adr&0xFF00)>>8);
   spitrans8(adr&0xFF);
-  
+
   for(i=0;i<len;i++)
     buf[i]=spitrans8(0);
   SETSS;  //Raise !SS to end transaction.
@@ -120,24 +152,24 @@ void spiflash_pokeblock(unsigned long adr,
 			unsigned char *buf,
 			unsigned int len){
   unsigned int i;
-  
+
   SETSS;
-  
+
   //if(len!=0x100)
   //  debugstr("Non-standard block size.");
-  
+
   while(spiflash_status()&0x01);//minor performance impact
-  
+
   spiflash_setstatus(0x02);
   spiflash_wrten();
-  
+
   //Are these necessary?
   //spiflash_setstatus(0x02);
   //spiflash_wrten();
-  
+
   CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x02); //Poke command.
-  
+
   //Send address
   spitrans8((adr&0xFF0000)>>16);
   spitrans8((adr&0xFF00)>>8);
@@ -146,7 +178,7 @@ void spiflash_pokeblock(unsigned long adr,
   for(i=0;i<len;i++)
     spitrans8(buf[i]);
   SETSS;  //Raise !SS to end transaction.
-  
+
   while(spiflash_status()&0x01);//minor performance impact
   return;
 }
@@ -159,7 +191,7 @@ void spiflash_pokeblocks(unsigned long adr,
   long off=0;//offset of this block
   int blen;//length of this block
   SETSS;
-  
+
   while(off<len){
     //calculate block length
     blen=(len-off>0x100?0x100:len-off);
@@ -184,14 +216,14 @@ void spiflash_peek(unsigned char app,
   len=3;//write 3 byte pointer
   for(i=0;i<len;i++)
     spitrans8(cmddata[i]);
-  
+
   //Send reply header
   len=0x1000;
   txhead(app,verb,len);
-  
+
   while(len--)
     serial_tx(spitrans8(0));
-  
+
   SETSS;  //Raise !SS to end transaction.
 }
 
@@ -219,71 +251,145 @@ void spiflash_erasesector(unsigned long adr){
 }
 
 
-//! Handles a monitor command.
-void spihandle(unsigned char app,
-	       unsigned char verb,
-	       unsigned long len){
+//! 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.
+}
+//! Handle an EM260 exchange.
+void spi_rw_em260(u8 app, u8 verb, u32 len){
   unsigned long i;
-  
-  //Raise !SS to end transaction, just in case we forgot.
-  SETSS;
-  spisetup();
-  
-  switch(verb){
-    //PEEK and POKE might come later.
-  case READ:
-  case WRITE:
-    CLRSS; //Drop !SS to begin transaction.
-    for(i=0;i<len;i++)
-      cmddata[i]=spitrans8(cmddata[i]);
-    SETSS;  //Raise !SS to end transaction.
-    txdata(app,verb,len);
-    break;
-
-
-  case SPI_JEDEC://Grab 3-byte JEDEC ID.
-    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);
-    SETSS;  //Raise !SS to end transaction.
-    break;
-
-
-  case PEEK://Grab 128 bytes from an SPI Flash ROM
-    spiflash_peek(app,verb,len);
-    break;
-
-
-  case POKE://Poke up bytes from an SPI Flash ROM.
-    spiflash_pokeblocks(cmddatalong[0],//adr
-			cmddata+4,//buf
-			len-4);//len    
-    
-    txdata(app,verb,0);
-    break;
-
-
-  case SPI_ERASE://Erase the SPI Flash ROM.
-    spiflash_wrten();
-    CLRSS; //Drop !SS to begin transaction.
-    spitrans8(0xC7);//Chip Erase
-    SETSS;  //Raise !SS to end transaction.
-    
-    
-    while(spiflash_status()&0x01)//while busy
-      PLEDOUT^=PLEDPIN;
-    PLEDOUT&=~PLEDPIN;
-    
-    txdata(app,verb,0);
-    break;
-
-  case SETUP:
-    spisetup();
-    txdata(app,verb,0);
-    break;
+  u8 lastin;
+
+  P4DIR=0; //TODO ASAP remove P4 references.
+  P4OUT=0xFF;
+  //P4REN=0xFF;
+
+  //See GoodFETEM260.py for details.
+  //The EM260 requires that the host wait for the client.
+
+  /*
+    if((~P4IN)&1)
+    debugstr("Detected HOST_INT.");
+  */
+
+  em260_wake();
+
+
+  SETMOSI; //Autodetected SPI mode.
+  CLRSS; //Drop !SS to begin transaction.
+  //Host to slave.  Ignore data.
+  for(i=0;i<len;i++){
+    lastin=spitrans8(cmddata[i]);
+    if(lastin!=0xFF){
+      //debugstr("EM260 transmission interrupted.");
+      cmddata[0]=lastin;
+      goto response;
+    }
   }
-  
+  //debugstr("Finished transmission to EM260.");
+
+  //Wait for nHOST_INT to drop.
+  i=0xffff;
+
+  /*
+  while(P4IN&1
+	&& --i
+	)
+    spitrans8(0xFF);
+  */
+  while((cmddata[0]=spitrans8(0xFF))==0xFF
+	&& --i);
+
+  if(!i)
+    debugstr("Gave up on host interrupt.");
+
+ response:
+  len=1;
+  while(
+	(cmddata[len++]=spitrans8(0xFF))!=0xA7
+	);
+  if(cmddata[0]==0xFE)
+    while(len<cmddata[1]+3)
+      cmddata[len++]=spitrans8(0xFF);
+  SETSS;  //Raise !SS to end transaction.
+
+  txdata(app,verb,len);
+  return;
+}
+
+//! Handles a monitor command.
+void spi_handle_fn( uint8_t const app,
+					uint8_t const verb,
+					uint32_t const len)
+{
+	unsigned long i, l;
+
+	//Raise !SS to end transaction, just in case we forgot.
+	SETSS;
+	//spisetup();
+
+	switch(verb)
+	{
+	case READ:
+	case WRITE:
+		CLRSS; //Drop !SS to begin transaction.
+		for(i=0;i<len;i++)
+		cmddata[i]=spitrans8(cmddata[i]);
+		SETSS;  //Raise !SS to end transaction.
+		txdata(app,verb,len);
+		break;
+
+	case SPI_RW_EM260:  //SPI exchange with an EM260
+		spi_rw_em260(app,verb,len);
+		break;
+
+	case SPI_JEDEC://Grab 3-byte JEDEC ID.
+		CLRSS; //Drop !SS to begin transaction.
+		spitrans8(0x9f);
+		l=3;  //Length is variable in some chips, 3 minimum.
+		for(i = 0; i < l; i++)
+			cmddata[i]=spitrans8(cmddata[i]);
+		txdata(app,verb,len);
+		SETSS;  //Raise !SS to end transaction.
+		break;
+
+	case PEEK://Grab 128 bytes from an SPI Flash ROM
+		spiflash_peek(app,verb,len);
+		break;
+
+	case POKE://Poke up bytes from an SPI Flash ROM.
+		spiflash_pokeblocks(cmddatalong[0],//adr
+		cmddata+4,//buf
+		len-4);//len
+		txdata(app,verb,0);
+		break;
+
+	case SPI_ERASE://Erase the SPI Flash ROM.
+		spiflash_wrten();
+		CLRSS; //Drop !SS to begin transaction.
+		spitrans8(0xC7);//Chip Erase
+		SETSS;  //Raise !SS to end transaction.
+
+		while(spiflash_status()&0x01)//while busy
+			led_toggle();
+		led_off();
+
+		txdata(app,verb,0);
+		break;
+
+	case SETUP:
+		spisetup();
+		txdata(app,verb,0);
+		break;
+	}
 }