X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430UartP.nc;h=6f6384db9618ffef37ebbdfd2a91fa0c6860e702;hb=704e3e7ba90d136a08eb9ed930bf3552b5540517;hp=355820460eb6af580b6b211cb13c160596f1cbcd;hpb=706ae98642ef403b5cc9af03486def14cba25799;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/Msp430UartP.nc b/tos/chips/msp430/usci/Msp430UartP.nc
index 35582046..6f6384db 100644
--- a/tos/chips/msp430/usci/Msp430UartP.nc
+++ b/tos/chips/msp430/usci/Msp430UartP.nc
@@ -30,7 +30,10 @@
 /**
  * Uart implementation using a USCI device.
  *
- * @author R. Steve McKown <smckown@gmail.com>
+ * TODO: Implement blocking like in Msp430UartSpiP.nc.
+ *       Implement error checking via UCAxSTAT.
+ *
+ * @author R. Steve McKown <rsmckown@gmail.com>
  */
  
 generic module Msp430UartP() {
@@ -50,42 +53,24 @@ generic module Msp430UartP() {
   }
 }
 implementation {
-  #define saveBits(pin, pos, dir, out, ren) { \
-		if (call pin.isOutput()) \
-			dir |= (1 << pos); \
-		if (call pin.getOut()) \
-			out |= (1 << pos); \
-		if (call pin.isRen()) \
-			ren |= (1 << pos); \
-	}
+  enum {
+    /* Bit positions in m_pins */
+    PINS_RXD = 1,
+    PINS_TXD
+  };
 
-  #define restoreBits(pin, pos, dir, out, ren) { \
-		if (ren & (1 << pos)) \
-			call pin.enableRen(); \
-		else \
-			call pin.disableRen(); \
-		if (out & (1 << pos)) \
-			call pin.set(); \
-		else \
-			call pin.clr(); \
-		if (dir & (1 << pos)) \
-			call pin.makeOutput(); \
-		else \
-			call pin.makeInput(); \
-	}
+  uint8_t m_pins;
+  uint8_t* m_sobuf; 	/* Original buffer ptr from UartStream.send() */
+  uint16_t m_solen;	/* Original buffer len from UartStream.send() */
+  uint8_t* m_sbuf;	/* Position of next char to send */
+  uint16_t m_slen;	/* Len of chars in m_sbuf to send */
+  bool m_rxie;		/* Set if rxie has been enabled to UartStream.receive() */
+  uint8_t* m_robuf;	/* Original receive buffer */
+  uint16_t m_rolen;	/* Original (maximum) receive len */
+  uint8_t* m_rbuf;	/* Position of next byte in which to receive a char */
+  uint16_t m_rlen;	/* Remaining length in receive buffer */
 
