From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Fri, 5 Feb 2010 01:15:52 +0000 (+0000)
Subject: Plugins work again.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=05ac6a3b363a2055e1540522e0bd2178360d6bfe;hp=74aafc7c7bd2cfb7c355d170b9d3a548dfa8e0c1

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