X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Favr%2Favr.c;h=c5d192927889f94db13018e597337fa0a47bb90b;hp=9db6ce46eb37ae3237914baa34f575ba63a4fe91;hb=HEAD;hpb=00737f87325a8f97ce23c32f32e93b082bf5a4d2

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index 9db6ce4..c5d1929 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -6,12 +6,30 @@
 #include "platform.h"
 #include "command.h"
 
-#include <signal.h>
-#include <io.h>
-#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 */
+	XAVR,
+
+	/* 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(){
@@ -21,18 +39,22 @@ void avrsetup(){
 //! 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(5);
   CLRSS;
   //delay(5);
-  
+
   //Enable programming
   avr_prgen();
 }
@@ -42,7 +64,7 @@ u8 avrtrans8(u8 byte){
   register u16 bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
-  
+
   for (bit = 0; bit < 8; bit++) {
     /* write MOSI on trailing edge of previous clock */
     if (byte & 0x80)
@@ -50,16 +72,16 @@ u8 avrtrans8(u8 byte){
     else
       CLRMOSI;
     byte <<= 1;
-    
+
     delay(2);
     SETCLK;
-  
+
     /* read MISO on trailing edge */
     byte |= READMISO;
     delay(2);
     CLRCLK;
   }
-  
+
   return byte;
 }
 
@@ -126,20 +148,30 @@ 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:
   case WRITE:
@@ -154,7 +186,10 @@ void avrhandle(unsigned char app,
   case START:
     avrconnect();
     txdata(app,verb,0);
-    break;
+    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,20 +214,31 @@ 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);
     at=cmddataword[0];
-    
+
     //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;