libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[bsp][driver][Infineon]Fix timer interrupt callback conflict

This commit is contained in:
Rbb666 2024-03-21 12:03:43 +08:00 committed by Meco Man
parent 3f26998f9c
commit f3cbb8d58e
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bsp/Infineon/libraries/HAL_Drivers/drv_hwtimer.c
View File

@ -16,6 +16,7 @@
//#define DRV_DEBUG //#define DRV_DEBUG
#define LOG_TAG "drv.hwtimer" #define LOG_TAG "drv.hwtimer"
#include <drv_log.h> #include <drv_log.h>
static void isr_timer(void *callback_arg, cyhal_timer_event_t event); static void isr_timer(void *callback_arg, cyhal_timer_event_t event);
#ifdef RT_USING_HWTIMER #ifdef RT_USING_HWTIMER
@ -140,6 +141,7 @@ static rt_err_t timer_start(rt_hwtimer_t *timer, rt_uint32_t t, rt_hwtimer_mode_
/* Assign the ISR to execute on timer interrupt */ /* Assign the ISR to execute on timer interrupt */
cyhal_timer_register_callback(tim, isr_timer, NULL); cyhal_timer_register_callback(tim, isr_timer, NULL);
/* Set the event on which timer interrupt occurs and enable it */ /* Set the event on which timer interrupt occurs and enable it */
cyhal_timer_enable_event(tim, CYHAL_TIMER_IRQ_TERMINAL_COUNT, 1, true); cyhal_timer_enable_event(tim, CYHAL_TIMER_IRQ_TERMINAL_COUNT, 1, true);
@ -214,7 +216,7 @@ static rt_err_t timer_ctrl(rt_hwtimer_t *timer, rt_uint32_t cmd, void *arg)
static const struct rt_hwtimer_info _info = TIM_DEV_INFO_CONFIG; static const struct rt_hwtimer_info _info = TIM_DEV_INFO_CONFIG;
static const struct rt_hwtimer_ops _ops = static const struct rt_hwtimer_ops _ops =
{ {
.init = timer_init, .init = timer_init,
.start = timer_start, .start = timer_start,
.stop = timer_stop, .stop = timer_stop,
@ -222,7 +224,6 @@ static const struct rt_hwtimer_ops _ops =
.control = timer_ctrl, .control = timer_ctrl,
}; };
#ifdef BSP_USING_TIM1
static void isr_timer(void *callback_arg, cyhal_timer_event_t event) static void isr_timer(void *callback_arg, cyhal_timer_event_t event)
{ {
/* enter interrupt */ /* enter interrupt */
@ -230,28 +231,15 @@ static void isr_timer(void *callback_arg, cyhal_timer_event_t event)
(void)callback_arg; (void)callback_arg;
(void)event; (void)event;
#ifdef BSP_USING_TIM1
rt_device_hwtimer_isr(&cyp_hwtimer_obj[TIM1_INDEX].time_device); rt_device_hwtimer_isr(&cyp_hwtimer_obj[TIM1_INDEX].time_device);
/* leave interrupt */
rt_interrupt_leave();
}
#endif #endif
#ifdef BSP_USING_TIM2 #ifdef BSP_USING_TIM2
static void isr_timer(void *callback_arg, cyhal_timer_event_t event)
{
/* enter interrupt */
rt_interrupt_enter();
(void)callback_arg;
(void)event;
rt_device_hwtimer_isr(&cyp_hwtimer_obj[TIM2_INDEX].time_device); rt_device_hwtimer_isr(&cyp_hwtimer_obj[TIM2_INDEX].time_device);
#endif
/* leave interrupt */ /* leave interrupt */
rt_interrupt_leave(); rt_interrupt_leave();
} }
#endif
int cyp_hwtimer_init(void) int cyp_hwtimer_init(void)
{ {

2
bsp/Infineon/libraries/IFX_PSOC6_HAL/SConscript
View File

@ -143,6 +143,8 @@ if GetDepend(['RT_USING_DAC']):
if GetDepend(['RT_USING_HWTIMER']): if GetDepend(['RT_USING_HWTIMER']):
src += ['mtb-hal-cat1/source/cyhal_timer.c'] src += ['mtb-hal-cat1/source/cyhal_timer.c']
src += ['mtb-hal-cat1/source/cyhal_tcpwm_common.c']
src += ['mtb-pdl-cat1/drivers/source/cy_tcpwm_counter.c']
path = [cwd + '/retarget-io', path = [cwd + '/retarget-io',
cwd + '/core-lib/include', cwd + '/core-lib/include',