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 #1097. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@13649 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-05-18 12:32:53 +00:00
parent 5485dc3394
commit 986fa39d5c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/STM32L0xx/hal_lld.h
View File

@ -534,13 +534,13 @@
#endif
#if defined(STM32L052xx) && !defined(STM32L052_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32G052_MCUCONF not defined"
#error "Using a wrong mcuconf.h file, STM32L052_MCUCONF not defined"
#elif defined(STM32L053xx) && !defined(STM32L053_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32L053_MCUCONF not defined"
#elif defined(STM32L072xx) && !defined(STM32L072_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32G072_MCUCONF not defined"
#error "Using a wrong mcuconf.h file, STM32L072_MCUCONF not defined"
#elif defined(STM32L073xx) && !defined(STM32L073_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32L073_MCUCONF not defined"

4
os/hal/ports/common/ARMCMx/nvic.c
View File

@ -56,7 +56,7 @@
*/
void nvicEnableVector(uint32_t n, uint32_t prio) {
#if defined(__CORE_CM0_H_GENERIC)
#if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM0PLUS_H_GENERIC)
NVIC->IP[_IP_IDX(n)] = (NVIC->IP[_IP_IDX(n)] & ~(0xFFU << _BIT_SHIFT(n))) |
(NVIC_PRIORITY_MASK(prio) << _BIT_SHIFT(n));
#else
@ -74,7 +74,7 @@ void nvicEnableVector(uint32_t n, uint32_t prio) {
void nvicDisableVector(uint32_t n) {
NVIC->ICER[n >> 5U] = 1U << (n & 0x1FU);
#if defined(__CORE_CM0_H_GENERIC)
#if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM0PLUS_H_GENERIC)
NVIC->IP[_IP_IDX(n)] = NVIC->IP[_IP_IDX(n)] & ~(0xFFU << _BIT_SHIFT(n));
#else
NVIC->IP[n] = 0U;

1
readme.txt
View File

@ -74,6 +74,7 @@
*****************************************************************************
*** 20.3.2 ***
- FIX: Fixed compilation error in file nvic.c (bug #1097).
- FIX: Fixed STM32_DMAx_CH8_HANDLER not defined for DMAv1 (bug #1096).
- FIX: Fixed STM32 EXTI2 and EXTI4 not triggering a callback (bug #1095).
- FIX: Fixed STM32G4 demos compile fails if smart mode is disabled (bug #1094).