Removed NOP for loop that breaks GCC4.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@910 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index c7563e6..f5c7ece 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -61,7 +61,7 @@ void init()
 #ifdef DAC12IR
        //glitchvoltages(0xfff,0xfff);
        ADC12CTL0 = REF2_5V + REFON;                                    // Internal 2.5V ref on
 #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
        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

diff --git a/firmware/include/command.h b/firmware/include/command.h
index dfa4003..fd50ccb 100644 (file)
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -35,8 +35,8 @@ extern unsigned char silent;
 
 #define cmddataword ((unsigned int*) cmddata)
 #define cmddatalong ((unsigned long*) cmddata)
 
 #define cmddataword ((unsigned int*) cmddata)
 #define cmddatalong ((unsigned long*) cmddata)

-#define memorybyte ((unsigned char*) 0)
-#define memoryword ((unsigned int*) 0)
+#define memorybyte ((char*)  0)
+//#define memoryword ((unsigned int*)  0))

 
 // Global Commands
 #define READ  0x00
 
 // Global Commands
 #define READ  0x00