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

Merged in david_s5/nuttx/upstream_stm32f7_irqfixes (pull request #229)

Browse Source 
More build fiexes stm32f7 irqfixes

Approved-by: Gregory Nutt
This commit is contained in:
David Sidrane 2017-03-01 00:38:03 +00:00 committed by Gregory Nutt
commit 7c726e43a5
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ static void *g_callback_arg;
*
****************************************************************************/
static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
static int stm32_exti_pvd_isr(int irq, void *context, void *arg)
{
int ret = OK;
@ -130,7 +130,7 @@ static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
****************************************************************************/
xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
xcpt_t func)
xcpt_t func, void *arg)
{
xcpt_t oldhandler;

16
arch/arm/src/stm32f7/stm32_sdmmc.c
View File

@ -481,10 +481,10 @@ static int stm32_sdmmc2_interrupt(int irq, void *context, void *arg);
#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
#ifdef CONFIG_STM32F7_SDMMC1
static int stm32_sdmmc1_rdyinterrupt(int irq, void *context);
static int stm32_sdmmc1_rdyinterrupt(int irq, void *context, void *arg);
#endif
#ifdef CONFIG_STM32F7_SDMMC2
static int stm32_sdmmc2_rdyinterrupt(int irq, void *context);
static int stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg);
#endif
#endif
@ -846,14 +846,14 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
/* Arm the SDMMC_D Ready and install Isr */
stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler);
stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler, priv);
}
/* Disarm SDMMC_D ready */
if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0)
{
stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL);
stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL, NULL);
stm32_configgpio(priv->d0_gpio);
}
#endif
@ -1506,18 +1506,18 @@ static void stm32_endtransfer(struct stm32_dev_s *priv,
#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
# if defined(CONFIG_STM32F7_SDMMC1)
static int stm32_sdmmc1_rdyinterrupt(int irq, void *context)
static int stm32_sdmmc1_rdyinterrupt(int irq, void *context, void *arg)
{
struct stm32_dev_s *priv = &g_sdmmcdev1;
struct stm32_dev_s *priv = (struct stm32_dev_s *)arg;
stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
return OK;
}
# endif
# if defined(CONFIG_STM32F7_SDMMC2)
static int stm32_sdmmc2_rdyinterrupt(int irq, void *context)
static int stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg)
{
struct stm32_dev_s *priv = &g_sdmmcdev2;
struct stm32_dev_s *priv = struct stm32_dev_s *)arg;
stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
return OK;
}

2
arch/arm/src/stm32f7/stm32_tim.c
View File

@ -488,7 +488,7 @@ static void stm32_tim_setperiod(FAR struct stm32_tim_dev_s *dev,
}
static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
int (*handler)(int irq, void *context),
xcpt_t handler,
int source)
{
int vectorno;

3
arch/arm/src/stm32f7/stm32_tim.h
View File

@ -167,7 +167,8 @@ struct stm32_tim_ops_s
/* Timer interrupts */
int (*setisr)(FAR struct stm32_tim_dev_s *dev, int (*handler)(int irq, void *context), int source);
int (*setisr)(FAR struct stm32_tim_dev_s *dev, xcpt_t handler,
int source);
void (*enableint)(FAR struct stm32_tim_dev_s *dev, int source);
void (*disableint)(FAR struct stm32_tim_dev_s *dev, int source);
void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source);