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

Add microSD card detect pin definition for the STM32F4DIS-BB board

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-19 13:43:35 -06:00
parent 709a801e7d
commit 962aab5320
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configs/stm32f4discovery/include/board.h
View File

@ -226,8 +226,8 @@
*/ */
#ifdef CONFIG_STM32F4DISBB #ifdef CONFIG_STM32F4DISBB
# define GPIO_USART6_RX GPIO_USART6_RX_1 # define GPIO_USART6_RX GPIO_USART6_RX_1
# define GPIO_USART6_TX GPIO_USART6_TX_1 # define GPIO_USART6_TX GPIO_USART6_TX_1
#endif #endif
/* PWM /* PWM
@ -254,7 +254,6 @@
/* Ethernet *************************************************************************/ /* Ethernet *************************************************************************/
#if defined(CONFIG_STM32F4DISBB) && defined(CONFIG_STM32_ETHMAC) #if defined(CONFIG_STM32F4DISBB) && defined(CONFIG_STM32_ETHMAC)
/* RMII interface to the LAN8720 PHY */ /* RMII interface to the LAN8720 PHY */
@ -270,10 +269,10 @@
/* Pin disambiguation */ /* Pin disambiguation */
# define GPIO_ETH_RMII_TX_EN GPIO_ETH_RMII_TX_EN_1 # define GPIO_ETH_RMII_TX_EN GPIO_ETH_RMII_TX_EN_1
# define GPIO_ETH_RMII_TXD0 GPIO_ETH_RMII_TXD0_1 # define GPIO_ETH_RMII_TXD0 GPIO_ETH_RMII_TXD0_1
# define GPIO_ETH_RMII_TXD1 GPIO_ETH_RMII_TXD1_1 # define GPIO_ETH_RMII_TXD1 GPIO_ETH_RMII_TXD1_1
# define GPIO_ETH_PPS_OUT GPIO_ETH_PPS_OUT_1 # define GPIO_ETH_PPS_OUT GPIO_ETH_PPS_OUT_1
#endif #endif

5
configs/stm32f4discovery/src/stm32_nsh.c
View File

@ -44,11 +44,6 @@
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
#ifdef CONFIG_STM32_SDIO
# include <nuttx/sdio.h>
# include <nuttx/mmcsd.h>
#endif
#ifdef CONFIG_SYSTEM_USBMONITOR #ifdef CONFIG_SYSTEM_USBMONITOR
# include <apps/usbmonitor.h> # include <apps/usbmonitor.h>
#endif #endif

20
configs/stm32f4discovery/src/stm32f4discovery.h
View File

@ -144,6 +144,25 @@
# define GPIO_OLED_DC GPIO_OLED_A0 # define GPIO_OLED_DC GPIO_OLED_A0
#endif #endif
/* STM32F4DIS-BB MicroSD
*
* ---------- ------------- ------------------------------
* PIO SIGNAL Comments
* ---------- ------------- ------------------------------
* PB15 NCD Pulled up externally
* PC9 DAT1 Configured by driver
* PC8 DAT0 " " "" " "
* PC12 CLK " " "" " "
* PD2 CMD " " "" " "
* PC11 CD/DAT3 " " "" " "
* PC10 DAT2 " " "" " "
* ---------- ------------- ------------------------------
*/
#if defined(CONFIG_STM32F4DISBB) && defined(CONFIG_STM32_SDIO)
# define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTB|GPIO_PIN15)
#endif
/**************************************************************************************************** /****************************************************************************************************
* Public Types * Public Types
****************************************************************************************************/ ****************************************************************************************************/
@ -300,4 +319,3 @@ int nsh_archinitialize(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */ #endif /* __CONFIGS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */