updates.

[goodfet] / firmware / lib / msp430x2618.c

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 6238fe2..dcdafd5 100644 (file)
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,13 +4,14 @@
 
 #include "platform.h"
 
 
 #include "platform.h"
 

+#include "dco_calib.h"
+

 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
 
 #include <signal.h>
 #include <io.h>
 #include <iomacros.h>
 

-

 //! Receive a byte.
 //! Receive a byte.

-unsigned char serial_rx(){
+unsigned char serial0_rx(){

   char c;
   
   while(!(IFG2&UCA0RXIFG));//wait for a byte
   char c;
   
   while(!(IFG2&UCA0RXIFG));//wait for a byte


@@ -28,7 +29,7 @@ unsigned char serial1_rx(){
 }
 
 //! Transmit a byte.
 }
 
 //! 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));
   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.
 }
 
 //! 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){
   
   //Table 15-4, page 481 of 2xx Family Guide
   switch(rate){


@@ -77,78 +78,83 @@ void setbaud(unsigned char rate){
 //! Set the baud rate of the second uart.
 void setbaud1(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(){
 }
 
 #define BAUD0EN 0x41
 #define BAUD1EN 0x03
 
 void msp430_init_uart(){

-
-  // Serial on P3.4, P3.5                                                                                                                                                 
+  
+  // Serial on P3.4, P3.5

   P3SEL |= BIT4 + BIT5;
   P3DIR |= BIT4;
   P3SEL |= BIT4 + BIT5;
   P3DIR |= BIT4;

-
-  //UCA0CTL1 |= UCSWRST;                    /* disable UART */                                                                                                            
-
+  
+  //UCA0CTL1 |= UCSWRST;                    /* disable UART */
+  

   UCA0CTL0 = 0x00;
   UCA0CTL0 = 0x00;

-  //UCA0CTL0 |= UCMSB ;                                                                                                                                                   
-  UCA0CTL1 |= UCSSEL_2;                     // SMCLK                                                                                                                      
-
-  //UCA0BR0 = BAUD0EN;                        // 115200                                                                                                                     
+  //UCA0CTL0 |= UCMSB ;
+  
+  UCA0CTL1 |= UCSSEL_2;                     // SMCLK
+  
+  //UCA0BR0 = BAUD0EN;                        // 115200

   //UCA0BR1 = BAUD1EN;
   setbaud(5);//default baud, 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;
+}

 
 

-  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;         

 
 

+//! 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() {
 }
 
 //! Initialize the MSP430 clock.
 void msp430_init_dco() {

-  //LED lights when init_dco begins,
-  //then dims when successful.
-  PLEDOUT|=PLEDPIN;
+  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 && CALDCO_16MHZ!=0xFF){
+  
+  if(CALBC1_16MHZ!=0xFF){

     //Info is intact, use it.
     BCSCTL1 = CALBC1_16MHZ;
     DCOCTL = CALDCO_16MHZ;
   }else{
     //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
-      BCSCTL1 = 0x8f;   //CALBC1_16MHZ at 0x10f9
-      DCOCTL = 0x7f;    //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;

   }
   
   }
   

-  //Hopefully by here the clock is meaningful.
-  PLEDOUT&=~PLEDPIN;
+  //Minor delay.
+  while(i--);
+  
+  
+  

   return;
 }
 
   return;
 }