From bc81339a6812227f666220539d151db69f912cd4 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Tue, 28 Feb 2017 16:31:45 -1000
Subject: [PATCH] Update stm32 to uses NuttX IRQ API changes

---
 src/drivers/stm32/drv_hrt.c      |  6 +++---
 src/drivers/stm32/drv_io_timer.c | 12 ++++++------
 src/drivers/stm32/drv_io_timer.h | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/drivers/stm32/drv_hrt.c b/src/drivers/stm32/drv_hrt.c
index 00cb21621a..15a2a33215 100644
--- a/src/drivers/stm32/drv_hrt.c
+++ b/src/drivers/stm32/drv_hrt.c
@@ -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;
 
diff --git a/src/drivers/stm32/drv_io_timer.c b/src/drivers/stm32/drv_io_timer.c
index a993db8e95..1b1471d4c2 100644
--- a/src/drivers/stm32/drv_io_timer.c
+++ b/src/drivers/stm32/drv_io_timer.c
@@ -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);
 
diff --git a/src/drivers/stm32/drv_io_timer.h b/src/drivers/stm32/drv_io_timer.h
index 75360d00fb..5264f4016e 100644
--- a/src/drivers/stm32/drv_io_timer.h
+++ b/src/drivers/stm32/drv_io_timer.h
@@ -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);