Erase waits for competion to return.

[goodfet] / firmware / apps / spi / spi.c

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index c58b4bc..594e04f 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -17,6 +17,7 @@
 #define MISO BIT2
 #define SCK  BIT3
 
+
 //This could be more accurate.
 //Does it ever need to be?
 #define SPISPEED 0
@@ -35,9 +36,14 @@ void spisetup(){
   P5OUT|=SS;
   P5DIR|=MOSI+SCK+SS;
   P5DIR&=~MISO;
+  
+  //Begin a new transaction.
+  P5OUT&=~SS; 
+  P5OUT|=SS;
 }
 
-//! Read and write an SPI bit.
+
+//! Read and write an SPI byte.
 unsigned char spitrans8(unsigned char byte){
   unsigned int bit;
   //This function came from the SPI Wikipedia article.
@@ -66,6 +72,7 @@ unsigned char spitrans8(unsigned char byte){
   return byte;
 }
 
+
 //! Enable SPI writing
 void spiflash_wrten(){
   P5OUT&=~SS; //Drop !SS to begin transaction.
@@ -76,22 +83,58 @@ void spiflash_wrten(){
   P5OUT|=SS;  //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.
   spitrans8(0x05);//GET STATUS
   c=spitrans8(0xFF);
   P5OUT|=SS;  //Raise !SS to end transaction.
   return c;
 }
+
+
 //! Grab the SPI flash status byte.
 void spiflash_setstatus(unsigned char c){
   P5OUT&=~SS; //Drop !SS to begin transaction.
   spitrans8(0x01);//SET STATUS
   spitrans8(c);
   P5OUT|=SS;  //Raise !SS to end transaction.
-  return c;
+  //return c;
+}
+
+//! Peek some blocks.
+void spiflash_peek(unsigned char app,
+                  unsigned char verb,
+                  unsigned char len){
+  register char blocks=(len>3?cmddata[3]:1);
+  unsigned char i,j;
+  
+  P5OUT&=~SS; //Drop !SS to begin transaction.
+  spitrans8(0x03);//Flash Read Command
+  len=3;//write 3 byte pointer
+  for(i=0;i<len;i++)
+    spitrans8(cmddata[i]);
+  
+  //Send reply header
+  len=0x80;//128 byte chunk, repeated for each block
+  serial_tx(app);
+  serial_tx(verb);
+  serial_tx(len); //multiplied by block count.
+  
+  while(blocks--){
+    for(i=0;i<len;i++)
+      serial_tx(spitrans8(0));
+    
+    /* old fashioned
+    for(i=0;i<len;i++)
+      cmddata[i]=spitrans8(0);
+    txdata(app,verb,len);
+    */
+  }
+  P5OUT|=SS;  //Raise !SS to end transaction.
 }
 
 //! Handles a monitor command.
@@ -99,6 +142,11 @@ void spihandle(unsigned char app,
               unsigned char verb,
               unsigned char len){
   unsigned char i;
+  
+  
+  //Raise !SS to end transaction, just in case we forgot.
+  P5OUT|=SS;  
+  
   switch(verb){
     //PEEK and POKE might come later.
   case READ:
@@ -109,6 +157,8 @@ void spihandle(unsigned char app,
     P5OUT|=SS;  //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.
     spitrans8(0x9f);
@@ -118,18 +168,13 @@ void spihandle(unsigned char app,
     txdata(app,verb,len);
     P5OUT|=SS;  //Raise !SS to end transaction.
     break;
+
+
   case PEEK://Grab 128 bytes from an SPI Flash ROM
-    P5OUT&=~SS; //Drop !SS to begin transaction.
-    spitrans8(0x03);//Flash Read Command
-    len=3;//write 3 byte pointer
-    for(i=0;i<len;i++)
-      spitrans8(cmddata[i]);
-    len=0x80;//128 byte chunk
-    for(i=0;i<len;i++)
-      cmddata[i]=spitrans8(0);
-    txdata(app,verb,len);
-    P5OUT|=SS;  //Raise !SS to end transaction.
+    spiflash_peek(app,verb,len);
     break;
+
+
   case POKE://Poke up bytes from an SPI Flash ROM.
     spiflash_setstatus(0x02);
     spiflash_wrten();
@@ -140,21 +185,35 @@ void spihandle(unsigned char app,
     //First three bytes are address, then data.
     for(i=0;i<len;i++)
       spitrans8(cmddata[i]);
-    P5OUT&=~SS; //Drop !SS to begin transaction.
-    while(spiflash_status()&0x01);//while busy
-    spiflash_wrten();
+    P5OUT|=SS;  //Raise !SS to end transaction.
+    
+    
+    while(spiflash_status()&0x01)//while busy
+      P1OUT^=1;
+    P1OUT&=~1;
+    
     txdata(app,verb,len);
     break;
+
+
   case SPI_ERASE://Erase the SPI Flash ROM.
     spiflash_wrten();
     P5OUT&=~SS; //Drop !SS to begin transaction.
     spitrans8(0xC7);//Chip Erase
     P5OUT|=SS;  //Raise !SS to end transaction.
+    
+        
+    while(spiflash_status()&0x01)//while busy
+      P1OUT^=1;
+    P1OUT&=~1;
+    
     txdata(app,verb,0);
     break;
+
   case SETUP:
     spisetup();
     txdata(app,verb,0);
     break;
   }
+  
 }