A major refactor of the GoodFET firmware build system and apps to give better

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

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index c9d0b94..88bcf02 100644 (file)
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -11,37 +11,60 @@
 #include <iomacros.h>
 
 #include "avr.h"
-#include "glitch.h"
+//#include "glitch.h"
+//
+//! Handles an AVR command.
+void avr_handle_fn( uint8_t const app,
+                                       uint8_t const verb,
+                                       uint32_t const len);
+
+// define the jtag app's app_t
+app_t const avr_app = {
+
+       /* app number */
+       AVR,
+
+       /* handle fn */
+       avr_handle_fn,
+
+       /* name */
+       "AVR",
+
+       /* desc */
+       "\tThe AVR app adds support for debugging AVR based devices.\n"
+};
 
 //! Setup the AVR pins.
 void avrsetup(){
   spisetup();
-  
-  glitchsetup();
 }
 
 //! Initialized an attached AVR.
 void avrconnect(){
   //set I/O pins
-  avrsetup();
+  avrsetup(); //Cut this?
+  
+  SETSS;
+  //delay(50);
   
   //Pulse !RST (SS) at least twice while CLK is low.
   CLRCLK;
   CLRSS;
+  //delay(5);
 
   SETSS;
   CLRCLK;
-  delay(500);
+  //delay(5);
   CLRSS;
-  delay(500);
+  //delay(5);
   
   //Enable programming
   avr_prgen();
 }
 
 //! Read and write an SPI byte with delays.
-unsigned char avrtrans8(unsigned char byte){
-  register unsigned int bit;
+u8 avrtrans8(u8 byte){
+  register u16 bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
   
@@ -104,6 +127,11 @@ void avr_erase(){
 u8 avr_lockbits(){
   return avrexchange(0x58, 0, 0, 0);
 }
+//! Write lock bits.
+void avr_setlock(u8 bits){
+  avrexchange(0xAC,0xE0,0x00,
+             bits);
+}
 
 //! Read a byte of EEPROM.
 u8 avr_peekeeprom(u16 adr){
@@ -123,17 +151,29 @@ u8 avr_peekflash(u16 adr){
     return avrexchange(0x20,a>>8,a&0xff,0);
 }
 
+void avr_bulk_load(u16 start, u16 len, u8 *data) {
+  u16 adr;
+  for (adr = 0; adr < len; adr++) {
+    u16 a = adr + start;
+    avrexchange((adr & 1) ? 0x48 : 0x40,
+               a >> 9,
+               (a >> 1) & 0xff,
+               data[adr]);
+  }
+}
 
 //! Handles an AVR command.
-void avrhandle(unsigned char app,
-              unsigned char verb,
-              unsigned long len){
-  unsigned long i;
+void avr_handle_fn( uint8_t const app,
+                                       uint8_t const verb,
+                                       uint32_t const len)
+{
+  unsigned long i, l;
   unsigned int at;
-  static u8 connected=0;
   
+  /*
   if(!avr_isready() && connected)
     debugstr("AVR is not yet ready.");
+  */
   
   switch(verb){
   case READ:
@@ -146,9 +186,13 @@ void avrhandle(unsigned char app,
     avrsetup();
     txdata(app,verb,0);
     break;
-  case START://returns device code
+  case START:
     avrconnect();
-    //no break here
+    txdata(app,verb,0);
+    break;//Used to fall through here.
+  case STOP:
+    SETSS;
+    txdata(app, verb, 0);
   case AVR_PEEKSIG:
     for(i=0;i<4;i++)
       cmddata[i]=avr_sig(i);
@@ -162,7 +206,10 @@ void avrhandle(unsigned char app,
     cmddata[0]=avr_lockbits();
     txdata(app,verb,1);
     break;
-
+  case AVR_POKELOCK:
+    avr_setlock(cmddata[0]);
+    txdata(app,verb,0);
+    break;
   case AVR_POKEEEPROM:
     avr_pokeeeprom(cmddataword[0], cmddata[2]);
     //no break here.
@@ -170,6 +217,16 @@ void avrhandle(unsigned char app,
     cmddata[0]=avr_peekeeprom(cmddataword[0]);
     txdata(app,verb,1);
     break;
+  case AVR_BULKLOAD:
+    if (len < 3) {
+      debugstr("Length too short");
+      txdata(app, NOK, 0);
+    } else {
+      at = cmddataword[0];
+      avr_bulk_load(at, len - 2, cmddata + 2);
+      txdata(app, verb, 0);
+    }
+    break;
   case PEEK:
     //cmddata[0]=avr_peekflash(cmddataword[0]);
     //txdata(app,verb,1);
@@ -177,13 +234,14 @@ void avrhandle(unsigned char app,
     
     //Fetch large blocks for bulk fetches,
     //small blocks for individual peeks.
-    if(len>2){
-      len=(cmddataword[1]);//always even.
+       l = len;
+    if(l>2){
+      l=(cmddataword[1]);//always even.
     }else{
-      len=1;
+      l=1;
     }
-    txhead(app,verb,len);
-    for(i=0;i<len;i++){
+    txhead(app,verb,l);
+    for(i=0;i<l;i++){
       serial_tx(avr_peekflash(at++));
     }
     break;