rusefi
/
ChibiOS
mirror of https://github.com/rusefi/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/trunk@13650 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-05-18 12:33:03 +00:00
parent 32738e737c
commit 6743785036
3 changed files with 8 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 #endif
#if defined(STM32L052xx) && !defined(STM32L052_MCUCONF) #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) #elif defined(STM32L053xx) && !defined(STM32L053_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32L053_MCUCONF not defined" #error "Using a wrong mcuconf.h file, STM32L053_MCUCONF not defined"
#elif defined(STM32L072xx) && !defined(STM32L072_MCUCONF) #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) #elif defined(STM32L073xx) && !defined(STM32L073_MCUCONF)
#error "Using a wrong mcuconf.h file, STM32L073_MCUCONF not defined" #error "Using a wrong mcuconf.h file, STM32L073_MCUCONF not defined"

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

@ -77,7 +77,8 @@
* @brief NVIC clearing and initialization. * @brief NVIC clearing and initialization.
*/ */
void nvicInit(void) { void nvicInit(void) {
#if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM23_H_GENERIC) #if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM0PLUS_H_GENERIC) || \
defined(__CORE_CM23_H_GENERIC)
uint32_t n = 0U; uint32_t n = 0U;
#else #else
uint32_t n = SCnSCB->ICTR; uint32_t n = SCnSCB->ICTR;
@ -100,7 +101,8 @@ void nvicInit(void) {
*/ */
void nvicEnableVector(uint32_t n, uint32_t prio) { void nvicEnableVector(uint32_t n, uint32_t prio) {
#if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM23_H_GENERIC) #if defined(__CORE_CM0_H_GENERIC) || defined(__CORE_CM0PLUS_H_GENERIC) || \
defined(__CORE_CM23_H_GENERIC)
NVIC->__IPR[_IP_IDX(n)] = (NVIC->__IPR[_IP_IDX(n)] & ~(0xFFU << _BIT_SHIFT(n))) | NVIC->__IPR[_IP_IDX(n)] = (NVIC->__IPR[_IP_IDX(n)] & ~(0xFFU << _BIT_SHIFT(n))) |
(NVIC_PRIORITY_MASK(prio) << _BIT_SHIFT(n)); (NVIC_PRIORITY_MASK(prio) << _BIT_SHIFT(n));
#else #else

2
readme.txt
View File

@ -89,6 +89,8 @@
MEMS Accelerometers. MEMS Accelerometers.
- NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1). - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1).
- NEW: Added latency measurement test application. - NEW: Added latency measurement test application.
- FIX: Fixed compilation error in file nvic.c (bug #1097)
(backported to 20.3.2).
- FIX: Fixed STM32_DMAx_CH8_HANDLER not defined for DMAv1 (bug #1096) - FIX: Fixed STM32_DMAx_CH8_HANDLER not defined for DMAv1 (bug #1096)
(backported to 20.3.2). (backported to 20.3.2).
- FIX: Fixed STM32G4 demos compile fails if smart mode is disabled (bug #1094) - FIX: Fixed STM32G4 demos compile fails if smart mode is disabled (bug #1094)