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

STM32 F7 SDMMC: Cosmetic changes from application of tools/nxstyle to all files modified in last PR.

Browse Source
This commit is contained in:
Gregory Nutt 2019-11-25 08:00:45 -06:00
parent 56f8af5db3
commit f691d774cc
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -889,6 +889,7 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
/* Save all of the data and set the new interrupt mask in one, atomic
* operation.
*/
flags = enter_critical_section();
#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
@ -1899,8 +1900,8 @@ static int stm32_sdmmc_interrupt(int irq, void *context, void *arg)
#ifdef CONFIG_SDIO_MUXBUS
static int stm32_lock(FAR struct sdio_dev_s *dev, bool lock)
{
/* The multiplex bus is part of board support package.
*/
/* The multiplex bus is part of board support package. */
stm32_muxbus_sdio_lock(dev, lock);
return OK;
}

5
boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
View File

@ -147,9 +147,8 @@ int stm32_bringup(void)
#endif
#ifdef HAVE_SDIO
ret = stm32_sdio_initialize();
if (ret < 0)
ret = stm32_sdio_initialize();
if (ret < 0)
{
syslog(LOG_ERR, "ERROR: stm32_n25qxxx_setup failed: %d\n", ret);
}

1
boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c
View File

@ -47,7 +47,6 @@
#include <nuttx/sdio.h>
#include <nuttx/mmcsd.h>
#include "stm32_gpio.h"
#include "stm32_sdmmc.h"
#include "stm32f746g-disco.h"

16
boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h
View File

@ -84,9 +84,9 @@
* Note that the EXTI interrupt is configured.
*/
#define MIN_IRQBUTTON BUTTON_USER
#define MAX_IRQBUTTON BUTTON_USER
#define NUM_IRQBUTTONS 1
#define MIN_IRQBUTTON BUTTON_USER
#define MAX_IRQBUTTON BUTTON_USER
#define NUM_IRQBUTTONS 1
#define GPIO_BTN_USER (GPIO_INPUT | GPIO_FLOAT | GPIO_EXTI | GPIO_PORTI | GPIO_PIN11)
@ -107,15 +107,15 @@
#define GPIO_SCHED_RUNNING (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | GPIO_OUTPUT_CLEAR | \
GPIO_PORTG | GPIO_PIN7)
#define GPIO_LCD_DISP (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTI|GPIO_PIN12)
#define GPIO_LCD_DISP (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTI|GPIO_PIN12)
#define GPIO_LCD_BL (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTK|GPIO_PIN3)
#define GPIO_LCD_BL (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
GPIO_OUTPUT_SET|GPIO_PORTK|GPIO_PIN3)
/* SD/TF Card'detected pin */
#define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN13)
#define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN13)
#define SDIO_SLOTNO 0
#define SDIO_MINOR 0