From 2b9a095c77ffb553b2e1f2bdbb4a06282d5f1024 Mon Sep 17 00:00:00 2001 From: Shicheng Chu <1468559561@qq.com> Date: Fri, 28 Apr 2023 17:44:40 +0800 Subject: [PATCH] [bsp][lpc55s69]update:drv_hwtimer (#7385) --- bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.c | 175 ++++++------------ bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.h | 31 +++- bsp/lpc55sxx/Libraries/drivers/drv_i2s.h | 2 +- bsp/lpc55sxx/Libraries/drivers/drv_soft_spi.h | 2 +- .../Libraries/drivers/drv_sound_wm8904.h | 2 +- bsp/lpc55sxx/Libraries/drivers/drv_wdt.h | 2 +- bsp/lpc55sxx/lpc55s69_nxp_evk/README.md | 5 + bsp/lpc55sxx/lpc55s69_nxp_evk/README_zh.md | 5 + bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig | 4 - 9 files changed, 100 insertions(+), 128 deletions(-) diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.c b/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.c index a13283e0e2..de082d8d15 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.c +++ b/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.c @@ -21,6 +21,41 @@ #include "drv_hwtimer.h" #include "fsl_ctimer.h" +enum +{ +#ifdef BSP_USING_CTIMER0 + TIM1_INDEX, +#endif +#ifdef BSP_USING_CTIMER3 + TIM2_INDEX, +#endif +#ifdef BSP_USING_CTIMER4 + TIM3_INDEX, +#endif +}; + +struct lpc_hwtimer +{ + rt_hwtimer_t time_device; + CTIMER_Type* tim_handle; + enum IRQn tim_irqn; + char* name; +}; + +static struct lpc_hwtimer lpc_hwtimer_obj[] = +{ +#ifdef BSP_USING_CTIMER0 + TIM1_CONFIG, +#endif + +#ifdef BSP_USING_CTIMER3 + TIM3_CONFIG, +#endif + +#ifdef BSP_USING_CTIMER4 + TIM4_CONFIG, +#endif +}; static void NVIC_Configuration(void) { @@ -28,14 +63,6 @@ static void NVIC_Configuration(void) EnableIRQ(CTIMER0_IRQn); #endif -#ifdef BSP_USING_CTIMER1 - EnableIRQ(CTIMER1_IRQn); -#endif - -#ifdef BSP_USING_CTIMER2 - EnableIRQ(CTIMER2_IRQn); -#endif - #ifdef BSP_USING_CTIMER3 EnableIRQ(CTIMER3_IRQn); #endif @@ -59,11 +86,9 @@ static rt_err_t lpc_ctimer_control(rt_hwtimer_t *timer, rt_uint32_t cmd, void *a { uint32_t clk; uint32_t pre; - if(hwtimer_dev == CTIMER0) clk = CLOCK_GetFreq(kCLOCK_Timer0); - if(hwtimer_dev == CTIMER1) clk = CLOCK_GetFreq(kCLOCK_Timer1); - if(hwtimer_dev == CTIMER2) clk = CLOCK_GetFreq(kCLOCK_Timer2); - if(hwtimer_dev == CTIMER3) clk = CLOCK_GetFreq(kCLOCK_Timer3); - if(hwtimer_dev == CTIMER4) clk = CLOCK_GetFreq(kCLOCK_Timer4); + if(hwtimer_dev == CTIMER0) clk = CLOCK_GetCTimerClkFreq(0U); + if(hwtimer_dev == CTIMER3) clk = CLOCK_GetCTimerClkFreq(3U); + if(hwtimer_dev == CTIMER4) clk = CLOCK_GetCTimerClkFreq(4U); pre = clk / *((uint32_t *)args) - 1; @@ -100,8 +125,6 @@ static void lpc_ctimer_init(rt_hwtimer_t *timer, rt_uint32_t state) /* Use Main clock for some of the Ctimers */ if(hwtimer_dev == CTIMER0) CLOCK_AttachClk(kMAIN_CLK_to_CTIMER0); - if(hwtimer_dev == CTIMER1) CLOCK_AttachClk(kMAIN_CLK_to_CTIMER1); - if(hwtimer_dev == CTIMER2) CLOCK_AttachClk(kMAIN_CLK_to_CTIMER2); if(hwtimer_dev == CTIMER3) CLOCK_AttachClk(kMAIN_CLK_to_CTIMER3); if(hwtimer_dev == CTIMER4) CLOCK_AttachClk(kMAIN_CLK_to_CTIMER4); @@ -168,86 +191,28 @@ static const struct rt_hwtimer_info lpc_hwtimer_info = HWTIMER_CNTMODE_UP, }; -#ifdef BSP_USING_CTIMER0 -static rt_hwtimer_t CTimer0; -#endif /* BSP_USING_HWTIMER0 */ - -#ifdef BSP_USING_CTIMER1 -static rt_hwtimer_t CTimer1; -#endif /* BSP_USING_HWTIMER1 */ - -#ifdef BSP_USING_CTIMER2 -static rt_hwtimer_t CTimer2; -#endif /* BSP_USING_HWTIMER2 */ - -#ifdef BSP_USING_CTIMER3 -static rt_hwtimer_t CTimer3; -#endif /* BSP_USING_HWTIMER3 */ - -#ifdef BSP_USING_CTIMER4 -static rt_hwtimer_t CTimer4; -#endif /* BSP_USING_HWTIMER4 */ - int rt_hw_hwtimer_init(void) { - int ret = RT_EOK; + int i = 0; + int result = RT_EOK; -#ifdef BSP_USING_CTIMER0 - CTimer0.info = &lpc_hwtimer_info; - CTimer0.ops = &lpc_hwtimer_ops; - ret = rt_device_hwtimer_register(&CTimer0, "ctimer0", CTIMER0); - - if (ret != RT_EOK) + for (i = 0; i < sizeof(lpc_hwtimer_obj) / sizeof(lpc_hwtimer_obj[0]); i++) { - LOG_E("CTIMER0 register failed\n"); + lpc_hwtimer_obj[i].time_device.info = &lpc_hwtimer_info; + lpc_hwtimer_obj[i].time_device.ops = &lpc_hwtimer_ops; + if (rt_device_hwtimer_register(&lpc_hwtimer_obj[i].time_device, + lpc_hwtimer_obj[i].name, lpc_hwtimer_obj[i].tim_handle) == RT_EOK) + { + LOG_D("%s register success", lpc_hwtimer_obj[i].name); + } + else + { + LOG_E("%s register failed", lpc_hwtimer_obj[i].name); + result = -RT_ERROR; + } } -#endif -#ifdef BSP_USING_CTIMER1 - CTimer1.info = &lpc_hwtimer_info; - CTimer1.ops = &lpc_hwtimer_ops; - ret = rt_device_hwtimer_register(&CTimer1, "ctimer1", CTIMER1); - - if (ret != RT_EOK) - { - LOG_E("CTIMER1 register failed\n"); - } -#endif - -#ifdef BSP_USING_CTIMER2 - CTimer2.info = &lpc_hwtimer_info; - CTimer2.ops = &lpc_hwtimer_ops; - ret = rt_device_hwtimer_register(&CTimer2, "ctimer2", CTIMER2); - - if (ret != RT_EOK) - { - LOG_E("CTIMER2 register failed\n"); - } -#endif - -#ifdef BSP_USING_CTIMER3 - CTimer3.info = &lpc_hwtimer_info; - CTimer3.ops = &lpc_hwtimer_ops; - ret = rt_device_hwtimer_register(&CTimer3, "ctimer3", CTIMER3); - - if (ret != RT_EOK) - { - LOG_E("CTIMER3 register failed\n"); - } -#endif - -#ifdef BSP_USING_CTIMER4 - CTimer4.info = &lpc_hwtimer_info; - CTimer4.ops = &lpc_hwtimer_ops; - ret = rt_device_hwtimer_register(&CTimer4, "ctimer4", CTIMER4); - - if (ret != RT_EOK) - { - LOG_E("CTIMER4 register failed\n"); - } -#endif - - return ret; + return result; } INIT_DEVICE_EXPORT(rt_hw_hwtimer_init); @@ -260,37 +225,11 @@ void CTIMER0_IRQHandler(void) int_stat = CTIMER_GetStatusFlags(CTIMER0); /* Clear the status flags that were set */ CTIMER_ClearStatusFlags(CTIMER0, int_stat); - rt_device_hwtimer_isr(&CTimer0); + rt_device_hwtimer_isr(&lpc_hwtimer_obj[TIM1_INDEX].time_device); } #endif /* BSP_USING_HWTIMER0 */ -#ifdef BSP_USING_CTIMER1 -void CTIMER1_IRQHandler(void) -{ - uint32_t int_stat; - /* Get Interrupt status flags */ - int_stat = CTIMER_GetStatusFlags(CTIMER1); - /* Clear the status flags that were set */ - CTIMER_ClearStatusFlags(CTIMER1, int_stat); - rt_device_hwtimer_isr(&CTimer1); - -} -#endif /* BSP_USING_HWTIMER1 */ - -#ifdef BSP_USING_CTIMER2 -void CTIMER2_IRQHandler(void) -{ - uint32_t int_stat; - /* Get Interrupt status flags */ - int_stat = CTIMER_GetStatusFlags(CTIMER2); - /* Clear the status flags that were set */ - CTIMER_ClearStatusFlags(CTIMER2, int_stat); - rt_device_hwtimer_isr(&CTimer2); - -} -#endif /* BSP_USING_HWTIMER2 */ - #ifdef BSP_USING_CTIMER3 void CTIMER3_IRQHandler(void) { @@ -299,7 +238,7 @@ void CTIMER3_IRQHandler(void) int_stat = CTIMER_GetStatusFlags(CTIMER3); /* Clear the status flags that were set */ CTIMER_ClearStatusFlags(CTIMER3, int_stat); - rt_device_hwtimer_isr(&CTimer3); + rt_device_hwtimer_isr(&lpc_hwtimer_obj[TIM2_INDEX].time_device); } #endif /* BSP_USING_HWTIMER3 */ @@ -312,7 +251,7 @@ void CTIMER4_IRQHandler(void) int_stat = CTIMER_GetStatusFlags(CTIMER4); /* Clear the status flags that were set */ CTIMER_ClearStatusFlags(CTIMER4, int_stat); - rt_device_hwtimer_isr(&CTimer4); + rt_device_hwtimer_isr(&lpc_hwtimer_obj[TIM3_INDEX].time_device); } #endif /* BSP_USING_HWTIMER4 */ diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.h b/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.h index 22dd018347..f73aa0ca46 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.h +++ b/bsp/lpc55sxx/Libraries/drivers/drv_hwtimer.h @@ -14,7 +14,34 @@ #include #include -int rt_hw_wdt_init(void); +#ifdef BSP_USING_CTIMER0 +#define TIM1_CONFIG \ + { \ + .tim_handle = CTIMER0, \ + .tim_irqn = CTIMER0_IRQn, \ + .name = "timer1", \ + } +#endif /* TIM1_CONFIG */ -#endif +#ifdef BSP_USING_CTIMER3 +#define TIM3_CONFIG \ + { \ + .tim_handle = CTIMER3, \ + .tim_irqn = CTIMER3_IRQn, \ + .name = "timer2", \ + } +#endif /* TIM3_CONFIG */ + +#ifdef BSP_USING_CTIMER4 +#define TIM4_CONFIG \ + { \ + .tim_handle = CTIMER4, \ + .tim_irqn = CTIMER4_IRQn, \ + .name = "timer3", \ + } +#endif /* TIM4_CONFIG */ + +int rt_hw_hwtimer_init(void); + +#endif /* __DRV_HWTIMER_H__ */ diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_i2s.h b/bsp/lpc55sxx/Libraries/drivers/drv_i2s.h index 616c6d3143..592ebcade2 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_i2s.h +++ b/bsp/lpc55sxx/Libraries/drivers/drv_i2s.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2022, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_soft_spi.h b/bsp/lpc55sxx/Libraries/drivers/drv_soft_spi.h index 8727c337fe..b1dd152782 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_soft_spi.h +++ b/bsp/lpc55sxx/Libraries/drivers/drv_soft_spi.h @@ -24,7 +24,7 @@ /* Notice: PIO1_9(sck) --> 10; PIO0_18(miso) --> 56; PIO1_10(mosi) --> 40 */ -#define BSP_S_SPI2_SCK_PIN GET_PINS(1,9) +#define BSP_S_SPI2_SCK_PIN GET_PINS(1,9) #define BSP_S_SPI2_MISO_PIN GET_PINS(0,18) #define BSP_S_SPI2_MOSI_PIN GET_PINS(1,10) diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_sound_wm8904.h b/bsp/lpc55sxx/Libraries/drivers/drv_sound_wm8904.h index 8b052869b4..17c9402b46 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_sound_wm8904.h +++ b/bsp/lpc55sxx/Libraries/drivers/drv_sound_wm8904.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2022, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * diff --git a/bsp/lpc55sxx/Libraries/drivers/drv_wdt.h b/bsp/lpc55sxx/Libraries/drivers/drv_wdt.h index ce274481b6..03c16c6414 100644 --- a/bsp/lpc55sxx/Libraries/drivers/drv_wdt.h +++ b/bsp/lpc55sxx/Libraries/drivers/drv_wdt.h @@ -14,7 +14,7 @@ #include -int rt_hw_hwtimer_init(void); +int rt_hw_wdt_init(void); #endif /* __DRV_WDT_H__ */ diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/README.md b/bsp/lpc55sxx/lpc55s69_nxp_evk/README.md index 822e779a61..de4ce3d829 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/README.md +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/README.md @@ -178,6 +178,11 @@ msh /> | SDIO | yes | Operate the SD card | | I2S | no | | +## 5.Notes + +- Please use env (v1.3.5) [download](https://github.com/RT-Thread/env-windows/releases/tag/v1.3.5) +- Please use the version is higher than 5.3 keil + ## 6. Maintained By * magicoe@163.com diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/README_zh.md b/bsp/lpc55sxx/lpc55s69_nxp_evk/README_zh.md index 1c9b67a604..903c90196b 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/README_zh.md +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/README_zh.md @@ -178,6 +178,11 @@ msh /> | SDIO | 支持 | 操作SD卡 | | I2S | 不支持 | 暂不支持 | +## 5.注意事项 + +- env环境需要使用最新版本(v1.3.5) [下载地址](https://github.com/RT-Thread/env-windows/releases/tag/v1.3.5) +- 如使用keil开发，建议5.30版本以上 + ## 6. 联系人信息 维护人: diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig index 9fde813000..1ac210313f 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/board/Kconfig @@ -225,10 +225,6 @@ menu "On-chip Peripheral Drivers" bool "Enable CIMER0" default y - config BSP_USING_CTIMER1 - bool "Enable CIMER1" - default n - config BSP_USING_CTIMER3 bool "Enable CIMER3" default n