diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-06 11:56:58 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-06 11:56:58 +0000 |
| commit | 3048f02dd498e3de3f27202e4997daaf549d3c17 (patch) | |
| tree | 7fc380b7485e7980c1af22602fe87cf0709da556 | |
| parent | 28e566ccfd914b5715f454d6776c91e5b3b2a70d (diff) | |
| download | ChibiOS-3048f02dd498e3de3f27202e4997daaf549d3c17.tar.gz ChibiOS-3048f02dd498e3de3f27202e4997daaf549d3c17.tar.bz2 ChibiOS-3048f02dd498e3de3f27202e4997daaf549d3c17.zip | |
Fixed bug #704.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8848 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv1/spi_lld.c | 12 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 8 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 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).
|