X-Git-Url: http://git.rot13.org//?a=blobdiff_plain;f=firmware%2Flib%2Fmsp430x2618.c;h=8b72683faeb8138235c26d92349467b61ec65f2e;hb=87c8139ff30306e8269e009d7fbd309dacf6d24e;hp=b3dae0ed8d3b0120fc41a0d54b2d309073ef3447;hpb=e192ebab56a698ab6c9822f8667a4a94542a7690;p=goodfet

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index b3dae0e..8b72683 100644
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,11 +4,12 @@
 
 #include "platform.h"
 
+#include "dco_calib.h"
+
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
 
-
 //! Receive a byte.
 unsigned char serial_rx(){
   char c;
@@ -108,54 +109,52 @@ void msp430_init_uart(){
   //IE2 |= UCA0RXIE;
 }
 
-/* Info Flash Values
-CALDCO_16MHZ 0xdc CALBC1_16MHZ 0x8e   2274-000.txt
-CALDCO_16MHZ 0x74 CALBC1_16MHZ 0x8f   2618-000.txt
-CALDCO_16MHZ 0x6c CALBC1_16MHZ 0x8f   2618-001.txt
-CALDCO_16MHZ 0x97 CALBC1_16MHZ 0x8f   2618-002.txt
-CALDCO_16MHZ 0x6c CALBC1_16MHZ 0x8f   2618-003.txt
-CALDCO_16MHZ 0x95 CALBC1_16MHZ 0x8f   2618-004.txt
-CALDCO_16MHZ 0xcc CALBC1_16MHZ 0x8e   2618-005.txt
-CALDCO_16MHZ 0x87 CALBC1_16MHZ 0x8f   2618-006.txt
-CALDCO_16MHZ 0x96 CALBC1_16MHZ 0x8f   2619-001.txt
-*/
+
+//! Initialization is correct.
+void msp430_init_dco_done(){
+  char *choice=(char *) 0x200; //First word of RAM.
+  choice[0]--;
+}
 
 //! Initialize the MSP430 clock.
 void msp430_init_dco() {
+  int i=1000;
   char *choice=(char *) 0x200; //First word of RAM.
+  
   #ifdef __MSP430_HAS_PORT8__
   P8SEL = 0; // disable XT2 on P8.7/8
   #endif
   
+  //Set P2.6 mode for MSP430F2274
+  #ifndef __MSP430_HAS_PORT5__
+  P2SEL = 0; //disable XIN on 2274
+  #endif
+  
+  
   if(CALBC1_16MHZ!=0xFF){
     //Info is intact, use it.
     BCSCTL1 = CALBC1_16MHZ;
     DCOCTL = CALDCO_16MHZ;
   }else{
-    //Info is missing, guess at a good value.
-    #define CHOICES 4
+    /*
+      Info is missing, guess at a good value.
+      
+      A list of correct calibrations in included as dco_calib.c,
+      generated by script.
+    */
     DCOCTL = 0x00; //clear DCO
-    switch(choice[0]++%CHOICES){
-    default:
-    case 0:
-      BCSCTL1 = 0x8f;   //CALBC1_16MHZ at 0x10f9
-      DCOCTL = 0x83;    //CALDCO_16MHZ at 0x10f8
-      break;
-    case 1:
-      BCSCTL1 = 0x8f;
-      DCOCTL = 0x95;
-      break;
-    case 2:
-      BCSCTL1 = 0x8f;
-      DCOCTL = 0x6c;
-      break;
-    case 3:
-      BCSCTL1 = 0x8e;
-      DCOCTL = 0xdc;
-      break;
-    }
+    
+    BCSCTL1 =  dco_calibrations[2*choice[0]+1];
+    DCOCTL  =  dco_calibrations[2*choice[0]];
+    choice[0]++;
+    choice[0]%=dco_calibrations_count;
   }
   
+  //Minor delay.
+  while(i--);
+  
+  
+  
   return;
 }