X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=firmware%2Flib%2Fmsp430x2618.c;h=408e3eea76cc5edf0079462322e25962c0dc95c3;hb=350c674c6bcd97ec2f883b07e0cf49eb8a480183;hp=9409f56995ba33d6091743f14264eece0c253ec3;hpb=ed7afb6af8b3831d61a8ef6cba7592f17592af72;p=goodfet

diff --git a/firmware/lib/msp430x2618.c b/firmware/lib/msp430x2618.c
index 9409f56..408e3ee 100644
--- a/firmware/lib/msp430x2618.c
+++ b/firmware/lib/msp430x2618.c
@@ -4,19 +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;
 }
@@ -28,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));
@@ -46,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
@@ -76,25 +81,7 @@ 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
@@ -126,23 +113,57 @@ void msp430_init_uart(){
   //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() {
-  if(CALBC1_16MHZ!=0xFF && CALDCO_16MHZ!=0xFF){
+  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;
     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;
   }
-  
+  #endif
+
+  //Minor delay.
+  while(i--);
+
+
+
   return;
 }