X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Flib%2Fmsp430x1612.c;h=d577e502c680fa4f3bcd3e85ec4e10de1245e05f;hb=345dd7e12dca804dcd7c8b3f69a332752bcc2642;hp=e1d03a7e6de008205b4f42076264b80561bf89f8;hpb=3e2cb34748f8b81f2b584da8174fce3bbcd5ae9e;p=goodfet

diff --git a/firmware/lib/msp430x1612.c b/firmware/lib/msp430x1612.c
index e1d03a7..d577e50 100644
--- a/firmware/lib/msp430x1612.c
+++ b/firmware/lib/msp430x1612.c
@@ -2,38 +2,40 @@
 
 #include "platform.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(!(IFG1&URXIFG0));//wait for a byte
   c = RXBUF0;
   IFG1&=~URXIFG0;
   U0TCTL &= ~URXSE;
-  
+
   return c;
 }
 
 //! Receive a byte.
 unsigned char serial1_rx(){
   char c;
-  
+
   while(!(IFG2&URXIFG1));//wait for a byte
   c = RXBUF1;
   IFG2&=~URXIFG1;
   U1TCTL &= ~URXSE;
-  
+
   return c;
 }
 
-
 //! Transmit a byte.
-void serial_tx(unsigned char x){
+void serial0_tx(unsigned char x){
   while ((IFG1 & UTXIFG0) == 0); //loop until buffer is free
   TXBUF0 = x;
 }
@@ -44,9 +46,17 @@ void serial1_tx(unsigned char x){
   TXBUF1 = x;
 }
 
+/** Later, add support for the EZ430/FETUIF with 12MHz crystal
+    UBR00=0xE2; UBR10=0x04; UMCTL0=0x00; // uart0 12000000Hz 9600bps
+    UBR00=0x71; UBR10=0x02; UMCTL0=0x00; // uart0 12000000Hz 19200bps
+    UBR00=0x38; UBR10=0x01; UMCTL0=0x55; // uart0 12000000Hz 38400bps
+    UBR00=0xD0; UBR10=0x00; UMCTL0=0x4A; // uart0 12000000Hz 57581bps
+    UBR00=0x68; UBR10=0x00; UMCTL0=0x04; // uart0 12000000Hz 115273bps
+ */
+
 //! Set the baud rate.
-void setbaud(unsigned char rate){
-  
+void setbaud0(unsigned char rate){
+
   //http://mspgcc.sourceforge.net/baudrate.html
   switch(rate){
   case 1://9600 baud
@@ -70,7 +80,6 @@ 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
@@ -93,17 +102,17 @@ void setbaud1(unsigned char rate){
 }
 
 
-void msp430_init_uart(){
-  
+void msp430_init_uart0(){
+  /* RS232 */
+
   P3SEL |= BIT4|BIT5;                        // P3.4,5 = USART0 TXD/RXD
   P3DIR |= BIT4;
-  
+
   UCTL0 = SWRST | CHAR;                 /* 8-bit character, UART mode */
   UTCTL0 = SSEL1;                       /* UCLK = MCLK */
-  
-  setbaud(0);
-  
-  //Necessary for bit-banging, switch to hardware for performance.
+
+  setbaud0(0);
+
   ME1 &= ~USPIE0;			/* USART1 SPI module disable */
   ME1 |= (UTXE0 | URXE0);               /* Enable USART1 TXD/RXD */
 
@@ -111,14 +120,63 @@ void msp430_init_uart(){
 
   /* XXX Clear pending interrupts before enable!!! */
   U0TCTL |= URXSE;
-  
-  
+
+
   //IE1 |= URXIE1;                        /* Enable USART1 RX interrupt  */
 }
 
 
+void msp430_init_uart1(){
+
+  /* RS232 */
+  P3DIR &= ~0x80;			/* Select P37 for input (UART1RX) */
+  P3DIR |= 0x40;			/* Select P36 for output (UART1TX) */
+  P3SEL |= 0xC0;			/* Select P36,P37 for UART1{TX,RX} */
+
+  UCTL1 = SWRST | CHAR;                 /* 8-bit character, UART mode */
+  UTCTL1 = SSEL1;                       /* UCLK = MCLK */
+
+  setbaud1(0);
+
+  ME2 &= ~USPIE1;			/* USART1 SPI module disable */
+  ME2 |= (UTXE1 | URXE1);               /* Enable USART1 TXD/RXD */
+
+  UCTL1 &= ~SWRST;
+
+  /* XXX Clear pending interrupts before enable!!! */
+  U1TCTL |= URXSE;
+
+  //IE2 |= URXIE1;                        /* Enable USART1 RX interrupt  */
+}
+
+
+/** For EZ430/FETUIF
+ void msp430_init_dco() {
+  WDTCTL = WDTPW + WDTHOLD; //stop WDT
+
+  BCSCTL1 = 0;
+
+  do {
+    int i;
+    IFG1 &= ~OFIFG;
+    for (i=0; i<1000; i++);
+
+  } while (IFG1 & OFIFG);
+
+  BCSCTL2 = SELM1 | DIVM1 | SELS;
+
+}
+ */
+
+
+//! Initialization is correct.
+void msp430_init_dco_done(){
+  //Nothing to do for the 1612.
+}
+
+
 void msp430_init_dco() {
-    /* This code taken from the FU Berlin sources and reformatted. */
+/* This code taken from the FU Berlin sources and reformatted. */
   //
 
 //Works well.
@@ -128,17 +186,17 @@ void msp430_init_dco() {
 //#define MSP430_CPU_SPEED 4915200UL
 
 //Max speed.
-//#deefine MSP430_CPU_SPEED 4500000UL
+//#define MSP430_CPU_SPEED 4500000UL
 
 //baud rate speed
 #define MSP430_CPU_SPEED 3683400UL
 #define DELTA    ((MSP430_CPU_SPEED) / (32768 / 8))
   unsigned int compare, oldcapture = 0;
   unsigned int i;
-  
+
   WDTCTL = WDTPW + WDTHOLD; //stop WDT
-  
-  
+
+
   DCOCTL=0xF0;
   //a4
   //1100
@@ -146,12 +204,12 @@ void msp430_init_dco() {
   /* ACLK is devided by 4. RSEL=6 no division for MCLK
      and SSMCLK. XT2 is off. */
   //BCSCTL1 = 0xa8;
-  
+
   BCSCTL2 = 0x00; /* Init FLL to desired frequency using the 32762Hz
 		     crystal DCO frquenzy = 2,4576 MHz  */
-  
-  P1OUT|=1;
-  
+
+  PLEDOUT|=PLEDPIN;
+
   BCSCTL1 |= DIVA1 + DIVA0;             /* ACLK = LFXT1CLK/8 */
   for(i = 0xffff; i > 0; i--) {         /* Delay for XTAL to settle */
     asm("nop");
@@ -184,12 +242,13 @@ void msp430_init_dco() {
                                         /* -> Select next higher RSEL  */
     }
   }
-  
+
   CCTL2 = 0;                            /* Stop CCR2 function */
   TACTL = 0;                            /* Stop Timer_A */
 
   BCSCTL1 &= ~(DIVA1 + DIVA0);          /* remove /8 divisor from ACLK again */
-  
-  P1OUT=0;
+
+  PLEDOUT=~PLEDPIN;
+
 }