Added a GLITCHTIME verb (0x82) for timing the execution of a verb.

[goodfet] / firmware / apps / glitch / glitch.c

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index e3b226d..9ddcc8c 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,7 +11,29 @@
 #include "command.h"
 #include "glitch.h"
 
-//! Disable glitch state at init.
+
+//! Call this before the function to be glitched.
+void glitchprime(){
+#ifdef DAC12IR
+  //Set to high voltage.
+  DAC12_0DAT = glitchH;
+  
+  //Reconfigure TACTL.
+  TACTL=0;           //Clear dividers.
+  TACTL|=TACLR;      //Clear TimerA Config
+  TACTL|=
+    TASSEL_SMCLK |   //SMCLK source,
+    MC_1;            //Count up to CCR0
+  //TAIE;            //Enable Interrupt
+  CCTL0 = CCIE;                         // CCR0 interrupt enabled
+  CCR0 = glitchcount;
+  
+  //Enable general interrupts, just in case.
+  _EINT();
+#endif
+}
+
+//! Setup glitching.
 void glitchsetup(){
 #ifdef DAC12IR
   //Set GSEL high to disable glitching.
@@ -24,11 +46,11 @@ void glitchsetup(){
   
   glitchsetupdac();
 
-  WDTCTL = WDTPW + WDTHOLD;             // Stop WDT                                                                                                                                
-  TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR                                                                                                                        
-  CCTL0 = CCIE;                         // CCR0 interrupt enabled                                                                                                                  
+  WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
+  TACTL = TASSEL1 + TACLR;              // SMCLK, clear TAR
+  CCTL0 = CCIE;                         // CCR0 interrupt enabled
   CCR0 = glitchcount;
-  TACTL |= MC1;                         // Start Timer_A in continuous mode                                                                                                        
+  TACTL |= MC1;                         // Start Timer_A in continuous mode
   _EINT();                              // Enable interrupts 
 #endif
 }
@@ -38,10 +60,16 @@ void glitchsetupdac(){
   glitchvoltages(glitchL,glitchH);
 }
 
-// Timer A0 interrupt service routine                                                                                                                                              
+// Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void)
 {
-  
+#ifdef DAC12IR
+  //debugstr("Glitching.");
+  DAC12_0DAT = 0;//glitchL;
+  asm("nop");
+  DAC12_0DAT = glitchH;
+  //DAC12_0DAT = glitchL;
+  /*
   switch(glitchstate){
   case 0:
     P1OUT|=1;
@@ -58,7 +86,8 @@ interrupt(TIMERA0_VECTOR) Timer_A (void)
     //Do nothing.
     break;
   }
-  CCR0 += glitchcount;                        // Add Offset to CCR0                                                                                                                      
+  */
+#endif
 }
 
 
@@ -79,6 +108,7 @@ void glitchvoltages(u16 low, u16 high){
   glitchH=high;
   glitchL=low;
   
+  //debugstr("Set glitching voltages.");
   
   #ifdef DAC12IR
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
@@ -95,7 +125,6 @@ void glitchrate(u16 rate){
   glitchcount=rate;
 }
 
-
 //! Handles a monitor command.
 void glitchhandle(unsigned char app,
                  unsigned char verb,
@@ -110,10 +139,28 @@ void glitchhandle(unsigned char app,
     glitchrate(cmddataword[0]);
     txdata(app,verb,0);
     break;
+  case GLITCHVERB:
+    //FIXME parameters don't work yet.
+    glitchprime();
+    handle(cmddata[0],cmddata[1],0);
+    break;
+  case GLITCHTIME:
+    _DINT();//disable interrupts
+    TACTL=0; //clear dividers
+    TACTL|=TACLR; //clear config
+    TACTL|=TASSEL_SMCLK| //smclk source
+      MC_2; //continuout mode.
+    
+    //perform the function
+    silent++;//Don't want the function to return anything.
+    handle(cmddata[0],cmddata[1],0);
+    silent--;
+    cmddataword[0]=TAR; //Return counter.
+    txdata(app,verb,2);
+    break;
   case START:
   case STOP:
   case GLITCHAPP:
-  case GLITCHVERB:
   default:
     debugstr("Unknown glitching verb.");
     txdata(app,NOK,0);