diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2016-03-05 12:23:26 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2016-03-05 12:23:26 +0000 |
commit | ff1d0020c724bfb39ae5792832f5836fb0739f0e (patch) | |
tree | 5c106feb2b4af742a46ac4c95b1f48e010593e44 /os/hal/ports/STM32/LLD/SPIv1/spi_lld.c | |
parent | 091b30ded1afbf8fbdfa5768bf3b287de5b7c023 (diff) | |
download | ChibiOS-ff1d0020c724bfb39ae5792832f5836fb0739f0e.tar.gz ChibiOS-ff1d0020c724bfb39ae5792832f5836fb0739f0e.tar.bz2 ChibiOS-ff1d0020c724bfb39ae5792832f5836fb0739f0e.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9022 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/SPIv1/spi_lld.c')
-rw-r--r-- | os/hal/ports/STM32/LLD/SPIv1/spi_lld.c | 80 |
1 files changed, 63 insertions, 17 deletions
diff --git a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c index 3080f3436..89739453b 100644 --- a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c @@ -117,7 +117,6 @@ SPIDriver SPID6; /*===========================================================================*/
static uint16_t dummytx;
-static uint16_t dummyrx;
/*===========================================================================*/
/* Driver local functions. */
@@ -144,6 +143,14 @@ 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;
+#endif
+
+ /* Errors reset sequence.*/
+ (void)spip->spi->DR;
+ (void)spip->spi->SR;
+
/* Portable SPI ISR code defined in the high level driver, note, it is
a macro.*/
_spi_isr_code(spip);
@@ -304,6 +311,12 @@ void spi_lld_init(void) { */
void spi_lld_start(SPIDriver *spip) {
+#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
@@ -514,15 +527,16 @@ void spi_lld_unselect(SPIDriver *spip) { */
void spi_lld_ignore(SPIDriver *spip, size_t n) {
- dmaStreamSetMemory0(spip->dmarx, &dummyrx);
- dmaStreamSetTransactionSize(spip->dmarx, n);
- dmaStreamSetMode(spip->dmarx, spip->rxdmamode);
+#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->dmatx, &dummytx);
dmaStreamSetTransactionSize(spip->dmatx, n);
dmaStreamSetMode(spip->dmatx, spip->txdmamode);
- dmaStreamEnable(spip->dmarx);
dmaStreamEnable(spip->dmatx);
}
@@ -544,6 +558,11 @@ 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);
@@ -571,15 +590,16 @@ void spi_lld_exchange(SPIDriver *spip, size_t n, */
void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {
- dmaStreamSetMemory0(spip->dmarx, &dummyrx);
- dmaStreamSetTransactionSize(spip->dmarx, n);
- dmaStreamSetMode(spip->dmarx, spip->rxdmamode);
+#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->dmatx, txbuf);
dmaStreamSetTransactionSize(spip->dmatx, n);
dmaStreamSetMode(spip->dmatx, spip->txdmamode | STM32_DMA_CR_MINC);
- dmaStreamEnable(spip->dmarx);
dmaStreamEnable(spip->dmatx);
}
@@ -598,16 +618,35 @@ void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) { */
void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {
- dmaStreamSetMemory0(spip->dmarx, rxbuf);
- dmaStreamSetTransactionSize(spip->dmarx, n);
- dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);
+#if STM32_SPI_USE_BIDIMODE
+ osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIOE) != 0,
+ "BIDIOE not set");
- dmaStreamSetMemory0(spip->dmatx, &dummytx);
- dmaStreamSetTransactionSize(spip->dmatx, n);
- dmaStreamSetMode(spip->dmatx, spip->txdmamode);
+ if ((spip->spi->CR1 & SPI_CR1_BIDIMODE) != 0) {
+ dmaStreamSetMemory0(spip->dmarx, rxbuf);
+ dmaStreamSetTransactionSize(spip->dmarx, n);
+ dmaStreamSetMode(spip->dmarx, spip->rxdmamode | STM32_DMA_CR_MINC);
- dmaStreamEnable(spip->dmarx);
- dmaStreamEnable(spip->dmatx);
+ 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->dmatx, &dummytx);
+ dmaStreamSetTransactionSize(spip->dmatx, n);
+ dmaStreamSetMode(spip->dmatx, spip->txdmamode);
+
+ dmaStreamEnable(spip->dmarx);
+ dmaStreamEnable(spip->dmatx);
+#endif
+#if STM32_SPI_USE_BIDIMODE
+ }
+#endif
}
/**
@@ -624,6 +663,13 @@ 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,
+ "spiExchange() not possible with BIDIMODE");
+ osalDbgAssert((spip->spi->CR1 & SPI_CR1_BIDIOE) != 0,
+ "BIDIOE not set");
+#endif
+
spip->spi->DR = frame;
while ((spip->spi->SR & SPI_SR_RXNE) == 0)
;
|