Fixed force of msp430x2618 in Makefile.

[goodfet] / firmware / goodfet.c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index c7563e6..124a352 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -18,10 +18,6 @@
 //! Initialize registers and all that jazz.
 void init()
 {
-#ifdef DAC12IR
-       int i;
-#endif
-
        WDTCTL = WDTPW + WDTHOLD;                                       // Stop watchdog timer
 
        //LED out and on.
@@ -61,7 +57,7 @@ void init()
 #ifdef DAC12IR
        //glitchvoltages(0xfff,0xfff);
        ADC12CTL0 = REF2_5V + REFON;                                    // Internal 2.5V ref on
-       for(i=0;i!=0xFFFF;i++) asm("nop");
+       //for(i=0;i!=0xFFFF;i++) asm("nop"); //DO NOT UNCOMMENT, breaks GCC4
        DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1
        DAC12_0DAT = 0xFFF; //Max voltage 0xfff
        DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1