From 39e2aa6b646b06074d9d3950cda80ebdb8e4484f Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 6 Feb 2016 11:57:08 +0000 Subject: [PATCH] Fixed bug #704. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@8850 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/SPIv1/spi_lld.c | 12 ++++++------ readme.txt | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) 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 bbe447d63..9e519b9ad 100644 --- a/readme.txt +++ b/readme.txt @@ -73,6 +73,7 @@ ***************************************************************************** *** 16.1.3 *** +- HAL: Fixed chDbgAssert() still called from STM32 SPIv1 driver (bug #704). - HAL: Fixed broken demo for STM32F429 (bug #703). - HAL: Fixed wrong macro definition for palWriteLine (bug #702). - HAL: Fixed error is buffer queues (bug #701).