A major refactor of the GoodFET firmware build system and apps to give better

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

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index b5cd5bc..40e8122 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,24 +11,38 @@
 #include "command.h"
 #include "glitch.h"
 
+//! Handles a monitor command.
+void glitch_handle_fn( uint8_t const app,
+                                          uint8_t const verb,
+                                          uint32_t const len);
+
+// define the glitch app's app_t
+app_t const glitch_app = {
+
+       /* app number */
+       GLITCH,
+
+       /* handle fn */
+       glitch_handle_fn,
+
+       /* name */
+       "GLITCH",
+
+       /* desc */
+       "\tThe GLITCH app adds support for doing glitch research.\n"
+       "\tSee the TI example MSP430x261x_dac12_01.c for usage of the DAC.\n"
+       "\tThis module sends odd and insufficient voltages on P6.6/DAC0\n"
+       "\tin order to bypass security restrictions of target devices.\n"
+};
 
 //! Call this before the function to be glitched.
 void glitchprime(){
 #ifdef DAC12IR
-  //Don't forget to call glitchvoltages().
-  
-  //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;
+  WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   
-  //Enable general interrupts, just in case.
+  glitchsetup();
   _EINT();
+  return;
 #endif
 }
 
@@ -36,35 +50,42 @@ void glitchprime(){
 void glitchsetup(){
 #ifdef DAC12IR
   //Set GSEL high to disable glitching.
-
-  P5DIR|=0x80;
-  P6DIR|=BIT6+BIT5;
   
-  P5OUT|=0x80;
+  //Normal voltage, use resistors instead of output.
+  //P5DIR=0x80;   //ONLY glitch pin is output.
+  P5DIR|=0x80;   //glitch pin is output.
+  P5OUT|=0x80;  //It MUST begin high.
+  //P5REN|=0x7F;  //Resistors pull high and low weakly.
+  
+  P6DIR|=BIT6+BIT5;
   P6OUT|=BIT6+BIT5;
-
+  
   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
-  _EINT();                              // Enable interrupts 
+  CCR0 = glitchcount+0x10;              // Compare Value
+  TACTL |= MC_2;                        // continuous mode.
 #endif
 }
 
 // Timer A0 interrupt service routine
-interrupt(TIMERA0_VECTOR) Timer_A (void)
-{
-#ifdef DAC12IR
-  P5OUT&=~BIT7;//Glitch
-  P5OUT|=BIT7;//Normal
-#endif
-  TACTL |= MC0;                         // Stop Timer_A;
+interrupt(TIMERA0_VECTOR) Timer_A (void){
+  //This oughtn't be necessary, but glitches repeat without it.
+  TACTL=0; //disable counter.
+  
+  
+  P5OUT^=BIT7;//Glitch
+  //asm("nop"); //delay deepens glitch.
+  P5OUT^=BIT7;//Normal
+  
+  //This oughtn't be necessary, but glitches repeat without it.
+  TACTL=0; //disable counter.
+  
+  //P5OUT^=BIT7;//Normal
+  return;
 }
 
 
-
-
 u16 glitchcount=0;
 
 //! Glitch an application.
@@ -75,10 +96,19 @@ void glitchapp(u8 app){
 
 //! Set glitching voltages.
 void glitchvoltages(u16 gnd, u16 vcc){
-  int i;
-  //debugstr("Set glitching voltages.");
+  
+  //debugstr("Set glitching voltages: GND and VCC");
+  //debughex(gnd);
+  //debughex(vcc);
+  
+  /** N.B., because this is confusing as hell.  As per Page 86 of
+      SLAS541F, P6SEL is not what controls the use of the DAC0/DAC1
+      functions on P6.6 and P6.5.  Instead, CAPD or DAC12AMP>0 sets
+      the state.
+  */
   
   #ifdef DAC12IR
+  int i;
   ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on
   // Delay here for reference to settle.
   for(i=0;i!=0xFFFF;i++) asm("nop");
@@ -95,9 +125,10 @@ void glitchrate(u16 rate){
 }
 
 //! Handles a monitor command.
-void glitchhandle(unsigned char app,
-                 unsigned char verb,
-                 unsigned long len){
+void glitch_handle_fn( uint8_t const app,
+                                          uint8_t const verb,
+                                          uint32_t const len)
+{
   switch(verb){
   case GLITCHVOLTAGES:
     glitchvoltages(cmddataword[0],
@@ -111,30 +142,39 @@ void glitchhandle(unsigned char app,
   case GLITCHVERB:
     //FIXME parameters don't work yet.
     glitchprime();
+    TAR=0; //Reset clock.
     handle(cmddata[0],cmddata[1],0);
+    TACTL |= MC0;// Stop Timer_A;
     break;
   case GLITCHTIME:
+    debugstr("Measuring start time.");
     _DINT();//disable interrupts
     TACTL=0; //clear dividers
     TACTL|=TACLR; //clear config
-    TACTL|=TASSEL_SMCLK| //smclk source
-      MC_2; //continuout mode.
+    TACTL|=
+      TASSEL_SMCLK //smclk source
+      | MC_2; //continuous mode.
     
     //perform the function
     silent++;//Don't want the function to return anything.
+    TAR=0;
     handle(cmddata[0],cmddata[1],0);
-    silent--;
     cmddataword[0]=TAR; //Return counter.
+    silent--;
+    debugstr("Measured start time.");
+    debughex(cmddataword[0]);
     txdata(app,verb,2);
     break;
   case START:
-    glitchvoltages(0xFFF,0);//Inverted VCC and GND.
+    //Testing mode, for looking at the glitch waveform.
+    glitchvoltages(0,0xFFF);//Minimum glitch, for noise test.
+    //glitchvoltages(0,0);//Drop VCC
+    //glitchvoltages(0xFFF,0xFFF);//Raise Ground
     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.
+      //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");