X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Flib%2Fmsp430x2618.c;h=dcdafd51da43755da85112da487abe2b338b81c5;hp=587d6e2eb85998f914cc9152fa4678b4002e4ce1;hb=c1ef7ebcf885f8eac4fb047a376393fc7c7de196;hpb=f217c730250832ae74a60b9d494111eac3763fd6

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 587d6e2..dcdafd5 100644
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,12 +4,14 @@
 
 #include "platform.h"
 
+#include "dco_calib.h"
+
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
 
 //! Receive a byte.
-unsigned char serial_rx(){
+unsigned char serial0_rx(){
   char c;
   
   while(!(IFG2&UCA0RXIFG));//wait for a byte
@@ -27,7 +29,7 @@ unsigned char serial1_rx(){
 }
 
 //! Transmit a byte.
-void serial_tx(unsigned char x){
+void serial0_tx(unsigned char x){
   while ((IFG2 & UCA0TXIFG) == 0); //loop until buffer is free
   UCA0TXBUF = x;	/* send the character */
   while(!(IFG2 & UCA0TXIFG));
@@ -45,7 +47,7 @@ void serial1_tx(unsigned char x){
 }
 
 //! Set the baud rate.
-void setbaud(unsigned char rate){
+void setbaud0(unsigned char rate){
   
   //Table 15-4, page 481 of 2xx Family Guide
   switch(rate){
@@ -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(){
@@ -129,10 +120,17 @@ void msp430_init_dco_done(){
 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;
@@ -141,38 +139,22 @@ 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.
   while(i--);
   
+  
+  
   return;
 }