X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Favr%2Favr.c;h=a8d9d341b82672cf199673e73c56cf610dd61d20;hp=707ab9ebda2e4f6c712bddc3bf58476e87a7e4f5;hb=43d125b5bca16f0941450bee6ba7bd94ab41dc72;hpb=2d6cf1279657fb40d818675dd22923744ef178fc

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index 707ab9e..a8d9d34 100644
--- a/firmware/apps/avr/avr.c
+++ b/firmware/apps/avr/avr.c
@@ -78,6 +78,11 @@ void avr_prgen(){
   avrexchange(0xAC, 0x53, 0, 0);
 }
 
+//! Is the AVR ready or busy?
+u8 avr_isready(){
+  return avrexchange(0xF0, 0, 0, 0);
+}
+
 //! Read AVR device code.
 u8 avr_sig(u8 i){
   return avrexchange(0x30, //Read signature byte
@@ -87,18 +92,51 @@ u8 avr_sig(u8 i){
 	      );
 }
 
+//! Erase an AVR device
+void avr_erase(){
+  avrexchange(0xAC, 0x80, 0, 0);
+}
+
+//! Read lock bits.
+u8 avr_lockbits(){
+  return avrexchange(0x58, 0, 0, 0);
+}
+
+//! Read a byte of EEPROM.
+u8 avr_peekeeprom(u16 adr){
+  return avrexchange(0xA0, adr>>8, adr&0xFF, 0);
+}
+//! Read a byte of EEPROM.
+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:
   case WRITE:
     for(i=0;i<len;i++)
-      cmddata[i]=spitrans8(cmddata[i]);
+      cmddata[i]=avrtrans8(cmddata[i]);
     txdata(app,verb,len);
     break;
   case SETUP:
@@ -113,7 +151,39 @@ void avrhandle(unsigned char app,
       cmddata[i]=avr_sig(i);
     txdata(app,verb,4);
     break;
+  case AVR_ERASE:
+    avr_erase();
+    txdata(app,verb,0);
+    break;
+  case AVR_PEEKLOCK:
+    cmddata[0]=avr_lockbits();
+    txdata(app,verb,1);
+    break;
+
+  case AVR_POKEEEPROM:
+    avr_pokeeeprom(cmddataword[0], cmddata[2]);
+    //no break here.
+  case AVR_PEEKEEPROM:
+    cmddata[0]=avr_peekeeprom(cmddataword[0]);
+    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.");