1 files changed, 18 insertions, 16 deletions
diff --git a/os/hal/ports/MSP430X/hal_spi_lld.c b/os/hal/ports/MSP430X/hal_spi_lld.c
index 70a357e..3a54b1e 100644
--- a/os/hal/ports/MSP430X/hal_spi_lld.c
+++ b/os/hal/ports/MSP430X/hal_spi_lld.c
@@ -104,21 +104,21 @@ static uint16_t dummyrx;
 static void init_transfer(SPIDriver * spip) {
 
 #if MSP430X_SPI_EXCLUSIVE_DMA == TRUE || defined(__DOXYGEN__)
-  if (spip->config->dmarx_index > MSP430X_DMA_CHANNELS) {
-    dmaRequest(&(spip->rx_req), TIME_INFINITE);
+  if (spip->config->dmarx_index >= MSP430X_DMA_CHANNELS) {
+    dmaRequestS(&(spip->rx_req), TIME_INFINITE);
   }
   else {
     dmaTransfer(&(spip->dmarx), &(spip->rx_req));
   }
-  if (spip->config->dmatx_index > MSP430X_DMA_CHANNELS) {
-    dmaRequest(&(spip->tx_req), TIME_INFINITE);
+  if (spip->config->dmatx_index >= MSP430X_DMA_CHANNELS) {
+    dmaRequestS(&(spip->tx_req), TIME_INFINITE);
   }
   else {
     dmaTransfer(&(spip->dmatx), &(spip->tx_req));
   }
 #else
-  dmaRequest(&(spip->rx_req), TIME_INFINITE);
-  dmaRequest(&(spip->tx_req), TIME_INFINITE);
+  dmaRequestS(&(spip->rx_req), TIME_INFINITE);
+  dmaRequestS(&(spip->tx_req), TIME_INFINITE);
 #endif
 
   *(spip->ifg) |= UCTXIFG;
@@ -325,11 +325,11 @@ void spi_lld_start(SPIDriver * spip) {
     /* Claim DMA streams here */
     bool b;
     if (spip->config->dmatx_index < MSP430X_DMA_CHANNELS) {
-      b = dmaAcquire(&(spip->dmatx), spip->config->dmatx_index);
+      b = dmaAcquireI(&(spip->dmatx), spip->config->dmatx_index);
       osalDbgAssert(!b, "stream already allocated");
     }
     if (spip->config->dmarx_index < MSP430X_DMA_CHANNELS) {
-      b = dmaAcquire(&(spip->dmarx), spip->config->dmarx_index);
+      b = dmaAcquireI(&(spip->dmarx), spip->config->dmarx_index);
       osalDbgAssert(!b, "stream already allocated");
     }
 #endif /* MSP430X_SPI_EXCLUSIVE_DMA */
@@ -388,10 +388,11 @@ void spi_lld_start(SPIDriver * spip) {
   spip->regs->ctlw0 = UCSWRST;
   spip->regs->brw   = brw;
   spip->regs->ctlw0 =
-      (spip->config->spi_mode << 14) | (spip->config->bit_order << 13) |
+      ((spip->config->spi_mode ^ 0x02) << 14) | (spip->config->bit_order << 13) |
       (spip->config->data_size << 12) | (UCMST) |
       ((spip->config->ss_line ? 0 : 2) << 9) | (UCSYNC) | (ssel) | (UCSTEM);
   *(spip->ifg) = 0;
+  spi_lld_unselect(spip);
 }
 
 /**
@@ -406,8 +407,12 @@ void spi_lld_stop(SPIDriver * spip) {
   if (spip->state == SPI_READY) {
 /* Disables the peripheral.*/
 #if MSP430X_SPI_EXCLUSIVE_DMA == TRUE
-    dmaRelease(&(spip->dmatx));
-    dmaRelease(&(spip->dmarx));
+    if (spip->config->dmatx_index < MSP430X_DMA_CHANNELS) {
+      dmaRelease(&(spip->dmatx));
+    }
+    if (spip->config->dmarx_index < MSP430X_DMA_CHANNELS) {
+      dmaRelease(&(spip->dmarx));
+    }
 #endif
     spip->regs->ctlw0 = UCSWRST;
   }
@@ -561,15 +566,12 @@ void spi_lld_receive(SPIDriver * spip, size_t n, void * rxbuf) {
  * @param[in] frame     the data frame to send over the SPI bus
  * @return              The received data frame from the SPI bus.
  */
-uint16_t spi_lld_polled_exchange(SPIDriver * spip, uint16_t frame) {
-
-  osalDbgAssert(!(frame & 0xFF00U), "16-bit transfers not supported");
+uint8_t spi_lld_polled_exchange(SPIDriver * spip, uint8_t frame) {
 
-  while (!(*(spip->ifg) & UCTXIFG))
-    ;
   spip->regs->txbuf = frame;
   while (!(*(spip->ifg) & UCRXIFG))
     ;
+  *(spip->ifg) &= ~(UCRXIFG | UCTXIFG);
   return spip->regs->rxbuf;
 }