X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Favr%2Favr.c;h=0cc4c0da79842727fd70833ad4dba75b8321400d;hp=577d87847d32aec4e0550b2efa65248ee3f71df9;hb=3e4992b4d109f361b42abdda403471860edfeabf;hpb=ccbb5f9f7ae6fee33ba360030ecdaa76e7967024

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index 577d878..0cc4c0d 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -11,7 +11,7 @@
 #include <iomacros.h>
 
 #include "avr.h"
-#include "glitch.h"
+//#include "glitch.h"
 
 //! Setup the AVR pins.
 void avrsetup(){
@@ -21,25 +21,29 @@ 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(10);
+  //delay(5);
   CLRSS;
-  delay(10);
+  //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.
   
@@ -126,6 +130,16 @@ 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,
@@ -133,7 +147,6 @@ void avrhandle(unsigned char app,
 	       unsigned long len){
   unsigned long i;
   unsigned int at;
-  static u8 connected=0;
   
   /*
   if(!avr_isready() && connected)
@@ -151,9 +164,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);
@@ -178,6 +195,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);