X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fspi%2Fspi.c;h=1cb12e5187b7c7ab8327c8351bb6e5b7ff0b2dfb;hp=47c42c5852717806e017fa5dea4a6a4d30928561;hb=e027df82b3f7b6c0ed428a504220e13ae02886e9;hpb=cc92cb4cc1f80259236ddf86911c03c0365db5ea

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index 47c42c5..1cb12e5 100644
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -5,7 +5,7 @@
 
 //Higher level left to client application.
 
-#include "platform.h"
+
 #include "command.h"
 
 #include <signal.h>
@@ -14,21 +14,47 @@
 
 #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; 
   SETSS;
 }
@@ -47,8 +73,10 @@ unsigned char spitrans8(unsigned char byte){
     else
       CLRMOSI;
     byte <<= 1;
- 
+    
+    //SPIDELAY(100);
     SETCLK;
+    //SPIDELAY(100);
   
     /* read MISO on trailing edge */
     byte |= READMISO;
@@ -233,121 +261,131 @@ void em260_wake(){
   //debugstr("EM260 is now awake.");
   delay(1024);  //DO NOT REMOVE, fails without.
 }
-
-//! Handles a monitor command.
-void spihandle(unsigned char app,
-	       unsigned char verb,
-	       unsigned long len){
+//! Handle an EM260 exchange.
+void spi_rw_em260(u8 app, u8 verb, u32 len){
   unsigned long i;
-  static int state=0;
-  
-  //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;
+  u8 lastin;
     
-  case SPI_RW_EM260:  //SPI exchange with an EM260
-    P4DIR=0; //TODO ASAP remove P4 references.
-    P4OUT=0xFF;
-    P4REN=0xFF;
+  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.
+  //See GoodFETEM260.py for details.
+  //The EM260 requires that the host wait for the client.
     
-    /*
+  /*
     if((~P4IN)&1)
-      debugstr("Detected HOST_INT.");
-    */
-    
-    //if(!state++)
-    //if(state++&1)
-    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.");
-    
-    //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.");
-    
-    len=1;
-    while(
-	  (cmddata[len++]=spitrans8(0xFF))!=0xA7
-	  );
-    
-    
-    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.
-    
+    debugstr("Detected HOST_INT.");
+  */
     
-    while(spiflash_status()&0x01)//while busy
-      PLEDOUT^=PLEDPIN;
-    PLEDOUT&=~PLEDPIN;
+  em260_wake();
+  
     
-    txdata(app,verb,0);
-    break;
-
-  case SETUP:
-    spisetup();
-    txdata(app,verb,0);
-    break;
+  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
+		PLEDOUT^=PLEDPIN;
+		PLEDOUT&=~PLEDPIN;
+
+		txdata(app,verb,0);
+		break;
+
+	case SETUP:
+		spisetup();
+		txdata(app,verb,0);
+		break;
+	}
 }