Plugins work again.

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

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 900e836..3da4d04 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -18,6 +18,7 @@
 \r
 //! Initialize registers and all that jazz.\r
 void init(){\r
+  int i;\r
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer\r
   \r
   //LED out and on.\r
@@ -30,7 +31,11 @@ void init(){
   \r
   //DAC should be at full voltage if it exists.\r
   #ifdef DAC12IR\r
-  glitchvoltages(0xfff,0xfff);\r
+  //glitchvoltages(0xfff,0xfff);\r
+  ADC12CTL0 = REF2_5V + REFON;                  // Internal 2.5V ref on\r
+  for(i=0;i!=0xFFFF;i++) asm("nop");\r
+  DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1\r
+  DAC12_0DAT = 0xFFF; //Max voltage\r
   #endif\r
   \r
   //Enable Interrupts.\r

diff --git a/firmware/include/glitch.h b/firmware/include/glitch.h
index 16ccea8..8cbe7ed 100644 (file)
--- a/firmware/include/glitch.h
+++ b/firmware/include/glitch.h
@@ -32,6 +32,6 @@ void glitchvoltages(u16 low, u16 high);
 void glitchrate(u16 rate);
 
 //! Handles a monitor command.
-void glitchhandle(unsigned char app,
+extern void glitchhandle(unsigned char app,
                  unsigned char verb,
-                 unsigned long len);
+                 unsigned long len) WEAKDEF;