aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-01-04 11:13:44 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-01-04 11:13:44 +0000
commitc2994bdb33024b71f3ac0b4283994715ce6eb563 (patch)
tree34f26281efec0dd928589b61664b1907800bb644 /os/hal
parentccbf09f1a2abad73c81e5e059b7d3f6d370e3293 (diff)
downloadChibiOS-c2994bdb33024b71f3ac0b4283994715ce6eb563.tar.gz
ChibiOS-c2994bdb33024b71f3ac0b4283994715ce6eb563.tar.bz2
ChibiOS-c2994bdb33024b71f3ac0b4283994715ce6eb563.zip
Various fixes, H7 SPI does not work yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11220 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
-rw-r--r--os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c
index 936537337..71dd11702 100644
--- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c
+++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c
@@ -525,6 +525,7 @@ void spi_lld_start(SPIDriver *spip) {
/* Configuration-specific DMA setup.*/
dsize = (spip->config->cfg2 & SPI_CFG1_DSIZE_Msk) + 1U;
cfg1 = spip->config->cfg1 | SPI_CFG1_RXDMAEN | SPI_CFG1_TXDMAEN;
+ cfg1 &= ~SPI_CFG1_FTHLV_Msk;
if (dsize <= 8U) {
/* Frame width is between 4 and 8 bits.*/
spip->rxdmamode = (spip->rxdmamode & ~STM32_DMA_CR_SIZE_MASK) |
@@ -561,7 +562,7 @@ void spi_lld_start(SPIDriver *spip) {
spip->spi->CR1 = SPI_CR1_MASRX;
spip->spi->CR2 = 0U;
spip->spi->CFG1 = cfg1;
- spip->spi->CFG2 = spip->config->cfg2 | SPI_CFG2_MASTER;
+ spip->spi->CFG2 = (spip->config->cfg2 | SPI_CFG2_MASTER) & ~SPI_CFG2_COMM_Msk;
spip->spi->IER = SPI_IER_OVRIE;
spip->spi->IFCR = 0xFFFFFFFFU;
spip->spi->CR1 |= SPI_CR1_SPE;