From 458e6a84df1beb84f21c7e57147dec8c44f1d751 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 17 Jun 2016 12:58:41 +0000 Subject: Added CR2 setting to STM32 SPIv1 driver. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9640 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c | 3 ++- os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.h | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'os/hal/ports/STM32') diff --git a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c index 15cc0d1e7..8baf59717 100644 --- a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.c @@ -425,7 +425,8 @@ void spi_lld_start(SPIDriver *spip) { spip->spi->CR1 = 0; spip->spi->CR1 = spip->config->cr1 | SPI_CR1_MSTR | SPI_CR1_SSM | SPI_CR1_SSI; - spip->spi->CR2 = SPI_CR2_SSOE | SPI_CR2_RXDMAEN | SPI_CR2_TXDMAEN; + spip->spi->CR2 = spip->config->cr2 | SPI_CR2_SSOE | SPI_CR2_RXDMAEN | + SPI_CR2_TXDMAEN; spip->spi->CR1 |= SPI_CR1_SPE; } diff --git a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.h b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.h index 661dc9a4b..2f3435ea2 100644 --- a/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.h +++ b/os/hal/ports/STM32/LLD/SPIv1/hal_spi_lld.h @@ -431,9 +431,13 @@ typedef struct { */ uint16_t sspad; /** - * @brief SPI initialization data. + * @brief SPI CR1 register initialization data. */ uint16_t cr1; + /** + * @brief SPI CR2 register initialization data. + */ + uint16_t cr2; } SPIConfig; /** -- cgit v1.2.3