X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Favr%2Favr.c;h=a127ea229f18c125e86f6609ac973f6549a4e625;hp=c659034b1fa5173c913145e91faed18453b1b796;hb=c9fa78dd91736cd5004d23fd9535c30be4f978ff;hpb=c84fe49161b904593101f7fa21aee65d54e03987

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index c659034..a127ea2 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -11,10 +11,13 @@
 #include <iomacros.h>
 
 #include "avr.h"
+#include "glitch.h"
 
 //! Setup the AVR pins.
 void avrsetup(){
   spisetup();
+  
+  glitchsetup();
 }
 
 //! Initialized an attached AVR.
@@ -67,7 +70,7 @@ u8 avrexchange(u8 a, u8 b, u8 c, u8 d){
   avrtrans8(a);
   avrtrans8(b);
   if(avrtrans8(c)!=b){
-    debugstr("AVR sync error, b not returned as c.");
+    //debugstr("AVR sync error, b not returned as c.");
     //Reconnect here?
   }
   return avrtrans8(d);
@@ -101,6 +104,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){
@@ -111,15 +119,28 @@ u8 avr_pokeeeprom(u16 adr, u8 val){
   return avrexchange(0xC0, adr>>8, adr&0xFF, val);
 }
 
+//! Read a byte of Flash
+u8 avr_peekflash(u16 adr){
+  u16 a=adr>>1;
+  if(adr&1) //high byte
+    return avrexchange(0x28,a>>8,a&0xff,0);
+  else      //low byte
+    return avrexchange(0x20,a>>8,a&0xff,0);
+}
+
+
 //! Handles an AVR command.
 void avrhandle(unsigned char app,
 	       unsigned char verb,
 	       unsigned long len){
   unsigned long i;
+  unsigned int at;
   static u8 connected=0;
   
+  /*
   if(!avr_isready() && connected)
     debugstr("AVR is not yet ready.");
+  */
   
   switch(verb){
   case READ:
@@ -148,7 +169,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.
@@ -157,6 +181,22 @@ void avrhandle(unsigned char app,
     txdata(app,verb,1);
     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.
+    }else{
+      len=1;
+    }
+    txhead(app,verb,len);
+    for(i=0;i<len;i++){
+      serial_tx(avr_peekflash(at++));
+    }
+    break;
   case POKE:
   default:
     debugstr("Verb unimplemented in AVR application.");