X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fspi%2Fspi.c;h=6e008a158bb82ddf3a0e3c9b2d31c3916f7de957;hp=594e04fdabbf016583bccb90ef4525e45c23578d;hb=5c029aa0c4f7573d9fa49beefe6e887dee2b25f9;hpb=a28d1a252666fe5077057b8598d638fc8504e29a

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index 594e04f..6e008a1 100644
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -1,5 +1,7 @@
-//GoodFET SPI Application
-//Handles basic I/O
+/*! \file spi.c
+  \author Travis Goodspeed
+  \brief SPI Master
+*/
 
 //Higher level left to client application.
 
@@ -10,25 +12,13 @@
 #include <io.h>
 #include <iomacros.h>
 
-
-//Pins and I/O
-#define SS   BIT0
-#define MOSI BIT1
-#define MISO BIT2
-#define SCK  BIT3
-
+#include "spi.h"
 
 //This could be more accurate.
 //Does it ever need to be?
 #define SPISPEED 0
-#define SPIDELAY(x) delay(x)
-
-#define SETMOSI P5OUT|=MOSI
-#define CLRMOSI P5OUT&=~MOSI
-#define SETCLK P5OUT|=SCK
-#define CLRCLK P5OUT&=~SCK
-#define READMISO (P5IN&MISO?1:0)
-
+#define SPIDELAY(x)
+//delay(x)
 
 
 //! Set up the pins for SPI mode.
@@ -45,7 +35,7 @@ void spisetup(){
 
 //! Read and write an SPI byte.
 unsigned char spitrans8(unsigned char byte){
-  unsigned int bit;
+  register unsigned int bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
   
@@ -57,13 +47,8 @@ unsigned char spitrans8(unsigned char byte){
       CLRMOSI;
     byte <<= 1;
  
-    /* half a clock cycle before leading/rising edge */
-    SPIDELAY(SPISPEED/2);
     SETCLK;
- 
-    /* half a clock cycle before trailing/falling edge */
-    SPIDELAY(SPISPEED/2);
- 
+  
     /* read MISO on trailing edge */
     byte |= READMISO;
     CLRCLK;
@@ -75,9 +60,12 @@ 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.
@@ -98,20 +86,99 @@ unsigned char spiflash_status(){
 
 //! Grab the SPI flash status byte.
 void spiflash_setstatus(unsigned char c){
-  P5OUT&=~SS; //Drop !SS to begin transaction.
+  SETSS;
+  CLRSS; //Drop !SS to begin transaction.
   spitrans8(0x01);//SET STATUS
   spitrans8(c);
-  P5OUT|=SS;  //Raise !SS to end transaction.
+  SETSS;  //Raise !SS to end transaction.
   //return c;
 }
 
+
+//! Read a block to a buffer.
+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.
+}
+
+//! Read a block to a buffer.
+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);
+  spitrans8(adr&0xFF);
+
+  for(i=0;i<len;i++)
+    spitrans8(buf[i]);
+  SETSS;  //Raise !SS to end transaction.
+  
+  while(spiflash_status()&0x01);//minor performance impact
+  return;
+}
+
+
+//! Write many blocks to the SPI Flash.
+void spiflash_pokeblocks(unsigned long adr,
+			 unsigned char *buf,
+			 unsigned int len){
+  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);
+    //write the block
+    spiflash_pokeblock(adr+off,
+		       buf+off,
+		       blen);
+    //add offset
+    off+=blen;
+  }
+}
+
+
+
 //! 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;
-  
+		   unsigned long len){
+  unsigned int i;
   P5OUT&=~SS; //Drop !SS to begin transaction.
   spitrans8(0x03);//Flash Read Command
   len=3;//write 3 byte pointer
@@ -119,33 +186,48 @@ 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.
 }
 
+
+//! Erase a sector.
+void spiflash_erasesector(unsigned long adr){
+  //debugstr("Erasing a 4kB sector.");
+
+  //Write enable.
+  spiflash_wrten();
+
+  //Begin
+  CLRSS;
+
+  //Second command.
+  spitrans8(0x20);
+  //Send address
+  spitrans8((adr&0xFF0000)>>16);
+  spitrans8((adr&0xFF00)>>8);
+  spitrans8(adr&0xFF);
+
+  SETSS;
+  while(spiflash_status()&0x01);//while busy
+  //debugstr("Erased.");
+}
+
+
 //! 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;  
+  P5OUT|=SS;
+  spisetup();
   
   switch(verb){
     //PEEK and POKE might come later.
@@ -162,7 +244,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);
@@ -176,23 +258,11 @@ void spihandle(unsigned char app,
 
 
   case POKE://Poke up bytes from an SPI Flash ROM.
-    spiflash_setstatus(0x02);
-    spiflash_wrten();
-    
-    P5OUT&=~SS; //Drop !SS to begin transaction.
-    spitrans8(0x02); //Poke command.
-    
-    //First three bytes are address, then data.
-    for(i=0;i<len;i++)
-      spitrans8(cmddata[i]);
-    P5OUT|=SS;  //Raise !SS to end transaction.
+    spiflash_pokeblocks(cmddatalong[0],//adr
+			cmddata+4,//buf
+			len-4);//len    
     
-    
-    while(spiflash_status()&0x01)//while busy
-      P1OUT^=1;
-    P1OUT&=~1;
-    
-    txdata(app,verb,len);
+    txdata(app,verb,0);
     break;
 
 
@@ -202,7 +272,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;