X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430SpiP.nc;h=93b942227bb5baf4f5be13d088a5ab0203b2f296;hb=a04046a3331f1baba1e6a568613fec5db58bbe7b;hp=9f3fd177fabddc6079ed4374425502d34de5a476;hpb=35c068bddde37b47eb3965571b5c9f3b5d328cb1;p=tinyos-2.x.git diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc index 9f3fd177..93b94222 100644 --- a/tos/chips/msp430/usci/Msp430SpiP.nc +++ b/tos/chips/msp430/usci/Msp430SpiP.nc @@ -26,15 +26,19 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** - * Spi implementation using a USCI device. + * Spi implementation using a USCI device. When being used as a SPI slave, the + * CSn interface should be wired to the chip select driven by the SPI master so + * the module can know when a communications session is terminated unexpectedly. * * TODO: Implement error checking via UCxxSTAT * + * NOTE: Define NO_REN_ON_SPI to disable PxREN bits when SPI is acquired. + * * @author R. Steve McKown */ - + generic module Msp430SpiP(uint16_t blockSize) { provides { interface SpiByte; @@ -44,6 +48,7 @@ generic module Msp430SpiP(uint16_t blockSize) { uses { interface HplMsp430UsciReg as Registers; interface HplMsp430UsciInt as Interrupts; + interface GeneralIO as CSn; interface HplMsp430GeneralIO as STE; interface HplMsp430GeneralIO as SIMO; interface HplMsp430GeneralIO as SOMI; @@ -61,21 +66,23 @@ implementation { PINS_SOMI, PINS_SIMO, PINS_CLK, +#ifdef NO_REN_ON_SPI PINS_RENADDR, /* This gets added to store the PxREN bit */ +#endif }; uint8_t m_pins; - uint8_t* m_txBuf; - uint8_t* m_rxBuf; - uint16_t m_len; - uint16_t m_pos; + norace uint8_t* m_txBuf; + norace uint8_t* m_rxBuf; + norace uint16_t m_len; + norace uint16_t m_pos; - inline bool is4pin() /* true if the SPI bus is in 4-pin mode */ + inline bool is4pin() /* TRUE if the SPI bus is in 4-pin mode */ { return (call Registers.getCtl0(UCMODE_3)) != UCMODE_0; } - inline bool isBusy() /* true if a SPI transaction is in progress */ + inline bool isBusy() /* TRUE if a SPI transaction is in progress */ { atomic return m_len != 0; } @@ -108,6 +115,7 @@ implementation { /* Configure pins for SPI, saving prior pin states */ m_pins = 0; +#ifdef NO_REN_ON_SPI /* - First save off and disable PxREN bits */ if (is4pin() && call STE.isRen()) { m_pins |= (1 << (PINS_STE + PINS_RENADDR)); @@ -125,6 +133,7 @@ implementation { m_pins |= (1 << (PINS_CLK + PINS_RENADDR)); call CLK.disableRen(); } +#endif /* - Then save off IOFunc state and enable ModuleFunc */ if (is4pin() && call STE.isIOFunc()) { m_pins |= (1 << PINS_STE); @@ -152,12 +161,24 @@ implementation { } } + task void signalSendDone() + { + error_t error = (m_pos == m_len) ? SUCCESS : FAIL; + + m_len = 0; + atomic signal SpiPacket.sendDone(m_txBuf, m_rxBuf, m_pos, error); + } + async command void ResourceConfigure.unconfigure() { atomic { /* Disable the device */ call Registers.setCtl1(UCSWRST); + /* Ensure SpiPacket.sendDone is posted if a trx was in progress */ + if (m_len) + post signalSendDone(); + /* Clear interrupts and interrupt flags. We only used Rx */ call Registers.clrIeRx(); call Registers.clrIfgRx(); @@ -173,6 +194,7 @@ implementation { if (m_pins & (1 << PINS_CLK)) call CLK.selectIOFunc(); /* - Then restore PxREN bits */ +#ifdef NO_REN_ON_SPI if (is4pin() && (m_pins & (1 << (PINS_STE + PINS_RENADDR)))) call STE.enableRen(); if (m_pins & (1 << (PINS_SIMO + PINS_RENADDR))) @@ -181,43 +203,64 @@ implementation { call SOMI.enableRen(); if (m_pins & (1 << (PINS_CLK + PINS_RENADDR))) call CLK.enableRen(); +#endif + } + } + + bool waitOnRx() + { + for (;;) { + if (call Registers.getIfgRx()) + return TRUE; + if (call CSn.get()) /* SPI master has unselected us */ + return FALSE; + } + } + + bool waitOnTx() + { + for (;;) { + if (call Registers.getIfgTx()) + return TRUE; + if (call CSn.get()) /* SPI master has unselected us */ + return FALSE; } } async command uint8_t SpiByte.write(uint8_t byte) { - if (isBusy()) - return 0; - else { - while (!call Registers.getIfgTx() && !call Registers.getCtl1(UCSWRST)); - call Registers.setTxbuf(byte); - while(!call Registers.getIfgRx() && !call Registers.getCtl1(UCSWRST)); - return call Registers.getRxbuf(); + atomic { + if (isBusy()) + return 0; + else { + waitOnTx(); + call Registers.setTxbuf(byte); + waitOnRx(); + return call Registers.getRxbuf(); + } } } - void sendData() + /* If we are a slave, return FALSE if the master has unasserted CSn. */ + bool sendData() { - /* We don't need to check Registers.getIfgTx() (aks UCxxTXIFG), as - * sendData() is only called after peripheral init or receipt of the rx() - * interrupt. SPI on msp430 guarantees UCxxTXIFG is asserted in both of - * these cases. - */ atomic { uint16_t end = m_pos + (blockSize ? blockSize : BLOCKSIZE_DEFAULT); uint8_t tmp; if (end > m_len) end = m_len; + waitOnTx(); /* Don't assume that the last tx is done already */ call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0); while (++m_pos < end) { - while (!call Registers.getIfgRx() && !call Registers.getCtl1(UCSWRST)); + waitOnRx(); tmp = call Registers.getRxbuf(); if (m_rxBuf) - m_rxBuf[m_pos - 1] = call Registers.getRxbuf(); - while (!call Registers.getIfgTx() && !call Registers.getCtl1(UCSWRST)); + m_rxBuf[m_pos - 1] = tmp; + waitOnTx(); call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0); } + return call CSn.get() ? FALSE : TRUE; } } @@ -227,40 +270,31 @@ implementation { if (isBusy() || (!txBuf && !rxBuf) || len == 0) return FAIL; else { - atomic { - m_txBuf = txBuf; - m_rxBuf = rxBuf; - m_len = len; - m_pos = 0; + m_txBuf = txBuf; + m_rxBuf = rxBuf; + m_len = len; + m_pos = 0; + if (sendData()) call Registers.setIeRx(); - sendData(); - return SUCCESS; - } + else + post signalSendDone(); + return SUCCESS; } } async event void Interrupts.tx() {} - task void signalSendDone() - { - atomic { - uint16_t len = m_len; - m_len = 0; - signal SpiPacket.sendDone(m_txBuf, m_rxBuf, len, SUCCESS); - } - } - async event void Interrupts.rx(uint8_t byte) { if (m_rxBuf) m_rxBuf[m_pos - 1] = byte; - if (m_pos < m_len) - sendData(); - else { - call Registers.clrIeRx(); - post signalSendDone(); /* Don't signal from ISR context */ + if (m_pos < m_len) { + if (sendData()) + return; } + call Registers.clrIeRx(); + post signalSendDone(); } default async event void SpiPacket.sendDone(uint8_t*, uint8_t*, uint16_t, @@ -268,7 +302,7 @@ implementation { default async command const msp430_usci_spi_t* Configure.get() { - const static msp430_usci_spi_t def = { + const static msp430_usci_spi_t def = { ctl0: UCSYNC | UCMODE_0 | UCMST, /* 3-pin SPI mode 0, LSB first */ ctl1: UCSWRST | UCSSEL_3, /* SPI clock source is SMCLK */ brx: 10, /* SPI clock=SMCLK/10; ~105KHz if SMCLK=1MHz */ @@ -283,5 +317,7 @@ implementation { async event void Interrupts.i2cStop() {} async event void Interrupts.i2cCal() {} async event void Interrupts.brk() {} - async event void Interrupts.i2cNak() {} + async event void Interrupts.i2cNack() {} + + default async command bool CSn.get() { return FALSE; } }