DCO table, wider support.

[goodfet] / firmware / lib / msp430x2618.c

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 587d6e2..426106d 100644 (file)
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,6 +4,8 @@
 
 #include "platform.h"
 
+#include "dco_calib.h"
+
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
@@ -107,17 +109,6 @@ 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(){
@@ -141,33 +132,15 @@ void msp430_init_dco() {
     /*
       Info is missing, guess at a good value.
       
-      For now, the choice doesn't jump backward after a successful
-      connection.  For that reason, keep this list as small as possible.
-      Future revisions will subtract one from choice[0] after a successful
-      connection, keeping choice[1] as the target.
+      A list of correct calibrations in included as dco_calib.c,
+      generated by script.
     */
-      
-    #define CHOICES 4
     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.