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

stm32f7:stm32_sdmmc irq fixes

Browse Source
This commit is contained in:
David Sidrane 2017-02-28 14:20:45 -10:00
parent 30c5e78d8f
commit 964a1abada
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
}