-  uint8_t dir; /* Pin state storage to allow for proper unconfiguration */
-  uint8_t out;
-  uint8_t ren;
-  uint8_t* sobuf; /* Original buffer ptr from UartStream.send() */
-  uint8_t solen;	/* Original buffer len from UartStream.send() */
-  uint8_t* sbuf; /* Position of next char to send */
-  uint8_t slen;	/* Len of chars in sbuf to send */
-  bool rxie;	/* Set if rxie has been enabled to UartStream.receive() */
-  uint8_t* robuf; /* Original receive buffer */
-  uint8_t rolen; /* Original (maximum) receive len */
-  uint8_t* rbuf; /* Position of next byte in which to receive a char */
-  uint8_t rlen; /* Remaining length in receive buffer */
+  sfrb(MYBRX, 219U);
 
   async command void ResourceConfigure.configure()
   {
@@ -103,38 +88,21 @@ implementation {
       call Registers.assignIrtctl(config->irtctl);
       call Registers.assignIrrctl(config->irrctl);
       call Registers.assignAbctl(config->abctl);
-      call Registers.clrStat(UCLISTEN);
+      if (config->uclisten)
+	call Registers.setStat(UCLISTEN);
+      else
+	call Registers.clrStat(UCLISTEN);
 
-      /* Save pin IO states */
-      dir = out = ren = 0;
-      saveBits(RXD, 0, dir, out, ren);
-      saveBits(TXD, 1, dir, out, ren);
-
-      /* Configure RX pin for UART use */
-      call RXD.makeInput();
-      if (config->ren & USCI_REN_RX) {
-	if (config->ren & USCI_REN_RX_PULLUP)
-	  call RXD.set();
-	else
-	  call RXD.clr();
-	call RXD.enableRen();
+      /* Configure pins for UART, saving prior pin states */
+      m_pins = 0;
+      if (call RXD.isIOFunc()) {
+	m_pins |= (1 << PINS_RXD);
+	call RXD.selectModuleFunc();
       }
-      call RXD.selectModuleFunc();
-
-#if 0 /* pull-ups don't make sense on TXD, since it doesn't appear that
-       * enabling an open-drain emulation mode via USCI is possible.
-       */
-
-      /* Configure TX pin for UART use */
-      if (config->ren & USCI_REN_TX) {
-	if (config->ren & USCI_REN_TX_PULLUP)
-	  call TXD.set();
-	else
-	  call TXD.clr();
-	call TXD.enableRen();
+      if (call TXD.isIOFunc()) {
+	m_pins |= (1 << PINS_TXD);
+	call TXD.selectModuleFunc();
       }
-      call TXD.selectModuleFunc();
-#endif
 
       /* Clear interrupts; we'll add them as needed */
       call Registers.clrIeRx();
@@ -149,21 +117,18 @@ implementation {
   {
     atomic {
       /* Disable the device */
-      call Registers.setCtl1(UCSYNC);
+      call Registers.setCtl1(UCSWRST);
 
       /* Clear interrupts and interrupt flags */
       call Registers.clrIeRx();
       call Registers.clrIeTx();
       call Registers.clrIfgRx();
-      call Registers.clrIfgTx();
 
-      /* Restore pins to their preconfigured state */
-#if 0
-      restoreBits(RXD, 0, dir, out, ren);
-      restoreBits(TXD, 0, dir, out, ren);
-#endif
-      call RXD.selectIOFunc();
-      call TXD.selectIOFunc();
+      /* Restore pins to their pre-configure state */
+      if (m_pins & PINS_RXD)
+	call RXD.selectIOFunc();
+      if (m_pins & PINS_TXD)
+	call TXD.selectIOFunc();
     }
   }
 
@@ -171,9 +136,9 @@ implementation {
   {
     /* FIXME: race with UartStream.send() */
     atomic {
-      if (sobuf)
+      if (m_sobuf)
 	return FAIL;
-      while (call Registers.getStat(UCBUSY));
+      while (!call Registers.getIfgTx());
       call Registers.setTxbuf(byte);
       return SUCCESS;
     }
@@ -181,40 +146,45 @@ implementation {
 
   async command error_t UartStream.send(uint8_t* buf, uint16_t len)
   {
-    if (sobuf || !buf || !len)
-      return FAIL;
-    sobuf = buf;
-    solen = len;
-    call Registers.setIeTx();
-    call Registers.setTxbuf(*sobuf);
-    slen = solen - 1;
-    if (slen)
-      sbuf = sobuf + 1;
-    return SUCCESS;
+    atomic {
+      if (m_sobuf || !buf || !len)
+	return FAIL;
+      m_sobuf = buf;
+      m_solen = len;
+      while (!call Registers.getIfgTx());
+      call Registers.setIeTx();
+      call Registers.setTxbuf(*m_sobuf);
+      m_slen = m_solen - 1;
+      if (m_slen)
+	m_sbuf = m_sobuf + 1;
+      return SUCCESS;
+    }
   }
 
   async event void Interrupts.tx()
   {
-    while (slen && call Registers.getIfgTx()) {
-      call Registers.setTxbuf(*sbuf);
-      if (--slen)
-	sbuf++;
+    /* FIXME: this can cause an arbitrarily long ISR, if m_slen is large.
+     * But depending on timing, we may always only write 1 byte.
+     */
+    while (m_slen && call Registers.getIfgTx()) {
+      call Registers.setTxbuf(*m_sbuf);
+      if (--m_slen)
+	m_sbuf++;
     }
-    if (slen == 0 && sobuf) {
+    if (m_slen == 0 && m_sobuf) {
       call Registers.clrIeTx();
-      call Registers.clrIfgTx();
-      sobuf = 0;
-      signal UartStream.sendDone(sobuf, solen, SUCCESS);
+      m_sobuf = 0;
+      signal UartStream.sendDone(m_sobuf, m_solen, SUCCESS);
     }
   }
 
   async command error_t UartStream.enableReceiveInterrupt()
   {
     atomic {
-      if (!robuf)
+      if (!m_robuf)
 	call Registers.clrIfgRx();
       call Registers.setIeRx();
-      rxie = FALSE;
+      m_rxie = FALSE;
       return SUCCESS;
     }
   }
@@ -222,11 +192,11 @@ implementation {
   async command error_t UartStream.disableReceiveInterrupt()
   {
     atomic {
-      if (!robuf) {
+      if (!m_robuf) {
 	call Registers.clrIeRx();
 	call Registers.clrIfgRx();
       } else
-	rxie = TRUE;
+	m_rxie = TRUE;
       return SUCCESS;
     }
   }
@@ -237,7 +207,7 @@ implementation {
       uint16_t t;
 
       /* FIXME: race with UartStream.receive() */
-      if (robuf || !byte)
+      if (m_robuf || !byte)
 	return FAIL;
       /* TODO: implement timeout, byte-time units.  For now, 1-2 sec */
       t = TBR;
@@ -254,52 +224,54 @@ implementation {
   async command error_t UartStream.receive(uint8_t* buf, uint16_t len)
   {
     atomic {
-      if (robuf || !buf || !len)
+      if (m_robuf || !buf || !len)
 	return FAIL;
-      robuf = rbuf = buf;
-      rolen = rlen = len;
+      m_robuf = m_rbuf = buf;
+      m_rolen = m_rlen = len;
       if (!call Registers.getIeRx()) {
 	call Registers.clrIfgRx();
 	call Registers.setIeRx();
-	rxie = TRUE;
+	m_rxie = TRUE;
       } else
-	rxie = FALSE;
+	m_rxie = FALSE;
     }
   }
 
   async event void Interrupts.rx(uint8_t byte)
   {
-    atomic {
-      if (robuf) {
-	/* receive() takes precedence if active */
-	while (rlen && call Registers.getIfgRx()) {
-	  *rbuf = byte;
-	  if (--rlen)
-	    rbuf++;
-	}
-	if (rlen == 0 && robuf) {
-	  if (rxie) {
-	    call Registers.clrIeRx();
-	    call Registers.clrIfgRx();
-	  }
-	  robuf = 0;
-	  signal UartStream.receiveDone(robuf, rolen, SUCCESS);
+    if (m_robuf) {
+      /* receive() takes precedence if active */
+      /* FIXME: an arbitrarily long ISR may occur if m_rlen is large.
+       * But depending on timing, we may always only read 1 byte.
+       */
+      while (m_rlen && call Registers.getIfgRx()) {
+	*m_rbuf = byte;
+	if (--m_rlen)
+	  m_rbuf++;
+      }
+      if (m_rlen == 0 && m_robuf) {
+	if (m_rxie) {
+	  call Registers.clrIeRx();
+	  call Registers.clrIfgRx();
 	}
-      } else
-	signal UartStream.receivedByte(byte);
-    }
+	m_robuf = 0;
+	signal UartStream.receiveDone(m_robuf, m_rolen, SUCCESS);
+      }
+    } else
+      signal UartStream.receivedByte(byte);
   }
 
   default async command const msp430_usci_uart_t* Configure.get()
   {
     const static msp430_usci_uart_t def = { 
       ctl0: UCMODE_0,		/* async, lsb first, 8N1 */
-      ctl1: UCSWRST|UCSSEL_3,	/* clock uart from SMCLK */
+      ctl1: UCSWRST | UCSSEL_3,	/* clock uart from SMCLK */
       brx: UBRX_1MHZ_115200,
       mctl: UMCTL_1MHZ_115200,
       irtctl: 0,
       irrctl: 0,
       abctl: 0,
+      uclisten: FALSE,
       ren: USCI_REN_NONE
     };