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

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 6e8675e..dcdafd5 100644
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,13 +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
@@ -28,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));
@@ -46,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){
@@ -77,91 +78,83 @@ void setbaud(unsigned char rate){
 //! Set the baud rate of the second uart.
 void setbaud1(unsigned char rate){
   
-  //http://mspgcc.sourceforge.net/baudrate.html
-  switch(rate){
-  case 1://9600 baud
-    
-    break;
-  case 2://19200 baud
-    break;
-  case 3://38400 baud
-    
-    break;
-  case 4://57600 baud
-    
-    break;
-  default:
-  case 5://115200 baud
-    
-    break;
-  }
 }
 
 #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(){
+  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.
-    switch(*((int*)0xff0)){
-    default:
-    case 0x6ff2:        //f26f, the MSP430F2618
-      DCOCTL = 0x00;
-      #ifndef DCOVAL
-      #define DCOVAL 0x8f
-      #endif
-      BCSCTL1 = DCOVAL;   //CALBC1_16MHZ at 0x10f9
-      /** Observed DCOCTL values:
-	  2618: 7f, 97
-      */
-      DCOCTL = 0x83;    //CALDCO_16MHZ at 0x10f8
-      break;
-    }
+    /*
+      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
+    
+    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;
 }