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

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 587d6e2..408e3ee 100644
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,18 +4,24 @@
 
 #include "platform.h"
 
+#include "dco_calib.h"
+#ifdef __MSPGCC__
+#include <msp430.h>
+#else
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
+#endif
+
 
 //! Receive a byte.
-unsigned char serial_rx(){
+unsigned char serial0_rx(){
   char c;
-  
+
   while(!(IFG2&UCA0RXIFG));//wait for a byte
   c = UCA0RXBUF;
   IFG2&=~UCA0RXIFG;
-  
+
   //UCA0CTL1 &= ~UCA0RXSE;
   return c;
 }
@@ -27,7 +33,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,8 +51,8 @@ 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){
   case 1://9600 baud
@@ -75,49 +81,38 @@ void setbaud(unsigned char rate){
 
 //! Set the baud rate of the second uart.
 void setbaud1(unsigned char rate){
-  
+
 }
 
 #define BAUD0EN 0x41
 #define BAUD1EN 0x03
 
 void msp430_init_uart(){
-  
+
   // Serial on P3.4, P3.5
   P3SEL |= BIT4 + BIT5;
   P3DIR |= BIT4;
-  
+
   //UCA0CTL1 |= UCSWRST;                    /* disable UART */
-  
+
   UCA0CTL0 = 0x00;
   //UCA0CTL0 |= UCMSB ;
-  
+
   UCA0CTL1 |= UCSSEL_2;                     // SMCLK
-  
+
   //UCA0BR0 = BAUD0EN;                        // 115200
   //UCA0BR1 = BAUD1EN;
   setbaud(5);//default baud, 115200
-  
+
   UCA0MCTL = 0;                             // Modulation UCBRSx = 5
   UCA0CTL1 &= ~UCSWRST;                     // **Initialize USCI state machine**
-  
-  
+
+
   //Leave this commented!
   //Interrupt is handled by target code, not by bootloader.
   //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 +124,21 @@ 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
+
+
+  #ifdef STATICDCO
+  BCSCTL1 = (STATICDCO>>8);
+  DCOCTL  = (STATICDCO&0xFF);
+  #else
   if(CALBC1_16MHZ!=0xFF){
     //Info is intact, use it.
     BCSCTL1 = CALBC1_16MHZ;
@@ -140,39 +146,24 @@ void msp430_init_dco() {
   }else{
     /*
       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;
   }
-  
+  #endif
+
   //Minor delay.
   while(i--);
-  
+
+
+
   return;
 }