zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug #704. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8848 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
Giovanni Di Sirio 2016-02-06 11:56:58 +00:00
parent 28e566ccfd
commit 3048f02dd4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/hal/ports/STM32/LLD/SPIv1/spi_lld.c
View File

@ -361,12 +361,12 @@ void spi_lld_start(SPIDriver *spip) {
STM32_SPI_SPI4_IRQ_PRIORITY, STM32_SPI_SPI4_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
b = dmaStreamAllocate(spip->dmatx, b = dmaStreamAllocate(spip->dmatx,
STM32_SPI_SPI4_IRQ_PRIORITY, STM32_SPI_SPI4_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
rccEnableSPI4(FALSE); rccEnableSPI4(FALSE);
} }
#endif #endif
@ -377,12 +377,12 @@ void spi_lld_start(SPIDriver *spip) {
STM32_SPI_SPI5_IRQ_PRIORITY, STM32_SPI_SPI5_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
b = dmaStreamAllocate(spip->dmatx, b = dmaStreamAllocate(spip->dmatx,
STM32_SPI_SPI5_IRQ_PRIORITY, STM32_SPI_SPI5_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
rccEnableSPI5(FALSE); rccEnableSPI5(FALSE);
} }
#endif #endif
@ -393,12 +393,12 @@ void spi_lld_start(SPIDriver *spip) {
STM32_SPI_SPI6_IRQ_PRIORITY, STM32_SPI_SPI6_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_rx_interrupt, (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
b = dmaStreamAllocate(spip->dmatx, b = dmaStreamAllocate(spip->dmatx,
STM32_SPI_SPI6_IRQ_PRIORITY, STM32_SPI_SPI6_IRQ_PRIORITY,
(stm32_dmaisr_t)spi_lld_serve_tx_interrupt, (stm32_dmaisr_t)spi_lld_serve_tx_interrupt,
(void *)spip); (void *)spip);
chDbgAssert(!b, "stream already allocated"); osalDgbAssert(!b, "stream already allocated");
rccEnableSPI6(FALSE); rccEnableSPI6(FALSE);
} }
#endif #endif

2
readme.txt
View File

@ -76,6 +76,8 @@
- RT: Removed the p_msg field from the thread_t structure saving a - 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 msg_t-sized field from the structure. Messages now use a new field
into the p_u union. Now synchronous messages are even faster. 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 broken demo for STM32F429 (bug #703)(backported to 16.1.3).
- HAL: Fixed wrong macro definition for palWriteLine (bug #702)(backported - HAL: Fixed wrong macro definition for palWriteLine (bug #702)(backported
to 16.1.3). to 16.1.3).