Dropped ugly 'blocks' kludge for a 16-bit length field.

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

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index 536dec0..ce21cb8 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -66,9 +66,11 @@ unsigned char spitrans8(unsigned char byte){
 //! Enable SPI writing
 void spiflash_wrten(){
   SETSS;
+  /*
   P5OUT&=~SS; //Drop !SS to begin transaction.
   spitrans8(0x04);//Write Disable
   P5OUT|=SS;  //Raise !SS to end transaction.
+  */
   P5OUT&=~SS; //Drop !SS to begin transaction.
   spitrans8(0x06);//Write Enable
   P5OUT|=SS;  //Raise !SS to end transaction.
@@ -142,7 +144,7 @@ void spiflash_pokeblock(unsigned long adr,
     spitrans8(buf[i]);
   SETSS;  //Raise !SS to end transaction.
   
-  //while(spiflash_status()&0x01);
+  while(spiflash_status()&0x01);
   
   return;
 }
@@ -151,10 +153,8 @@ void spiflash_pokeblock(unsigned long adr,
 //! 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;
-  
+                  unsigned long len){
+  unsigned int i;
   P5OUT&=~SS; //Drop !SS to begin transaction.
   spitrans8(0x03);//Flash Read Command
   len=3;//write 3 byte pointer
@@ -162,29 +162,20 @@ void spiflash_peek(unsigned char app,
     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.
+  len=0x1000;
+  txhead(app,verb,len);
+  
+  while(len--)
+    serial_tx(spitrans8(0));
   
-  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.
 void spihandle(unsigned char app,
               unsigned char verb,
-              unsigned char len){
-  unsigned char i;
+              unsigned long len){
+  unsigned long i;
   
   //Raise !SS to end transaction, just in case we forgot.
   P5OUT|=SS;
@@ -205,7 +196,7 @@ void spihandle(unsigned char app,
   case SPI_JEDEC://Grab 3-byte JEDEC ID.
     P5OUT&=~SS; //Drop !SS to begin transaction.
     spitrans8(0x9f);
-    len=3;
+    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);
@@ -233,6 +224,7 @@ void spihandle(unsigned char app,
     
     while(spiflash_status()&0x01)
       P1OUT^=1;
+    
     P1OUT&=~1;
     
     txdata(app,verb,len);
@@ -245,7 +237,7 @@ void spihandle(unsigned char app,
     spitrans8(0xC7);//Chip Erase
     P5OUT|=SS;  //Raise !SS to end transaction.
     
-        
+    
     while(spiflash_status()&0x01)//while busy
       P1OUT^=1;
     P1OUT&=~1;