diff --git a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c index 4c4584a08..c2e7f9cf1 100644 --- a/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv1/spi_lld.c @@ -361,12 +361,12 @@ void spi_lld_start(SPIDriver *spip) { STM32_SPI_SPI4_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); b = dmaStreamAllocate(spip->dmatx, STM32_SPI_SPI4_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); rccEnableSPI4(FALSE); } #endif @@ -377,12 +377,12 @@ void spi_lld_start(SPIDriver *spip) { STM32_SPI_SPI5_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); b = dmaStreamAllocate(spip->dmatx, STM32_SPI_SPI5_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); rccEnableSPI5(FALSE); } #endif @@ -393,12 +393,12 @@ void spi_lld_start(SPIDriver *spip) { STM32_SPI_SPI6_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); b = dmaStreamAllocate(spip->dmatx, STM32_SPI_SPI6_IRQ_PRIORITY, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (void *)spip); - chDbgAssert(!b, "stream already allocated"); + osalDgbAssert(!b, "stream already allocated"); rccEnableSPI6(FALSE); } #endif diff --git a/readme.txt b/readme.txt index f9df37fbc..da9ded8d2 100644 --- a/readme.txt +++ b/readme.txt @@ -76,6 +76,8 @@ - RT: Removed the p_msg field from the thread_t structure saving a msg_t-sized field from the structure. Messages now use a new field into the p_u union. Now synchronous messages are even faster. +- HAL: Fixed chDbgAssert() still called from STM32 SPIv1 driver (bug #704) + (backported to 3.0.6 and 16.1.3). - HAL: Fixed broken demo for STM32F429 (bug #703)(backported to 16.1.3). - HAL: Fixed wrong macro definition for palWriteLine (bug #702)(backported to 16.1.3).