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

diff --git a/firmware/apps/avr/avr.c b/firmware/apps/avr/avr.c
index 577d878..9531563 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.
   
@@ -133,7 +137,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 +154,10 @@ 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 AVR_PEEKSIG:
     for(i=0;i<4;i++)
       cmddata[i]=avr_sig(i);