projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commented some outdated debugging strings in the maxusb firmware, added some counter...
[goodfet]
/
firmware
/
apps
/
glitch
/
glitch.c
diff --git
a/firmware/apps/glitch/glitch.c
b/firmware/apps/glitch/glitch.c
index
40e8122
..
83fa9d6
100644
(file)
--- a/
firmware/apps/glitch/glitch.c
+++ b/
firmware/apps/glitch/glitch.c
@@
-11,6
+11,8
@@
#include "command.h"
#include "glitch.h"
#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,
//! Handles a monitor command.
void glitch_handle_fn( uint8_t const app,
uint8_t const verb,
@@
-41,7
+43,8
@@
void glitchprime(){
WDTCTL = WDTPW + WDTHOLD; // Stop WDT
glitchsetup();
WDTCTL = WDTPW + WDTHOLD; // Stop WDT
glitchsetup();
- _EINT();
+ //_EINT();
+ __eint();
return;
#endif
}
return;
#endif
}
@@
-69,7
+72,7
@@
void glitchsetup(){
}
// Timer A0 interrupt service routine
}
// 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.
//This oughtn't be necessary, but glitches repeat without it.
TACTL=0; //disable counter.
@@
-148,11
+151,11
@@
void glitch_handle_fn( uint8_t const app,
break;
case GLITCHTIME:
debugstr("Measuring start time.");
break;
case GLITCHTIME:
debugstr("Measuring start time.");
- _
DINT
();//disable interrupts
+ _
_dint
();//disable interrupts
TACTL=0; //clear dividers
TACTL|=TACLR; //clear config
TACTL|=
TACTL=0; //clear dividers
TACTL|=TACLR; //clear config
TACTL|=
- TASSEL_
SMCLK
//smclk source
+ TASSEL_
2
//smclk source
| MC_2; //continuous mode.
//perform the function
| MC_2; //continuous mode.
//perform the function