X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fglitch%2Fglitch.c;h=83fa9d6e3246845ea11039d99817343f0df3c0b7;hb=064d6b06568f16badffdf04e515824172c6bca68;hp=19621906006aafe3e5da31fe24a0c1f96c22f499;hpb=a5bef2ec7a9a91b7edc3698e7cbc36439994184a;p=goodfet

diff --git a/firmware/apps/glitch/glitch.c b/firmware/apps/glitch/glitch.c
index 1962190..83fa9d6 100644
--- a/firmware/apps/glitch/glitch.c
+++ b/firmware/apps/glitch/glitch.c
@@ -11,6 +11,31 @@
 #include "command.h"
 #include "glitch.h"
 
+#include <msp430.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(){
@@ -18,7 +43,8 @@ void glitchprime(){
   WDTCTL = WDTPW + WDTHOLD;             // Stop WDT
   
   glitchsetup();
-  _EINT();
+  //_EINT();
+  __eint();
   return;
 #endif
 }
@@ -46,7 +72,7 @@ void glitchsetup(){
 }
 
 // Timer A0 interrupt service routine
-interrupt(TIMERA0_VECTOR) Timer_A (void){
+void __attribute__((interrupt(TIMERA0_VECTOR))) Timer_A (void){
   //This oughtn't be necessary, but glitches repeat without it.
   TACTL=0; //disable counter.
   
@@ -56,7 +82,7 @@ interrupt(TIMERA0_VECTOR) Timer_A (void){
   P5OUT^=BIT7;//Normal
   
   //This oughtn't be necessary, but glitches repeat without it.
-  //TACTL=0; //disable counter.
+  TACTL=0; //disable counter.
   
   //P5OUT^=BIT7;//Normal
   return;
@@ -73,7 +99,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 +111,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 +128,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 +150,13 @@ void glitchhandle(unsigned char app,
     TACTL |= MC0;// Stop Timer_A;
     break;
   case GLITCHTIME:
-    _DINT();//disable interrupts
+    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_2 //smclk source
+      | MC_2; //continuous mode.
     
     //perform the function
     silent++;//Don't want the function to return anything.
@@ -134,17 +164,20 @@ 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:
     //Testing mode, for looking at the glitch waveform.
-    glitchvoltages(0xFFF,0);//Inverted VCC and GND.
+    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");