From 0f277a4aea69408be1e378b34af5cfcda349060e Mon Sep 17 00:00:00 2001 From: HZY0117 <504131636@qq.com> Date: Tue, 14 Oct 2025 19:19:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix[rsoc]:PWM=E9=A9=B1=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/HAL_Drivers/config/ra2a1/pwm_config.h | 9 +++++++++ bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h index 3590ec1e9b6..0f5f6a03ff4 100644 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h +++ b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h @@ -49,6 +49,15 @@ enum #endif #ifdef BSP_USING_PWM9 BSP_PWM9_INDEX, +#endif +#ifdef BSP_USING_PWM10 + BSP_PWM10_INDEX, +#endif +#ifdef BSP_USING_PWM11 + BSP_PWM11_INDEX, +#endif +#ifdef BSP_USING_PWM12 + BSP_PWM12_INDEX, #endif BSP_PWMS_NUM }; diff --git a/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c b/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c index 4e23a0df1af..532905485c3 100644 --- a/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c +++ b/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c @@ -51,6 +51,15 @@ static struct ra_pwm ra6m4_pwm_obj[BSP_PWMS_NUM] = #ifdef BSP_USING_PWM9 [BSP_PWM9_INDEX] = PWM_DRV_INITIALIZER(9), #endif +#ifdef BSP_USING_PWM10 + [BSP_PWM10_INDEX] = PWM_DRV_INITIALIZER(10), +#endif +#ifdef BSP_USING_PWM11 + [BSP_PWM11_INDEX] = PWM_DRV_INITIALIZER(11), +#endif +#ifdef BSP_USING_PWM12 + [BSP_PWM12_INDEX] = PWM_DRV_INITIALIZER(12), +#endif }; #ifdef SOC_SERIES_R9A07G0 From 6a98bfbfc8675307263e26eeeb275b3bced2244b Mon Sep 17 00:00:00 2001 From: HZY0117 <504131636@qq.com> Date: Wed, 15 Oct 2025 18:03:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix[rsoc]:PWM=E9=A9=B1=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HAL_Drivers/config/ra2a1/adc_config.h | 42 ---------- .../HAL_Drivers/config/ra2a1/can_config.h | 48 ------------ .../HAL_Drivers/config/ra2a1/dac_config.h | 41 ---------- .../HAL_Drivers/config/ra2a1/pwm_config.h | 77 ------------------- .../HAL_Drivers/config/ra2a1/uart_config.h | 58 -------------- .../drivers/config/ra8/pwm_config.h | 9 +++ .../libraries/HAL_Drivers/drivers/drv_pwm.c | 9 --- 7 files changed, 9 insertions(+), 275 deletions(-) delete mode 100644 bsp/renesas/libraries/HAL_Drivers/config/ra2a1/adc_config.h delete mode 100644 bsp/renesas/libraries/HAL_Drivers/config/ra2a1/can_config.h delete mode 100644 bsp/renesas/libraries/HAL_Drivers/config/ra2a1/dac_config.h delete mode 100644 bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h delete mode 100644 bsp/renesas/libraries/HAL_Drivers/config/ra2a1/uart_config.h diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/adc_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/adc_config.h deleted file mode 100644 index 9a02bece717..00000000000 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/adc_config.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2006-2025, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-08-17 CYFS first version - */ - -#ifndef __ADC_CONFIG_H__ -#define __ADC_CONFIG_H__ - -#include -#include -#include "hal_data.h" -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(BSP_USING_ADC0) || defined(BSP_USING_ADC1) - -struct rt_adc_dev -{ - struct rt_adc_ops ops; - struct rt_adc_device adc_device; -}; - -struct ra_adc_map -{ - const char *device_name; - const adc_cfg_t *g_cfg; - const adc_ctrl_t *g_ctrl; - const adc_channel_cfg_t *g_channel_cfg; -}; -#endif -#endif - -#ifdef __cplusplus -} -#endif - diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/can_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/can_config.h deleted file mode 100644 index aa01d94ece6..00000000000 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/can_config.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2006-2025, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-08-17 CYFS first version - */ - -#ifndef __CAN_CONFIG_H__ -#define __CAN_CONFIG_H__ - -#include -#include "hal_data.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(BSP_USING_CAN0) -#ifndef CAN0_CONFIG -#define CAN0_CONFIG \ - { \ - .name = "can0", \ - .num_of_mailboxs = CAN_NO_OF_MAILBOXES_g_can0, \ - .p_api_ctrl = &g_can0_ctrl, \ - .p_cfg = &g_can0_cfg, \ - } -#endif /* CAN0_CONFIG */ -#endif /* BSP_USING_CAN0 */ - -#if defined(BSP_USING_CAN1) -#ifndef CAN1_CONFIG -#define CAN1_CONFIG \ - { \ - .name = "can1", \ - .num_of_mailboxs = CAN_NO_OF_MAILBOXES_g_can1, \ - .p_api_ctrl = &g_can1_ctrl, \ - .p_cfg = &g_can1_cfg, \ - } -#endif /* CAN1_CONFIG */ -#endif /* BSP_USING_CAN1 */ - -#ifdef __cplusplus -} -#endif -#endif diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/dac_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/dac_config.h deleted file mode 100644 index 059d5a10de7..00000000000 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/dac_config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2006-2025, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-08-17 CYFS first version - */ - -#ifndef __DAC_CONFIG_H__ -#define __DAC_CONFIG_H__ - -#include -#include -#include "hal_data.h" -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef BSP_USING_DAC -struct ra_dac_map -{ - char name; - const struct st_dac_cfg *g_cfg; - const struct st_dac_instance_ctrl *g_ctrl; -}; - -struct ra_dac_dev -{ - rt_dac_device_t ra_dac_device_t; - struct ra_dac_map *ra_dac_map_dev; -}; -#endif - -#endif - -#ifdef __cplusplus -} -#endif - diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h deleted file mode 100644 index 0f5f6a03ff4..00000000000 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/pwm_config.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2006-2025, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-08-17 CYFS first version - */ -#ifndef __PWM_CONFIG_H__ -#define __PWM_CONFIG_H__ - -#include -#include -#include "hal_data.h" - -#ifdef __cplusplus -extern "C" { -#endif - -enum -{ -#ifdef BSP_USING_PWM0 - BSP_PWM0_INDEX, -#endif -#ifdef BSP_USING_PWM1 - BSP_PWM1_INDEX, -#endif -#ifdef BSP_USING_PWM2 - BSP_PWM2_INDEX, -#endif -#ifdef BSP_USING_PWM3 - BSP_PWM3_INDEX, -#endif -#ifdef BSP_USING_PWM4 - BSP_PWM4_INDEX, -#endif -#ifdef BSP_USING_PWM5 - BSP_PWM5_INDEX, -#endif -#ifdef BSP_USING_PWM6 - BSP_PWM6_INDEX, -#endif -#ifdef BSP_USING_PWM7 - BSP_PWM7_INDEX, -#endif -#ifdef BSP_USING_PWM8 - BSP_PWM8_INDEX, -#endif -#ifdef BSP_USING_PWM9 - BSP_PWM9_INDEX, -#endif -#ifdef BSP_USING_PWM10 - BSP_PWM10_INDEX, -#endif -#ifdef BSP_USING_PWM11 - BSP_PWM11_INDEX, -#endif -#ifdef BSP_USING_PWM12 - BSP_PWM12_INDEX, -#endif - BSP_PWMS_NUM -}; - -#define PWM_DRV_INITIALIZER(num) \ - { \ - .name = "pwm"#num , \ - .g_cfg = &g_timer##num##_cfg, \ - .g_ctrl = &g_timer##num##_ctrl, \ - .g_timer = &g_timer##num, \ - } - -#ifdef __cplusplus -} -#endif - -#endif /* __PWM_CONFIG_H__ */ diff --git a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/uart_config.h b/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/uart_config.h deleted file mode 100644 index f2a10eb3a0a..00000000000 --- a/bsp/renesas/libraries/HAL_Drivers/config/ra2a1/uart_config.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2006-2025, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2025-08-17 CYFS first version - */ - -#ifndef __UART_CONFIG_H__ -#define __UART_CONFIG_H__ - -#include -#include "hal_data.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(BSP_USING_UART0) -#ifndef UART0_CONFIG -#define UART0_CONFIG \ - { \ - .name = "uart0", \ - .p_api_ctrl = &g_uart0_ctrl, \ - .p_cfg = &g_uart0_cfg, \ - } -#endif /* UART0_CONFIG */ -#endif /* BSP_USING_UART0 */ - -#if defined(BSP_USING_UART1) -#ifndef UART1_CONFIG -#define UART1_CONFIG \ - { \ - .name = "uart1", \ - .p_api_ctrl = &g_uart1_ctrl, \ - .p_cfg = &g_uart1_cfg, \ - } -#endif /* UART1_CONFIG */ -#endif /* BSP_USING_UART1 */ - -#if defined(BSP_USING_UART9) -#ifndef UART9_CONFIG -#define UART9_CONFIG \ - { \ - .name = "uart9", \ - .p_api_ctrl = &g_uart9_ctrl, \ - .p_cfg = &g_uart9_cfg, \ - } -#endif /* UART9_CONFIG */ -#endif /* BSP_USING_UART9 */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/bsp/renesas/libraries/HAL_Drivers/drivers/config/ra8/pwm_config.h b/bsp/renesas/libraries/HAL_Drivers/drivers/config/ra8/pwm_config.h index 9abbff60d25..d6a0e86ab96 100644 --- a/bsp/renesas/libraries/HAL_Drivers/drivers/config/ra8/pwm_config.h +++ b/bsp/renesas/libraries/HAL_Drivers/drivers/config/ra8/pwm_config.h @@ -49,6 +49,15 @@ enum #endif #ifdef BSP_USING_PWM9 BSP_PWM9_INDEX, +#endif +#ifdef BSP_USING_PWM10 + BSP_PWM10_INDEX, +#endif +#ifdef BSP_USING_PWM11 + BSP_PWM11_INDEX, +#endif +#ifdef BSP_USING_PWM12 + BSP_PWM12_INDEX, #endif BSP_PWMS_NUM }; diff --git a/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c b/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c index 532905485c3..4e23a0df1af 100644 --- a/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c +++ b/bsp/renesas/libraries/HAL_Drivers/drivers/drv_pwm.c @@ -51,15 +51,6 @@ static struct ra_pwm ra6m4_pwm_obj[BSP_PWMS_NUM] = #ifdef BSP_USING_PWM9 [BSP_PWM9_INDEX] = PWM_DRV_INITIALIZER(9), #endif -#ifdef BSP_USING_PWM10 - [BSP_PWM10_INDEX] = PWM_DRV_INITIALIZER(10), -#endif -#ifdef BSP_USING_PWM11 - [BSP_PWM11_INDEX] = PWM_DRV_INITIALIZER(11), -#endif -#ifdef BSP_USING_PWM12 - [BSP_PWM12_INDEX] = PWM_DRV_INITIALIZER(12), -#endif }; #ifdef SOC_SERIES_R9A07G0