sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for coding standard: '*' needs to 'snuggle' with following variable name

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-28 18:20:45 -06:00
parent 28768bb3dc
commit 02b1e1ec1a
9 changed files with 82 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/sama5/sam_twi.c
View File

@ -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 int twi_wait(struct twi_dev_s *priv, unsigned int size);
static void twi_wakeup(struct twi_dev_s *priv, int result); 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_timeout(int argc, uint32_t arg, ...);
static void twi_startread(struct twi_dev_s *priv, struct i2c_msg_s *msg); 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 twi_dev_s *priv = (struct twi_dev_s *)arg;
struct i2c_msg_s *msg; struct i2c_msg_s *msg;

20
arch/arm/src/stm32/stm32_adc.c
View File

@ -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); static int adc_interrupt(FAR struct adc_dev_s *dev);
#if defined(STM32_IRQ_ADC1) && defined(CONFIG_STM32_ADC1) #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 #endif
#if defined(STM32_IRQ_ADC12) && (defined(CONFIG_STM32_ADC1) || \ #if defined(STM32_IRQ_ADC12) && (defined(CONFIG_STM32_ADC1) || \
defined(CONFIG_STM32_ADC2)) 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 #endif
#if (defined(STM32_IRQ_ADC3) && defined(CONFIG_STM32_ADC3)) #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 #endif
#if defined(STM32_IRQ_ADC4) && defined(CONFIG_STM32_ADC4) #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 #endif
#if defined(STM32_IRQ_ADC) #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 #endif
/* ADC Driver Methods */ /* ADC Driver Methods */
@ -2832,7 +2832,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
****************************************************************************/ ****************************************************************************/
#if defined(STM32_IRQ_ADC1) #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); 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) && \ #if defined(STM32_IRQ_ADC12) && \
(defined(CONFIG_STM32_ADC1) || defined(CONFIG_STM32_ADC2)) (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 #ifdef CONFIG_STM32_ADC1
adc_interrupt(&g_adcdev1); 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) #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); 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) #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); adc_interrupt(&g_adcdev4);
return OK; return OK;
@ -2922,7 +2922,7 @@ static int adc4_interrupt(int irq, FAR void *context, FAR void * arg)
****************************************************************************/ ****************************************************************************/
#if defined(STM32_IRQ_ADC) #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 #ifdef CONFIG_STM32_ADC1
adc_interrupt(&g_adcdev1); adc_interrupt(&g_adcdev1);

4
arch/arm/src/stm32f7/stm32_adc.c
View File

