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 8b43594..40e8122 100644 (file)
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,6 +11,29 @@
 #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(){
@@ -73,7 +96,7 @@ void glitchapp(u8 app){
 
 //! Set glitching voltages.
 void glitchvoltages(u16 gnd, u16 vcc){
-  int i;
+  
   //debugstr("Set glitching voltages: GND and VCC");
   //debughex(gnd);
   //debughex(vcc);
@@ -85,6 +108,7 @@ void glitchvoltages(u16 gnd, u16 vcc){
   */
   
   #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");
@@ -101,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],
@@ -122,11 +147,13 @@ void glitchhandle(unsigned char app,
     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; //continuous mode.
+    TACTL|=
+      TASSEL_SMCLK //smclk source
+      | MC_2; //continuous mode.
     
     //perform the function
     silent++;//Don't want the function to return anything.
@@ -134,6 +161,8 @@ void glitchhandle(unsigned char app,
     handle(cmddata[0],cmddata[1],0);
     cmddataword[0]=TAR; //Return counter.
     silent--;
+    debugstr("Measured start time.");
+    debughex(cmddataword[0]);
     txdata(app,verb,2);
     break;
   case START: