X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;h=df7dc86303ccf801aba6487eb88df4de9daeeb48;hp=7de962c4554e4839a60e87eb361d848767150d73;hb=3990dfe00fc611081fc60db0498c29ca94001695;hpb=6a72fa1ddf413cea756da86b79f9cb10c66e0a06

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 7de962c..df7dc86 100644
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,62 +11,51 @@
 #include "command.h"
 #include "glitch.h"
 
-//! Disable glitch state at init.
+
+//! Call this before the function to be glitched.
+void glitchprime(){
+#ifdef DAC12IR
+  WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
+  
+  glitchsetup();
+  _EINT();
+  return;
+#endif
+}
+
+//! Setup glitching.
 void glitchsetup(){
 #ifdef DAC12IR
   //Set GSEL high to disable glitching.
 
   P5DIR|=0x80;
-  P6DIR|=0x40;  
+  P6DIR|=BIT6+BIT5;
   
   P5OUT|=0x80;
-  P6OUT|=0x40;
+  P6OUT|=BIT6+BIT5;
   
-  glitchsetupdac();
-
   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
+  CCR0 = glitchcount+0x30; //clock divider
+  TACTL |= MC_3;
   _EINT();                              // Enable interrupts 
 #endif
 }
 
-//! Setup analog chain for glitching.
-void glitchsetupdac(){
-  glitchvoltages(glitchL,glitchH);
-}
-
 // Timer A0 interrupt service routine
 interrupt(TIMERA0_VECTOR) Timer_A (void)
 {
-#ifdef DAC12IR
-  switch(glitchstate){
-  case 0:
-    P1OUT|=1;
-    glitchstate=1;
-    DAC12_0DAT = glitchH;
-    break;
-  case 1:
-    P1OUT|=1;
-    glitchstate=0;
-    DAC12_0DAT = glitchL;
-    break;
-  default:
-    P1OUT&=~1;
-    //Do nothing.
-    break;
-  }
-  CCR0 += glitchcount;                        // Add Offset to CCR0
-#endif
+  P1OUT^=1;
+  P5OUT&=~BIT7;//Glitch
+  P5OUT|=BIT7;//Normal
+  TACTL |= MC0;// Stop Timer_A;
+  P1OUT&=~1;
+  return;
 }
 
 
-
-
-u16 glitchH=0xfff, glitchL=0xfff,
-  glitchstate=2, glitchcount=0;
+u16 glitchcount=0;
 
 //! Glitch an application.
 void glitchapp(u8 app){
@@ -75,20 +64,21 @@ void glitchapp(u8 app){
 
 
 //! Set glitching voltages.
-void glitchvoltages(u16 low, u16 high){
+void glitchvoltages(u16 gnd, u16 vcc){
   int i;
-  glitchH=high;
-  glitchL=low;
-  
+  //debugstr("Set glitching voltages: GND and VCC");
+  //debughex(gnd);
+  //debughex(vcc);
   
   #ifdef DAC12IR
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
   // Delay here for reference to settle.
   for(i=0;i!=0xFFFF;i++) asm("nop");
   DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
+  DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
   // 1.0V 0x0666, 2.5V 0x0FFF
-  DAC12_0DAT = high;
-  //DAC12_0DAT = 0x0880;
+  DAC12_0DAT = vcc; //high;
+  DAC12_1DAT = gnd; //low;
   #endif 
 }
 //! Set glitching rate.
@@ -96,11 +86,11 @@ void glitchrate(u16 rate){
   glitchcount=rate;
 }
 
-
 //! Handles a monitor command.
 void glitchhandle(unsigned char app,
 		  unsigned char verb,
 		  unsigned long len){
+  P1OUT&=~1;
   switch(verb){
   case GLITCHVOLTAGES:
     glitchvoltages(cmddataword[0],
@@ -111,10 +101,41 @@ 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:
+    glitchvoltages(0xFFF,0);//Inverted VCC and GND.
+    P5OUT|=BIT7;//Normal
+    P5DIR|=BIT7;
+    while(1){
+      P5OUT&=~BIT7;//Glitch
+      //asm("nop");//asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");
+      asm("nop"); //Not necessary.
+      P5OUT|=BIT7;//Normal
+      asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");
+      asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");asm("nop");
+    }
+    txdata(app,verb,0);
+    break;
   case STOP:
   case GLITCHAPP:
-  case GLITCHVERB:
   default:
     debugstr("Unknown glitching verb.");
     txdata(app,NOK,0);