From 551fa60cadc6d4b7d2e20176800972dc15109629 Mon Sep 17 00:00:00 2001 From: Adiosce <91469376+Adiosce@users.noreply.github.com> Date: Fri, 8 Mar 2024 20:38:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add=20uart=20callback=20function=E3=80=81co?= =?UTF-8?q?nfig=20option?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.h | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.h b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.h index 7e3e2152a57..88799b64ff1 100644 --- a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.h +++ b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.h @@ -15,9 +15,46 @@ FSP_HEADER extern const uart_cfg_t g_uart9_cfg; extern const sci_uart_extended_cfg_t g_uart9_cfg_extend; + #ifndef user_uart0_callback + void user_uart0_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart1_callback + void user_uart1_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart2_callback + void user_uart2_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart3_callback + void user_uart3_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart4_callback + void user_uart4_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart5_callback + void user_uart5_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart6_callback + void user_uart6_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart7_callback + void user_uart7_callback(uart_callback_args_t * p_args); + #endif + + #ifndef user_uart8_callback + void user_uart8_callback(uart_callback_args_t * p_args); + #endif + #ifndef user_uart9_callback void user_uart9_callback(uart_callback_args_t * p_args); #endif + void hal_entry(void); void g_hal_init(void); FSP_FOOTER From f71c77aa6eb683f708c944e835394b2ea03d0874 Mon Sep 17 00:00:00 2001 From: Adiosce <91469376+Adiosce@users.noreply.github.com> Date: Fri, 8 Mar 2024 21:01:55 +0800 Subject: [PATCH 2/4] add uart4 into data.c --- bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c index cdcffb3b680..78843b07cdf 100644 --- a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c +++ b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c @@ -1,5 +1,85 @@ /* generated HAL source file - do not edit */ #include "hal_data.h" + +sci_uart_instance_ctrl_t g_uart4_ctrl; + + baud_setting_t g_uart4_baud_setting = + { + /* Baud rate calculated with 0.160% error. */ .abcse = 0, .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t) 256, .brme = false + }; + + /** UART extended configuration for UARTonSCI HAL driver */ + const sci_uart_extended_cfg_t g_uart4_cfg_extend = + { + .clock = SCI_UART_CLOCK_INT, + .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE, + .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE, + .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX, + .p_baud_setting = &g_uart4_baud_setting, + .flow_control = SCI_UART_FLOW_CONTROL_RTS, + #if 0xFF != 0xFF + .flow_control_pin = BSP_IO_PORT_FF_PIN_0xFF, + #else + .flow_control_pin = (bsp_io_port_pin_t) UINT16_MAX, + #endif + }; + + /** UART interface configuration */ + const uart_cfg_t g_uart4_cfg = + { + .channel = 16, + .data_bits = UART_DATA_BITS_8, + .parity = UART_PARITY_OFF, + .stop_bits = UART_STOP_BITS_1, + .p_callback = user_uart4_callback, + .p_context = NULL, + .p_extend = &g_uart4_cfg_extend, +#define RA_NOT_DEFINED (1) +#if (RA_NOT_DEFINED == RA_NOT_DEFINED) + .p_transfer_tx = NULL, +#else + .p_transfer_tx = &RA_NOT_DEFINED, +#endif +#if (RA_NOT_DEFINED == RA_NOT_DEFINED) + .p_transfer_rx = NULL, +#else + .p_transfer_rx = &RA_NOT_DEFINED, +#endif +#undef RA_NOT_DEFINED + .rxi_ipl = (12), + .txi_ipl = (12), + .tei_ipl = (12), + .eri_ipl = (12), +#if defined(VECTOR_NUMBER_SCI16_RXI) + .rxi_irq = VECTOR_NUMBER_SCI16_RXI, +#else + .rxi_irq = FSP_INVALID_VECTOR, +#endif +#if defined(VECTOR_NUMBER_SCI16_TXI) + .txi_irq = VECTOR_NUMBER_SCI16_TXI, +#else + .txi_irq = FSP_INVALID_VECTOR, +#endif +#if defined(VECTOR_NUMBER_SCI16_TEI) + .tei_irq = VECTOR_NUMBER_SCI16_TEI, +#else + .tei_irq = FSP_INVALID_VECTOR, +#endif +#if defined(VECTOR_NUMBER_SCI16_ERI) + .eri_irq = VECTOR_NUMBER_SCI16_ERI, +#else + .eri_irq = FSP_INVALID_VECTOR, +#endif + }; + +/* Instance structure to use this module. */ +const uart_instance_t g_uart4 = +{ + .p_ctrl = &g_uart4_ctrl, + .p_cfg = &g_uart4_cfg, + .p_api = &g_uart_on_sci +}; + sci_uart_instance_ctrl_t g_uart9_ctrl; baud_setting_t g_uart9_baud_setting = From c7847037aeaeda6b5b71cbf0b003125a17afb8cc Mon Sep 17 00:00:00 2001 From: Adiosce <91469376+Adiosce@users.noreply.github.com> Date: Sun, 10 Mar 2024 11:19:35 +0800 Subject: [PATCH 3/4] formating --- bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c index 78843b07cdf..d7931b1c6f2 100644 --- a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c +++ b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c @@ -2,18 +2,24 @@ #include "hal_data.h" sci_uart_instance_ctrl_t g_uart4_ctrl; - - baud_setting_t g_uart4_baud_setting = + baud_setting_t g_uart4_baud_setting = { - /* Baud rate calculated with 0.160% error. */ .abcse = 0, .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t) 256, .brme = false + /* Baud rate calculated with 0.160% error. */ + .abcse = 0, + .abcs = 0, + .bgdm = 1, + .cks = 0, + .brr = 64, + .mddr = (uint8_t) 256, + .brme = false }; /** UART extended configuration for UARTonSCI HAL driver */ const sci_uart_extended_cfg_t g_uart4_cfg_extend = { - .clock = SCI_UART_CLOCK_INT, + .clock = SCI_UART_CLOCK_INT, .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE, - .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE, + .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE, .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX, .p_baud_setting = &g_uart4_baud_setting, .flow_control = SCI_UART_FLOW_CONTROL_RTS, @@ -84,7 +90,14 @@ sci_uart_instance_ctrl_t g_uart9_ctrl; baud_setting_t g_uart9_baud_setting = { - /* Baud rate calculated with 0.160% error. */ .abcse = 0, .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t) 256, .brme = false + /* Baud rate calculated with 0.160% error. */ + .abcse = 0, + .abcs = 0, + .bgdm = 1, + .cks = 0, + .brr = 64, + .mddr = (uint8_t) 256, + .brme = false }; /** UART extended configuration for UARTonSCI HAL driver */ From 31db63984f2b7a877b407ccb940c9b980244db9c Mon Sep 17 00:00:00 2001 From: Adiosce <91469376+Adiosce@users.noreply.github.com> Date: Sun, 10 Mar 2024 11:20:17 +0800 Subject: [PATCH 4/4] formating --- bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c index d7931b1c6f2..2d09758ce76 100644 --- a/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c +++ b/bsp/renesas/ra6m3-hmi-board/ra_gen/hal_data.c @@ -1,7 +1,7 @@ /* generated HAL source file - do not edit */ #include "hal_data.h" -sci_uart_instance_ctrl_t g_uart4_ctrl; +sci_uart_instance_ctrl_t g_uart4_ctrl; baud_setting_t g_uart4_baud_setting = { /* Baud rate calculated with 0.160% error. */