X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Favr%2Favr.c;h=88bcf020e52143f8bc65bdf3a13c0ad21d39162d;hp=b052272188f5736a3258b8f2d58e9fd0cdff694d;hb=5fb0341d348e101b30794945a6c91546e25e8e7b;hpb=776e412df82634e84aa68074a965c0492ec809b0

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index b052272..88bcf02 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -11,7 +11,28 @@
 #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(){
@@ -22,11 +43,14 @@ void avrsetup(){
 void avrconnect(){
   //set I/O pins
   avrsetup(); //Cut this?
+  
+  SETSS;
   //delay(50);
   
   //Pulse !RST (SS) at least twice while CLK is low.
   CLRCLK;
   CLRSS;
+  //delay(5);
 
   SETSS;
   CLRCLK;
@@ -127,12 +151,23 @@ 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;
   
   /*
@@ -155,6 +190,9 @@ void avrhandle(unsigned char app,
     avrconnect();
     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);
@@ -179,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);
@@ -186,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;