From d952646c8f46b19a24bda187c6ee3d664eeda1c0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Wed, 8 Nov 2023 08:42:21 +0000 Subject: [PATCH] Wrong assertion in STM32 SPIv3 on SPI6 start. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16405 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c | 4 ++-- readme.txt | 1 + 2 files changed, 3 insertions(+), 2 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 96b84ac05..5c7031d27 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c @@ -599,12 +599,12 @@ void spi_lld_start(SPIDriver *spip) { STM32_SPI_SPI6_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_bdma_rx_interrupt, (void *)spip); - osalDbgAssert(spip->rx.dma != NULL, "unable to allocate stream"); + osalDbgAssert(spip->rx.bdma != NULL, "unable to allocate stream"); spip->tx.bdma = bdmaStreamAllocI(STM32_SPI_SPI6_TX_BDMA_STREAM, STM32_SPI_SPI6_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_bdma_tx_interrupt, (void *)spip); - osalDbgAssert(spip->tx.dma != NULL, "unable to allocate stream"); + osalDbgAssert(spip->tx.bdma != NULL, "unable to allocate stream"); rccEnableSPI6(true); bdmaSetRequestSource(spip->rx.bdma, STM32_DMAMUX2_SPI6_RX); bdmaSetRequestSource(spip->tx.bdma, STM32_DMAMUX2_SPI6_TX); diff --git a/readme.txt b/readme.txt index 9c9f646f1..5ebc1494c 100644 --- a/readme.txt +++ b/readme.txt @@ -118,6 +118,7 @@ instead of a simple size. - NEW: RT and NIL upgraded to support the enhanced OSLIB. - NEW: Memory areas/pointers checker functions added to OSLIB. +- FIX: Wrong assertion in STM32 SPIv3 on SPI6 start. - FIX: Fixed problems related to TIM3, TIM4 and TIM16 on STM32G0. - FIX: Fixed uninitialized return message in EX subsystem (bug #1267) (backported to 21.11.4).