@ -258,7 +258,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset);
/* ADC Interrupt Handler */ /* ADC Interrupt Handler */
static int adc_interrupt(FAR struct adc_dev_s *dev); 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 */ /* 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 #ifdef CONFIG_STM32F7_ADC1
adc_interrupt(&g_adcdev1); adc_interrupt(&g_adcdev1);

96
arch/arm/src/tiva/tiva_timerlib.c
View File

@ -126,28 +126,28 @@ static void tiva_putreg(struct tiva_gptmstate_s *priv, unsigned int offset,
#ifdef CONFIG_TIVA_TIMER_32BIT #ifdef CONFIG_TIVA_TIMER_32BIT
static int tiva_timer32_interrupt(struct tiva_gptmstate_s *priv); static int tiva_timer32_interrupt(struct tiva_gptmstate_s *priv);
# ifdef CONFIG_TIVA_TIMER0 # 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 # endif
# ifdef CONFIG_TIVA_TIMER1 # 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 # endif
# ifdef CONFIG_TIVA_TIMER2 # 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 # endif
# ifdef CONFIG_TIVA_TIMER3 # 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 # endif
# ifdef CONFIG_TIVA_TIMER4 # 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 # endif
# ifdef CONFIG_TIVA_TIMER5 # 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 # endif
# ifdef CONFIG_TIVA_TIMER6 # 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 # endif
# ifdef CONFIG_TIVA_TIMER7 # 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
#endif /* CONFIG_TIVA_TIMER_32BIT */ #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, static int tiva_timer16_interrupt(struct tiva_gptmstate_s *priv,
int tmndx); int tmndx);
#ifdef CONFIG_TIVA_TIMER0 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER1 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER2 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER3 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER4 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER5 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER6 #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);
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);
#endif #endif
#ifdef CONFIG_TIVA_TIMER7 #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);
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);
#endif #endif
#endif /* CONFIG_TIVA_TIMER_16BIT */ #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_TIMER_32BIT
#ifdef CONFIG_TIVA_TIMER0 #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); return tiva_timer32_interrupt(&g_gptm0_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER1 #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); return tiva_timer32_interrupt(&g_gptm1_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER2 #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); return tiva_timer32_interrupt(&g_gptm2_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER3 #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); return tiva_timer32_interrupt(&g_gptm3_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER4 #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); return tiva_timer32_interrupt(&g_gptm4_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER5 #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); return tiva_timer32_interrupt(&g_gptm5_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER6 #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); return tiva_timer32_interrupt(&g_gptm6_state);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER7 #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); 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_TIMER_16BIT
#ifdef CONFIG_TIVA_TIMER0 #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); 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); return tiva_timer16_interrupt(&g_gptm0_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER1 #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); 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); return tiva_timer16_interrupt(&g_gptm1_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER2 #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); 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); return tiva_timer16_interrupt(&g_gptm2_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER3 #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); 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); return tiva_timer16_interrupt(&g_gptm3_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER4 #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); 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); return tiva_timer16_interrupt(&g_gptm4_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER5 #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); 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); return tiva_timer16_interrupt(&g_gptm5_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER6 #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); 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); return tiva_timer16_interrupt(&g_gptm6_state, TIMER16B);
} }
#endif #endif
#ifdef CONFIG_TIVA_TIMER7 #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); 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); return tiva_timer16_interrupt(&g_gptm7_state, TIMER16B);
} }

2
drivers/input/mxt.c
View File

@ -1074,7 +1074,7 @@ errout_with_semaphore:
* Name: mxt_interrupt * 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; FAR struct mxt_dev_s *priv = (FAR struct mxt_dev_s *)arg;
int ret; int ret;

4
include/nuttx/audio/audio.h
View File

@ -389,12 +389,12 @@ begin_packed_struct struct ap_buffer_s
struct audio_msg_s struct audio_msg_s
{ {
#ifdef CONFIG_AUDIO_MULTI_SESSION #ifdef CONFIG_AUDIO_MULTI_SESSION
FAR void *session; /* Associated channel */ FAR void *session; /* Associated channel */
#endif #endif
uint16_t msgId; /* Message ID */ uint16_t msgId; /* Message ID */
union union
{ {
FAR void * pPtr; /* Buffer being dequeued */ FAR void *pPtr; /* Buffer being dequeued */
uint32_t data; /* Message data */ uint32_t data; /* Message data */
} u; } u;
}; };

2
include/nuttx/irq.h
View File

@ -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 * Name: enter_critical_section

20
sched/irq/irq.h
View File

@ -54,17 +54,27 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* This is the list of interrupt handlers, one for each IRQ. This is used /* This is the type of the list of interrupt handlers, one for each IRQ.
* by irq_dispatch to transfer control to interrupt handlers after the * This type provided all of the information necessary to irq_dispatch to
* occurrence of an interrupt. * transfer control to interrupt handlers after the occurrence of an
* interrupt.
*/ */
struct irq struct irq
{ {
xcpt_t handler; xcpt_t handler; /* Address of the interrupt handler */
FAR void * arg; 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]; extern struct irq g_irqvector[NR_IRQS];
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

2
sched/irq/irq_attach.c
View File

@ -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 #if NR_IRQS > 0
int ret = ERROR; int ret = ERROR;