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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15874 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-12-12 06:07:31 +00:00
parent 9ce8fc3769
commit 45fd4208ea
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
os/hal/ports/STM32/LLD/USART/stm32_uart10.inc → os/hal/ports/STM32/LLD/USART/stm32_usart10.inc
View File

@ -15,10 +15,10 @@
*/ */
/** /**
* @file USART/stm32_uart10.inc * @file USART/stm32_usart10.inc
* @brief Shared UART10 handler. * @brief Shared USART10 handler.
* *
* @addtogroup STM32_UART10_HANDLER * @addtogroup STM32_USART10_HANDLER
* @{ * @{
*/ */
@ -31,22 +31,22 @@
/*===========================================================================*/ /*===========================================================================*/
/* Registry checks for robustness.*/ /* Registry checks for robustness.*/
#if !defined(STM32_HAS_UART10) #if !defined(STM32_HAS_USART10)
#error "STM32_HAS_UART10 not defined in registry" #error "STM32_HAS_USART10 not defined in registry"
#endif #endif
#if STM32_HAS_UART10 #if STM32_HAS_USART10
/* Priority settings checks.*/ /* Priority settings checks.*/
#if !defined(STM32_IRQ_UART10_PRIORITY) #if !defined(STM32_IRQ_USART10_PRIORITY)
#error "STM32_IRQ_UART10_PRIORITY not defined in mcuconf.h" #error "STM32_IRQ_USART10_PRIORITY not defined in mcuconf.h"
#endif #endif
#if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_UART10_PRIORITY) #if !OSAL_IRQ_IS_VALID_PRIORITY(STM32_IRQ_USART10_PRIORITY)
#error "Invalid IRQ priority assigned to STM32_IRQ_UART10_PRIORITY" #error "Invalid IRQ priority assigned to STM32_IRQ_USART10_PRIORITY"
#endif #endif
#endif /* STM32_HAS_UART10 */ #endif /* STM32_HAS_USART10 */
/*===========================================================================*/ /*===========================================================================*/
/* Driver exported variables. */ /* Driver exported variables. */
@ -60,15 +60,15 @@
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static inline void uart10_irq_init(void) { static inline void usart10_irq_init(void) {
#if defined(STM32_UART10_IS_USED) #if defined(STM32_USART10_IS_USED)
nvicEnableVector(STM32_UART10_NUMBER, STM32_IRQ_UART10_PRIORITY); nvicEnableVector(STM32_USART10_NUMBER, STM32_IRQ_USART10_PRIORITY);
#endif #endif
} }
static inline void uart10_irq_deinit(void) { static inline void usart10_irq_deinit(void) {
#if defined(STM32_UART10_IS_USED) #if defined(STM32_USART10_IS_USED)
nvicDisableVector(STM32_UART10_NUMBER); nvicDisableVector(STM32_USART10_NUMBER);
#endif #endif
} }
@ -76,30 +76,30 @@ static inline void uart10_irq_deinit(void) {
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
/*===========================================================================*/ /*===========================================================================*/
#if defined(STM32_UART10_IS_USED) || defined(__DOXYGEN__) #if defined(STM32_USART10_IS_USED) || defined(__DOXYGEN__)
/** /**
* @brief UART10 interrupt handler. * @brief USART10 interrupt handler.
* *
* @isr * @isr
*/ */
OSAL_IRQ_HANDLER(STM32_UART10_HANDLER) { OSAL_IRQ_HANDLER(STM32_USART10_HANDLER) {
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
#if HAL_USE_SERIAL #if HAL_USE_SERIAL
#if STM32_SERIAL_USE_UART10 #if STM32_SERIAL_USE_USART10
sd_lld_serve_interrupt(&SD10); sd_lld_serve_interrupt(&SD10);
#endif #endif
#endif #endif
#if HAL_USE_SIO #if HAL_USE_SIO
#if STM32_SIO_USE_UART10 #if STM32_SIO_USE_USART10
sio_lld_serve_interrupt(&SIOD10); sio_lld_serve_interrupt(&SIOD10);
#endif #endif
#endif #endif
#if HAL_USE_UART #if HAL_USE_UART
#if STM32_UART_USE_UART10 #if STM32_UART_USE_USART10
uart_lld_serve_interrupt(&UARTD10); uart_lld_serve_interrupt(&UARTD10);
#endif #endif
#endif #endif

8
os/hal/ports/STM32/STM32H7xx/stm32_isr.c
View File

@ -77,7 +77,7 @@
#include "stm32_sdmmc1.inc" #include "stm32_sdmmc1.inc"
#include "stm32_sdmmc2.inc" #include "stm32_sdmmc2.inc"
#include <stm32_usart1.inc> #include "stm32_usart1.inc"
#include "stm32_usart2.inc" #include "stm32_usart2.inc"
#include "stm32_usart3.inc" #include "stm32_usart3.inc"
#include "stm32_uart4.inc" #include "stm32_uart4.inc"
@ -85,6 +85,8 @@
#include "stm32_usart6.inc" #include "stm32_usart6.inc"
#include "stm32_uart7.inc" #include "stm32_uart7.inc"
#include "stm32_uart8.inc" #include "stm32_uart8.inc"
#include "stm32_uart9.inc"
#include "stm32_usart10.inc"
#include "stm32_lpuart1.inc" #include "stm32_lpuart1.inc"
#include "stm32_tim1.inc" #include "stm32_tim1.inc"
@ -152,6 +154,8 @@ void irqInit(void) {
usart6_irq_init(); usart6_irq_init();
uart7_irq_init(); uart7_irq_init();
uart8_irq_init(); uart8_irq_init();
uart9_irq_init();
usart10_irq_init();
lpuart1_irq_init(); lpuart1_irq_init();
} }
@ -207,6 +211,8 @@ void irqDeinit(void) {
usart6_irq_deinit(); usart6_irq_deinit();
uart7_irq_deinit(); uart7_irq_deinit();
uart8_irq_deinit(); uart8_irq_deinit();
uart9_irq_deinit();
usart10_irq_deinit();
lpuart1_irq_deinit(); lpuart1_irq_deinit();
} }

2
readme.txt
View File

@ -131,6 +131,8 @@
- NEW: Increased stacks size in RT test suite from 128 to 192. added an - NEW: Increased stacks size in RT test suite from 128 to 192. added an
option to override the stack size by defining THREADS_STACK_SIZE option to override the stack size by defining THREADS_STACK_SIZE
in the makefile. in the makefile.
- FIX: Fixed broken support for STM32 UART9 and USART10 (bug #1248)
(backported to 21.11.3).
- FIX: Fixed wrong initialization in STM32L1xx ADC driver (bug #1247) - FIX: Fixed wrong initialization in STM32L1xx ADC driver (bug #1247)
(backported to 20.3.5)(backported to 21.11.3). (backported to 20.3.5)(backported to 21.11.3).
- FIX: Fixed wrong HSI48 support on STM32L0xx (bug #1246) - FIX: Fixed wrong HSI48 support on STM32L0xx (bug #1246)