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

Changes from review of last PR

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-28 18:42:21 -06:00
parent 7c726e43a5
commit 5987db47e5
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,8 +174,7 @@ struct stm32_tim_ops_s
/* Timer interrupts */ /* Timer interrupts */
int (*setisr)(FAR struct stm32_tim_dev_s *dev, xcpt_t handler, int (*setisr)(FAR struct stm32_tim_dev_s *dev, xcpt_t handler, int source);
int source);
void (*enableint)(FAR struct stm32_tim_dev_s *dev, 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 (*disableint)(FAR struct stm32_tim_dev_s *dev, int source);
void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source); void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source);

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

@ -846,14 +846,16 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
/* Arm the SDMMC_D Ready and install Isr */ /* Arm the SDMMC_D Ready and install Isr */
stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler, priv); stm32_gpiosetevent(pinset, true, false, false,
priv->wrchandler, priv);
} }
/* Disarm SDMMC_D ready */ /* Disarm SDMMC_D ready */
if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0) if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0)
{ {
stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL, NULL); stm32_gpiosetevent(priv->d0_gpio, false, false, false,
NULL, NULL);
stm32_configgpio(priv->d0_gpio); stm32_configgpio(priv->d0_gpio);
} }
#endif #endif
@ -1517,7 +1519,7 @@ static int stm32_sdmmc1_rdyinterrupt(int irq, void *context, void *arg)
# if defined(CONFIG_STM32F7_SDMMC2) # if defined(CONFIG_STM32F7_SDMMC2)
static int stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg) static int stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg)
{ {
struct stm32_dev_s *priv = struct stm32_dev_s *)arg; struct stm32_dev_s *priv = (struct stm32_dev_s *)arg;
stm32_endwait(priv, SDIOWAIT_WRCOMPLETE); stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
return OK; return OK;
} }

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

@ -488,8 +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, static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
xcpt_t handler, xcpt_t handler, int source)
int source)
{ {
int vectorno; int vectorno;

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

@ -167,8 +167,7 @@ struct stm32_tim_ops_s
/* Timer interrupts */ /* Timer interrupts */
int (*setisr)(FAR struct stm32_tim_dev_s *dev, xcpt_t handler, int (*setisr)(FAR struct stm32_tim_dev_s *dev, xcpt_t handler, int source);
int source);
void (*enableint)(FAR struct stm32_tim_dev_s *dev, 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 (*disableint)(FAR struct stm32_tim_dev_s *dev, int source);
void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source); void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source);