diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index aea50295589..117f29b4451 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -201,7 +201,7 @@ static inline void twi_putrel(struct twi_dev_s *priv, unsigned int offset, static int twi_wait(struct twi_dev_s *priv, unsigned int size); static void twi_wakeup(struct twi_dev_s *priv, int result); -static int twi_interrupt(int irq, FAR void *context, FAR void * arg); +static int twi_interrupt(int irq, FAR void *context, FAR void *arg); static void twi_timeout(int argc, uint32_t arg, ...); static void twi_startread(struct twi_dev_s *priv, struct i2c_msg_s *msg); @@ -534,7 +534,7 @@ static void twi_wakeup(struct twi_dev_s *priv, int result) * ****************************************************************************/ -static int twi_interrupt(int irq, FAR void *context, FAR void * arg) +static int twi_interrupt(int irq, FAR void *context, FAR void *arg) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; struct i2c_msg_s *msg; diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index 818d8165366..ef91b77b40f 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -364,20 +364,20 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset); static int adc_interrupt(FAR struct adc_dev_s *dev); #if defined(STM32_IRQ_ADC1) && defined(CONFIG_STM32_ADC1) -static int adc1_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc1_interrupt(int irq, FAR void *context, FAR void *arg); #endif #if defined(STM32_IRQ_ADC12) && (defined(CONFIG_STM32_ADC1) || \ defined(CONFIG_STM32_ADC2)) -static int adc12_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc12_interrupt(int irq, FAR void *context, FAR void *arg); #endif #if (defined(STM32_IRQ_ADC3) && defined(CONFIG_STM32_ADC3)) -static int adc3_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc3_interrupt(int irq, FAR void *context, FAR void *arg); #endif #if defined(STM32_IRQ_ADC4) && defined(CONFIG_STM32_ADC4) -static int adc4_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc4_interrupt(int irq, FAR void *context, FAR void *arg); #endif #if defined(STM32_IRQ_ADC) -static int adc123_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc123_interrupt(int irq, FAR void *context, FAR void *arg); #endif /* ADC Driver Methods */ @@ -2832,7 +2832,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) ****************************************************************************/ #if defined(STM32_IRQ_ADC1) -static int adc1_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc1_interrupt(int irq, FAR void *context, FAR void *arg) { adc_interrupt(&g_adcdev1); @@ -2854,7 +2854,7 @@ static int adc1_interrupt(int irq, FAR void *context, FAR void * arg) #if defined(STM32_IRQ_ADC12) && \ (defined(CONFIG_STM32_ADC1) || defined(CONFIG_STM32_ADC2)) -static int adc12_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc12_interrupt(int irq, FAR void *context, FAR void *arg) { #ifdef CONFIG_STM32_ADC1 adc_interrupt(&g_adcdev1); @@ -2881,7 +2881,7 @@ static int adc12_interrupt(int irq, FAR void *context, FAR void * arg) ****************************************************************************/ #if defined(STM32_IRQ_ADC3) && defined(CONFIG_STM32_ADC3) -static int adc3_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc3_interrupt(int irq, FAR void *context, FAR void *arg) { adc_interrupt(&g_adcdev3); @@ -2902,7 +2902,7 @@ static int adc3_interrupt(int irq, FAR void *context, FAR void * arg) ****************************************************************************/ #if defined(STM32_IRQ_ADC4) && defined(CONFIG_STM32_ADC4) -static int adc4_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc4_interrupt(int irq, FAR void *context, FAR void *arg) { adc_interrupt(&g_adcdev4); return OK; @@ -2922,7 +2922,7 @@ static int adc4_interrupt(int irq, FAR void *context, FAR void * arg) ****************************************************************************/ #if defined(STM32_IRQ_ADC) -static int adc123_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc123_interrupt(int irq, FAR void *context, FAR void *arg) { #ifdef CONFIG_STM32_ADC1 adc_interrupt(&g_adcdev1); diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c index 661c172624c..df3ab7028e2 100644 --- a/arch/arm/src/stm32f7/stm32_adc.c +++ b/arch/arm/src/stm32f7/stm32_adc.c @@ -258,7 +258,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset); /* ADC Interrupt Handler */ static int adc_interrupt(FAR struct adc_dev_s *dev); -static int adc123_interrupt(int irq, FAR void *context, FAR void * arg); +static int adc123_interrupt(int irq, FAR void *context, FAR void *arg); /* ADC Driver Methods */ @@ -1678,7 +1678,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static int adc123_interrupt(int irq, FAR void *context, FAR void * arg) +static int adc123_interrupt(int irq, FAR void *context, FAR void *arg) { #ifdef CONFIG_STM32F7_ADC1 adc_interrupt(&g_adcdev1); diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/tiva_timerlib.c index 2baf0259733..e2d8bcd0b4a 100644 --- a/arch/arm/src/tiva/tiva_timerlib.c +++ b/arch/arm/src/tiva/tiva_timerlib.c @@ -126,28 +126,28 @@ static void tiva_putreg(struct tiva_gptmstate_s *priv, unsigned int offset, #ifdef CONFIG_TIVA_TIMER_32BIT static int tiva_timer32_interrupt(struct tiva_gptmstate_s *priv); # ifdef CONFIG_TIVA_TIMER0 -static int tiva_gptm0_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm0_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER1 -static int tiva_gptm1_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm1_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER2 -static int tiva_gptm2_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm2_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER3 -static int tiva_gptm3_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm3_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER4 -static int tiva_gptm4_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm4_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER5 -static int tiva_gptm5_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm5_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER6 -static int tiva_gptm6_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm6_interrupt(int irq, FAR void *context, FAR void *arg); # endif # ifdef CONFIG_TIVA_TIMER7 -static int tiva_gptm7_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_gptm7_interrupt(int irq, FAR void *context, FAR void *arg); #endif #endif /* CONFIG_TIVA_TIMER_32BIT */ @@ -155,36 +155,36 @@ static int tiva_gptm7_interrupt(int irq, FAR void *context, FAR void * arg); static int tiva_timer16_interrupt(struct tiva_gptmstate_s *priv, int tmndx); #ifdef CONFIG_TIVA_TIMER0 -static int tiva_timer0a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer0b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer0a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer0b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER1 -static int tiva_timer1a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer1b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer1a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer1b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER2 -static int tiva_timer2a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer2b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer2a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer2b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER3 -static int tiva_timer3a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer3b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer3a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer3b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER4 -static int tiva_timer4a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer4b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer4a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer4b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER5 -static int tiva_timer5a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer5b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer5a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer5b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER6 -static int tiva_timer6a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer6b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer6a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer6b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #ifdef CONFIG_TIVA_TIMER7 -static int tiva_timer7a_interrupt(int irq, FAR void *context, FAR void * arg); -static int tiva_timer7b_interrupt(int irq, FAR void *context, FAR void * arg); +static int tiva_timer7a_interrupt(int irq, FAR void *context, FAR void *arg); +static int tiva_timer7b_interrupt(int irq, FAR void *context, FAR void *arg); #endif #endif /* CONFIG_TIVA_TIMER_16BIT */ @@ -557,56 +557,56 @@ static int tiva_timer32_interrupt(struct tiva_gptmstate_s *priv) #ifdef CONFIG_TIVA_TIMER_32BIT #ifdef CONFIG_TIVA_TIMER0 -static int tiva_gptm0_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm0_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm0_state); } #endif #ifdef CONFIG_TIVA_TIMER1 -static int tiva_gptm1_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm1_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm1_state); } #endif #ifdef CONFIG_TIVA_TIMER2 -static int tiva_gptm2_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm2_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm2_state); } #endif #ifdef CONFIG_TIVA_TIMER3 -static int tiva_gptm3_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm3_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm3_state); } #endif #ifdef CONFIG_TIVA_TIMER4 -static int tiva_gptm4_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm4_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm4_state); } #endif #ifdef CONFIG_TIVA_TIMER5 -static int tiva_gptm5_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm5_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm5_state); } #endif #ifdef CONFIG_TIVA_TIMER6 -static int tiva_gptm6_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm6_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm6_state); } #endif #ifdef CONFIG_TIVA_TIMER7 -static int tiva_gptm7_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_gptm7_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer32_interrupt(&g_gptm7_state); } @@ -683,96 +683,96 @@ static int tiva_timer16_interrupt(struct tiva_gptmstate_s *priv, int tmndx) #ifdef CONFIG_TIVA_TIMER_16BIT #ifdef CONFIG_TIVA_TIMER0 -static int tiva_timer0a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer0a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm0_state, TIMER16A); } -static int tiva_timer0b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer0b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm0_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER1 -static int tiva_timer1a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer1a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm1_state, TIMER16A); } -static int tiva_timer1b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer1b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm1_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER2 -static int tiva_timer2a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer2a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm2_state, TIMER16A); } -static int tiva_timer2b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer2b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm2_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER3 -static int tiva_timer3a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer3a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm3_state, TIMER16A); } -static int tiva_timer3b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer3b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm3_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER4 -static int tiva_timer4a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer4a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm4_state, TIMER16A); } -static int tiva_timer4b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer4b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm4_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER5 -static int tiva_timer5a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer5a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm5_state, TIMER16A); } -static int tiva_timer5b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer5b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm5_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER6 -static int tiva_timer6a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer6a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm6_state, TIMER16A); } -static int tiva_timer6b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer6b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm6_state, TIMER16B); } #endif #ifdef CONFIG_TIVA_TIMER7 -static int tiva_timer7a_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer7a_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm7_state, TIMER16A); } -static int tiva_timer7b_interrupt(int irq, FAR void *context, FAR void * arg) +static int tiva_timer7b_interrupt(int irq, FAR void *context, FAR void *arg) { return tiva_timer16_interrupt(&g_gptm7_state, TIMER16B); } diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c index 713d6ddb3af..f19c2bb0be5 100644 --- a/drivers/input/mxt.c +++ b/drivers/input/mxt.c @@ -1074,7 +1074,7 @@ errout_with_semaphore: * Name: mxt_interrupt ****************************************************************************/ -static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void * arg) +static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg) { FAR struct mxt_dev_s *priv = (FAR struct mxt_dev_s *)arg; int ret; diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h index d312a6f6d10..1bdb9fe7ef4 100644 --- a/include/nuttx/audio/audio.h +++ b/include/nuttx/audio/audio.h @@ -389,12 +389,12 @@ begin_packed_struct struct ap_buffer_s struct audio_msg_s { #ifdef CONFIG_AUDIO_MULTI_SESSION - FAR void *session; /* Associated channel */ + FAR void *session; /* Associated channel */ #endif uint16_t msgId; /* Message ID */ union { - FAR void * pPtr; /* Buffer being dequeued */ + FAR void *pPtr; /* Buffer being dequeued */ uint32_t data; /* Message data */ } u; }; diff --git a/include/nuttx/irq.h b/include/nuttx/irq.h index 45ccb3bb743..59d8a3a3302 100644 --- a/include/nuttx/irq.h +++ b/include/nuttx/irq.h @@ -98,7 +98,7 @@ extern "C" * ****************************************************************************/ -int irq_attach(int irq, xcpt_t isr, FAR void * arg); +int irq_attach(int irq, xcpt_t isr, FAR void *arg); /**************************************************************************** * Name: enter_critical_section diff --git a/sched/irq/irq.h b/sched/irq/irq.h index 780d13347a5..59bd5ea2436 100644 --- a/sched/irq/irq.h +++ b/sched/irq/irq.h @@ -54,17 +54,27 @@ * Public Data ****************************************************************************/ -/* This is the list of interrupt handlers, one for each IRQ. This is used - * by irq_dispatch to transfer control to interrupt handlers after the - * occurrence of an interrupt. +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. */ struct irq { - xcpt_t handler; - FAR void * arg; + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ }; +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* This is the list of interrupt handlers, one for each IRQ. This is used + * by irq_dispatch to transfer control to interrupt handlers after the + * occurrence of an interrupt. + */ + extern struct irq g_irqvector[NR_IRQS]; #ifdef CONFIG_SMP diff --git a/sched/irq/irq_attach.c b/sched/irq/irq_attach.c index ae147e2004b..218ceb7ca1f 100644 --- a/sched/irq/irq_attach.c +++ b/sched/irq/irq_attach.c @@ -56,7 +56,7 @@ * ****************************************************************************/ -int irq_attach(int irq, xcpt_t isr, FAR void * arg) +int irq_attach(int irq, xcpt_t isr, FAR void *arg) { #if NR_IRQS > 0 int ret = ERROR;