Undid SPI changes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9050 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 16 insertions, 84 deletions

diff --git a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c
index 608c568be..167e28b4c 100644
--- a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c
+++ b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.c
@@ -144,15 +144,6 @@ static void spi_lld_serve_rx_interrupt(SPIDriver *spip, uint32_t flags) {
   dmaStreamDisable(spip->dmatx);

   dmaStreamDisable(spip->dmarx);

 

-#if STM32_SPI_USE_BIDIMODE

-  spip->spi->CR1 |= SPI_CR1_BIDIOE;

-

-  /* Errors reset sequence. It is required becaue BIDIOE could cause extra

-     clock pulses after DMA stopped reading.*/

-  (void)spip->spi->DR;

-  (void)spip->spi->SR;

-#endif

-

   /* Portable SPI ISR code defined in the high level driver, note, it is

      a macro.*/

   _spi_isr_code(spip);

@@ -312,12 +303,6 @@ void spi_lld_init(void) {
 void spi_lld_start(SPIDriver *spip) {

   uint32_t ds;

 

-#if STM32_SPI_USE_BIDIMODE

-  osalDbgAssert(!(((spip->spi->CR1 & SPI_CR1_BIDIMODE) == 0) ^^

-                  ((spip->spi->CR1 & SPI_CR1_BIDIOE) == 0)),

-                "BIDIOE not set");

-#endif

-

   /* If in stopped state then enables the SPI and DMA clocks.*/

   if (spip->state == SPI_STOP) {

 #if STM32_SPI_USE_SPI1

@@ -530,13 +515,6 @@ void spi_lld_unselect(SPIDriver *spip) {
  */

 void spi_lld_ignore(SPIDriver *spip, size_t n) {

 

-#if STM32_SPI_USE_BIDIMODE

-  if ((spip->spi->CR1 & SPI_CR1_BIDIMODE) != 0) {

-    osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIOE) != 0,

-                  "BIDIOE not set");

-  }

-#endif

-

   dmaStreamSetMemory0(spip->dmarx, &dummyrx);

   dmaStreamSetTransactionSize(spip->dmarx, n);

   dmaStreamSetMode(spip->dmarx, spip->rxdmamode);

@@ -567,11 +545,6 @@ void spi_lld_ignore(SPIDriver *spip, size_t n) {
 void spi_lld_exchange(SPIDriver *spip, size_t n,

                       const void *txbuf, void *rxbuf) {

 

-#if STM32_SPI_USE_BIDIMODE

-  osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIMODE) == 0,

-                "spiExchange() not possible with BIDIMODE");

-#endif

-

   dmaStreamSetMemory0(spip->dmarx, rxbuf);

   dmaStreamSetTransactionSize(spip->dmarx, n);

   dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);

@@ -599,23 +572,16 @@ void spi_lld_exchange(SPIDriver *spip, size_t n,
  */

 void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {

 

-#if STM32_SPI_USE_BIDIMODE

-  if ((spip->spi->CR1 & SPI_CR1_BIDIMODE) != 0) {

-    osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIOE) != 0,

-                  "BIDIOE not set");

-  }

-#endif

-

-    dmaStreamSetMemory0(spip->dmarx, &dummyrx);

-    dmaStreamSetTransactionSize(spip->dmarx, n);

-    dmaStreamSetMode(spip->dmarx, spip->rxdmamode);

+  dmaStreamSetMemory0(spip->dmarx, &dummyrx);

+  dmaStreamSetTransactionSize(spip->dmarx, n);

+  dmaStreamSetMode(spip->dmarx, spip->rxdmamode);

 

-    dmaStreamSetMemory0(spip->dmatx, txbuf);

-    dmaStreamSetTransactionSize(spip->dmatx, n);

-    dmaStreamSetMode(spip->dmatx, spip->txdmamode | STM32_DMA_CR_MINC);

+  dmaStreamSetMemory0(spip->dmatx, txbuf);

+  dmaStreamSetTransactionSize(spip->dmatx, n);

+  dmaStreamSetMode(spip->dmatx, spip->txdmamode | STM32_DMA_CR_MINC);

 

-    dmaStreamEnable(spip->dmarx);

-    dmaStreamEnable(spip->dmatx);

+  dmaStreamEnable(spip->dmarx);

+  dmaStreamEnable(spip->dmatx);

 }

 

 /**

@@ -633,36 +599,16 @@ void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {
  */

 void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

 

-#if STM32_SPI_USE_BIDIMODE

-  if ((spip->spi->CR1 & SPI_CR1_BIDIMODE) != 0) {

-

-    osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIOE) != 0,

-                  "BIDIOE not set");

-

-    dmaStreamSetMemory0(spip->dmarx, rxbuf);

-    dmaStreamSetTransactionSize(spip->dmarx, n);

-    dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);

-

-    dmaStreamEnable(spip->dmarx);

-

-    spip->spi->CR1 &= ~SPI_CR1_BIDIOE;

-  }

-  else {

-#else

-    dmaStreamSetMemory0(spip->dmarx, rxbuf);

-    dmaStreamSetTransactionSize(spip->dmarx, n);

-    dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);

+  dmaStreamSetMemory0(spip->dmarx, rxbuf);

+  dmaStreamSetTransactionSize(spip->dmarx, n);

+  dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);

 

-    dmaStreamSetMemory0(spip->dmatx, &dummytx);

-    dmaStreamSetTransactionSize(spip->dmatx, n);

-    dmaStreamSetMode(spip->dmatx, spip->txdmamode);

+  dmaStreamSetMemory0(spip->dmatx, &dummytx);

+  dmaStreamSetTransactionSize(spip->dmatx, n);

+  dmaStreamSetMode(spip->dmatx, spip->txdmamode);

 

-    dmaStreamEnable(spip->dmarx);

-    dmaStreamEnable(spip->dmatx);

-#endif

-#if STM32_SPI_USE_BIDIMODE

-  }

-#endif

+  dmaStreamEnable(spip->dmarx);

+  dmaStreamEnable(spip->dmatx);

 }

 

 /**

@@ -679,11 +625,6 @@ void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {
  */

 uint16_t spi_lld_polled_exchange(SPIDriver *spip, uint16_t frame) {

 

-#if STM32_SPI_USE_BIDIMODE

-  osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIMODE) == 0,

-                "spiPolledExchange() not possible with BIDIMODE");

-#endif

-

   /*

    * Data register must be accessed with the appropriate data size.

    * Byte size access (uint8_t *) for transactions that are <= 8-bit.

diff --git a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
index 795d753be..e2bcb124e 100644
--- a/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
+++ b/os/hal/ports/STM32/LLD/SPIv2/spi_lld.h
@@ -196,15 +196,6 @@
 #endif

 

 /**

- * @brief   Enables the SPI BIDIMODE support.

- * @details If set to @p TRUE the support for BIDIMODE CR1 bit is included.

- * @note    The default is @p FALSE.

- */

-#if !defined(STM32_SPI_USE_BIDIMODE) || defined(__DOXYGEN__)

-#define STM32_SPI_USE_BIDIMODE              FALSE

-#endif

-

-/**

  * @brief   SPI DMA error hook.

  */

 #if !defined(STM32_SPI_DMA_ERROR_HOOK) || defined(__DOXYGEN__)