Skip to content

STM32F0: fix issue with usarts sharing the same irq vector #5907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 26, 2018
Merged

STM32F0: fix issue with usarts sharing the same irq vector #5907

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6c9178
STM32F0: fix usart irq management
bcostm Jan 23, 2018
eaa3e9d
STM32F0 usart irq: fix issue with F070/F072
bcostm Jan 23, 2018
18659ab
STM32F0: manage better uart3 & 4 irqs
bcostm Jan 24, 2018
7ff1cf5
STM32F0 uart irq: test IT flags for usart3/4
bcostm Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 67 additions & 60 deletions targets/TARGET_STM/TARGET_STM32F0/serial_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ static uart_irq_handler irq_handler;
static void uart_irq(int id)
{
UART_HandleTypeDef * huart = &uart_handlers[id];

if (serial_irq_ids[id] != 0) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) {
Expand All @@ -64,7 +63,7 @@ static void uart_irq(int id)
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) {
irq_handler(serial_irq_ids[id], RxIrq);
/* Flag has been cleared when reading the content */
/* Flag has been cleared when reading the content */
}
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
Expand All @@ -87,47 +86,53 @@ static void uart2_irq(void)
}
#endif

#if defined USART3_BASE
static void uart3_irq(void)
// Used for both USART3_4_IRQn and USART3_8_IRQn
static void uart3_8_irq(void)
{
uart_irq(2);
}
#if defined(TARGET_STM32F091RC)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this problem only affect the STM32F091RC, or are more targets affected?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All STM32F09x devices support this but there is only the STM32F091RC device on mbed actually.

#if defined(USART3_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART3) != RESET) {
uart_irq(2);
}
#endif

#if defined USART4_BASE
static void uart4_irq(void)
{
uart_irq(3);
}
#if defined(USART4_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART4) != RESET) {
uart_irq(3);
}
#endif

#if defined USART5_BASE
static void uart5_irq(void)
{
uart_irq(4);
}
#if defined(USART5_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART5) != RESET) {
uart_irq(4);
}
#endif

#if defined USART6_BASE
static void uart6_irq(void)
{
uart_irq(5);
}
#if defined(USART6_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART6) != RESET) {
uart_irq(5);
}
#endif

#if defined USART7_BASE
static void uart7_irq(void)
{
uart_irq(6);
}
#if defined(USART7_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART7) != RESET) {
uart_irq(6);
}
#endif

#if defined USART8_BASE
static void uart8_irq(void)
{
uart_irq(7);
}
#if defined(USART8_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART8) != RESET) {
uart_irq(7);
}
#endif
#else // TARGET_STM32F070RB, TARGET_STM32F072RB
#if defined(USART3_BASE)
if (USART3->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(2);
}
#endif
#if defined(USART4_BASE)
if (USART4->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(3);
}
#endif
#endif
}

void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
{
Expand Down Expand Up @@ -156,55 +161,57 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
}
#endif

#if defined (TARGET_STM32F091RC)
#if defined(USART3_BASE)
if (obj_s->uart == UART_3) {
#if defined(TARGET_STM32F091RC)
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_irq;
#else
irq_n = USART3_4_IRQn;
#endif
vector = (uint32_t)&uart3_8_irq;
}
#endif

#if defined(USART4_BASE)
if (obj_s->uart == UART_4) {
#if defined(TARGET_STM32F091RC)
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart4_irq;
#else
irq_n = USART3_4_IRQn;
#endif
vector = (uint32_t)&uart3_8_irq;
}
#endif

// Below usart are available only on TARGET_STM32F091RC
#if defined(USART5_BASE)
if (obj_s->uart == UART_5) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart5_irq;
vector = (uint32_t)&uart3_8_irq;
}
#endif

#if defined(USART6_BASE)
if (obj_s->uart == UART_6) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart6_irq;
vector = (uint32_t)&uart3_8_irq;
}
#endif

#if defined(USART7_BASE)
if (obj_s->uart == UART_7) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart7_irq;
vector = (uint32_t)&uart3_8_irq;
}
#endif

#if defined(USART8_BASE)
if (obj_s->uart == UART_8) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart8_irq;
}

#elif defined (TARGET_STM32F030R8) || defined (TARGET_STM32F051R8)

#else
#if defined(USART3_BASE)
if (obj_s->uart == UART_3) {
irq_n = USART3_4_IRQn;
vector = (uint32_t)&uart3_irq;
vector = (uint32_t)&uart3_8_irq;
}
#endif

#if defined(USART4_BASE)
if (obj_s->uart == UART_4) {
irq_n = USART3_4_IRQn;
vector = (uint32_t)&uart4_irq;
}
#endif
#endif

if (enable) {
if (irq == RxIrq) {
__HAL_UART_ENABLE_IT(huart, UART_IT_RXNE);
Expand Down