From b539f27475607cb3a4e0ceb65210d85e30c6adb3 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 20 May 2019 14:24:50 +0900 Subject: [PATCH] Fix USART driver. --- contrib/usart-stm32f103.c | 5 +++-- contrib/usart-stm32l4.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/usart-stm32f103.c b/contrib/usart-stm32f103.c index 23db8a3..4d997e4 100644 --- a/contrib/usart-stm32f103.c +++ b/contrib/usart-stm32f103.c @@ -128,7 +128,7 @@ struct usart { static const struct usart usart_array[] = { - { USART2, &usart2_intr, INTR_REQ_USART3, + { USART2, &usart2_intr, INTR_REQ_USART2, &usart2_stat, &usart2_rb_a2h, &usart2_rb_h2a, buf_usart2_rb_a2h, buf_usart2_rb_h2a, &usart2_app_write_event, &usart2_tx_ready }, { USART3, &usart3_intr, INTR_REQ_USART3, @@ -361,7 +361,8 @@ handle_intr (struct USART *USARTx, struct rb *rb2a, struct usart_stat *stat) if (notify_bits) { - if ((*ss_notify_callback) (stat->dev_no, notify_bits)) + if (ss_notify_callback + && (*ss_notify_callback) (stat->dev_no, notify_bits)) stat->err_notify_overflow++; } diff --git a/contrib/usart-stm32l4.c b/contrib/usart-stm32l4.c index 960400e..0bae087 100644 --- a/contrib/usart-stm32l4.c +++ b/contrib/usart-stm32l4.c @@ -347,7 +347,8 @@ handle_intr (struct USART *USARTx, struct rb *rb2a, struct usart_stat *stat) if (notify_bits) { - if ((*ss_notify_callback) (stat->dev_no, notify_bits)) + if (ss_notify_callback + && (*ss_notify_callback) (stat->dev_no, notify_bits)) stat->err_notify_overflow++; }