andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #1181. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14687 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-08-20 09:29:31 +00:00
parent e3ccb28533
commit 33de459b33
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demos/STM32/NIL-STM32L011K4-NUCLEO32/cfg/mcuconf.h
View File

@ -100,17 +100,12 @@
* I2C driver system settings. * I2C driver system settings.
*/ */
#define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C1 FALSE
#define STM32_I2C_USE_I2C2 FALSE
#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_BUSY_TIMEOUT 50
#define STM32_I2C_I2C1_IRQ_PRIORITY 3 #define STM32_I2C_I2C1_IRQ_PRIORITY 3
#define STM32_I2C_I2C2_IRQ_PRIORITY 3
#define STM32_I2C_USE_DMA TRUE #define STM32_I2C_USE_DMA TRUE
#define STM32_I2C_I2C1_DMA_PRIORITY 1 #define STM32_I2C_I2C1_DMA_PRIORITY 1
#define STM32_I2C_I2C2_DMA_PRIORITY 1
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3) #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") #define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
/* /*
@ -135,15 +130,10 @@
* SPI driver system settings. * SPI driver system settings.
*/ */
#define STM32_SPI_USE_SPI1 FALSE #define STM32_SPI_USE_SPI1 FALSE
#define STM32_SPI_USE_SPI2 FALSE
#define STM32_SPI_SPI1_DMA_PRIORITY 1 #define STM32_SPI_SPI1_DMA_PRIORITY 1
#define STM32_SPI_SPI2_DMA_PRIORITY 1
#define STM32_SPI_SPI1_IRQ_PRIORITY 1 #define STM32_SPI_SPI1_IRQ_PRIORITY 1
#define STM32_SPI_SPI2_IRQ_PRIORITY 1
#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) #define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3) #define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
#define STM32_SPI_SPI2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") #define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
/* /*

6
os/hal/ports/STM32/LLD/DMAv1/stm32_dma1_ch4567.inc
View File

@ -64,14 +64,20 @@ OSAL_IRQ_HANDLER(STM32_DMA1_CH4567_HANDLER) {
/* Check on channel 4.*/ /* Check on channel 4.*/
dmaServeInterrupt(STM32_DMA1_STREAM4); dmaServeInterrupt(STM32_DMA1_STREAM4);
#if STM32_DMA1_NUM_CHANNELS >= 5
/* Check on channel 5.*/ /* Check on channel 5.*/
dmaServeInterrupt(STM32_DMA1_STREAM5); dmaServeInterrupt(STM32_DMA1_STREAM5);
#endif
#if STM32_DMA1_NUM_CHANNELS >= 6
/* Check on channel 6.*/ /* Check on channel 6.*/
dmaServeInterrupt(STM32_DMA1_STREAM6); dmaServeInterrupt(STM32_DMA1_STREAM6);
#endif
#if STM32_DMA1_NUM_CHANNELS >= 7
/* Check on channel 7.*/ /* Check on channel 7.*/
dmaServeInterrupt(STM32_DMA1_STREAM7); dmaServeInterrupt(STM32_DMA1_STREAM7);
#endif
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
} }

2
readme.txt
View File

@ -77,6 +77,8 @@
- NEW: EFL driver and demo for STM32F3xx. - NEW: EFL driver and demo for STM32F3xx.
- NEW: New unit test subsystem under /os/test. Now it is officially - NEW: New unit test subsystem under /os/test. Now it is officially
ChibiOS/TEST. ChibiOS/TEST.
- FIX: Fixed DMAv1 compile fail on STM32L011 (bug #1181)
(TBP)(backported to 20.3.4).
- FIX: Fixed error in STM32_ADCCLK_MIN for STM32F37x/hal_lld.h (bug #1180) - FIX: Fixed error in STM32_ADCCLK_MIN for STM32F37x/hal_lld.h (bug #1180)
(TBP)(backported to 20.3.4). (TBP)(backported to 20.3.4).
- FIX: Fixed direct calls to RT in STM32 RTCv2 and RTCv3 (bug #1179) - FIX: Fixed direct calls to RT in STM32 RTCv2 and RTCv3 (bug #1179)