Add argument to timer irq callback

This commit is contained in:
Mark Schulte 2017-03-01 08:51:15 -06:00 committed by Gregory Nutt
parent 4761a7d816
commit 9d22f5df35
2 changed files with 4 additions and 5 deletions

View File

@ -202,8 +202,7 @@ static void nr5_timer_setperiod(FAR struct nr5_timer_dev_s *dev,
} }
static int nr5_timer_setisr(FAR struct nr5_timer_dev_s *dev, static int nr5_timer_setisr(FAR struct nr5_timer_dev_s *dev,
int (*handler)(int irq, void *context), xcpt_t handler, void * arg, int source)
int source)
{ {
int vectorno; int vectorno;
@ -275,7 +274,7 @@ static int nr5_timer_setisr(FAR struct nr5_timer_dev_s *dev,
/* Otherwise set callback and enable interrupt */ /* Otherwise set callback and enable interrupt */
irq_attach(vectorno, handler, NULL); irq_attach(vectorno, handler, arg);
up_enable_irq(vectorno); up_enable_irq(vectorno);
#ifdef CONFIG_ARCH_IRQPRIO #ifdef CONFIG_ARCH_IRQPRIO

View File

@ -56,7 +56,7 @@
#define NR5_TIMER_SETCLOCK(d,freq) ((d)->ops->setclock(d,freq)) #define NR5_TIMER_SETCLOCK(d,freq) ((d)->ops->setclock(d,freq))
#define NR5_TIMER_SETPERIOD(d,period) ((d)->ops->setperiod(d,period)) #define NR5_TIMER_SETPERIOD(d,period) ((d)->ops->setperiod(d,period))
#define NR5_TIMER_SETCOMPARE(d,ch,comp) ((d)->ops->setcompare(d,ch,comp)) #define NR5_TIMER_SETCOMPARE(d,ch,comp) ((d)->ops->setcompare(d,ch,comp))
#define NR5_TIMER_SETISR(d,hnd,s) ((d)->ops->setisr(d,hnd,s)) #define NR5_TIMER_SETISR(d,hnd,arg,s) ((d)->ops->setisr(d,hnd,arg,s))
#define NR5_TIMER_ENABLEINT(d,s) ((d)->ops->enableint(d,s)) #define NR5_TIMER_ENABLEINT(d,s) ((d)->ops->enableint(d,s))
#define NR5_TIMER_DISABLEINT(d,s) ((d)->ops->disableint(d,s)) #define NR5_TIMER_DISABLEINT(d,s) ((d)->ops->disableint(d,s))
#define NR5_TIMER_ACKINT(d,s) ((d)->ops->ackint(d,s)) #define NR5_TIMER_ACKINT(d,s) ((d)->ops->ackint(d,s))
@ -112,7 +112,7 @@ struct nr5_timer_ops_s
/* Timer Interrupt Operations */ /* Timer Interrupt Operations */
int (*setisr)(FAR struct nr5_timer_dev_s *dev, int (*handler)(int irq, void *context), int source); int (*setisr)(FAR struct nr5_timer_dev_s *dev, xcpt_t handler, void *arg, int source);
void (*enableint)(FAR struct nr5_timer_dev_s *dev, int source); void (*enableint)(FAR struct nr5_timer_dev_s *dev, int source);
void (*disableint)(FAR struct nr5_timer_dev_s *dev, int source); void (*disableint)(FAR struct nr5_timer_dev_s *dev, int source);
void (*ackint)(FAR struct nr5_timer_dev_s *dev, int source); void (*ackint)(FAR struct nr5_timer_dev_s *dev, int source);