fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 07:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update stm32 to uses NuttX IRQ API changes

Browse Source
This commit is contained in:
David Sidrane
2017-09-29 10:13:51 -04:00
committed by Daniel Agar
parent e5eab6854c
commit bc81339a68
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/stm32/drv_hrt.c
+3 -3
View File
@@ -264,7 +264,7 @@ __EXPORT uint32_t latency_counters[LATENCY_BUCKET_COUNT + 1];
/* timer-specific functions */
static void hrt_tim_init(void);
static int hrt_tim_isr(int irq, void *context);
static int hrt_tim_isr(int irq, void *context, void *arg);
static void hrt_latency_update(void);
/* callout list manipulation */
@@ -410,7 +410,7 @@ static void
hrt_tim_init(void)
{
/* claim our interrupt vector */
irq_attach(HRT_TIMER_VECTOR, hrt_tim_isr);
irq_attach(HRT_TIMER_VECTOR, hrt_tim_isr, NULL);
/* clock/power on our timer */
modifyreg32(HRT_TIMER_POWER_REG, 0, HRT_TIMER_POWER_BIT);
@@ -605,7 +605,7 @@ error:
* and then re-scheduling the next deadline.
*/
static int
hrt_tim_isr(int irq, void *context)
hrt_tim_isr(int irq, void *context, void *arg)
{
uint32_t status;
src/drivers/stm32/drv_io_timer.c
+6 -6
View File
@@ -208,31 +208,31 @@ static int io_timer_handler(uint16_t timer_index)
return 0;
}
int io_timer_handler0(int irq, void *context)
int io_timer_handler0(int irq, void *context, void *arg)
{
return io_timer_handler(0);
}
int io_timer_handler1(int irq, void *context)
int io_timer_handler1(int irq, void *context, void *arg)
{
return io_timer_handler(1);
}
int io_timer_handler2(int irq, void *context)
int io_timer_handler2(int irq, void *context, void *arg)
{
return io_timer_handler(2);
}
int io_timer_handler3(int irq, void *context)
int io_timer_handler3(int irq, void *context, void *arg)
{
return io_timer_handler(3);
}
int io_timer_handler4(int irq, void *context)
int io_timer_handler4(int irq, void *context, void *arg)
{
return io_timer_handler(4);
@@ -572,7 +572,7 @@ int io_timer_init_timer(unsigned timer)
* and active but DEIR bits are not set.
*/
irq_attach(io_timers[timer].vectorno, io_timers[timer].handler);
irq_attach(io_timers[timer].vectorno, io_timers[timer].handler, NULL);
up_enable_irq(io_timers[timer].vectorno);
src/drivers/stm32/drv_io_timer.h
+5 -5
View File
@@ -108,11 +108,11 @@ __EXPORT extern const io_timers_t led_pwm_timers[MAX_LED_TIMERS];
__EXPORT extern const timer_io_channels_t led_pwm_channels[MAX_TIMER_LED_CHANNELS];
__EXPORT extern io_timer_channel_allocation_t allocations[IOTimerChanModeSize];
__EXPORT int io_timer_handler0(int irq, void *context);
__EXPORT int io_timer_handler1(int irq, void *context);
__EXPORT int io_timer_handler2(int irq, void *context);
__EXPORT int io_timer_handler3(int irq, void *context);
__EXPORT int io_timer_handler4(int irq, void *context);
__EXPORT int io_timer_handler0(int irq, void *context, void *arg);
__EXPORT int io_timer_handler1(int irq, void *context, void *arg);
__EXPORT int io_timer_handler2(int irq, void *context, void *arg);
__EXPORT int io_timer_handler3(int irq, void *context, void *arg);
__EXPORT int io_timer_handler4(int irq, void *context, void *arg);
__EXPORT int io_timer_channel_init(unsigned channel, io_timer_channel_mode_t mode,
channel_handler_t channel_handler, void *context);