From 1c6c76033aa8ab0db8bc0db8229fd93ab1c27142 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Jun 2015 16:58:59 -0600 Subject: [PATCH] Lincoln60: Add GPIO definitions for the microSD slot --- configs/lincoln60/README.txt | 7 +++++++ configs/lincoln60/src/lincoln60.h | 15 ++++++++++++++- fs/dirent/fs_opendir.c | 5 +++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt index 57454f6890..250b79815d 100644 --- a/configs/lincoln60/README.txt +++ b/configs/lincoln60/README.txt @@ -41,6 +41,13 @@ Lincoln 60 board P3[26] 26 LED2 P2[10] 53 BTN1 + microSD PIN SIGNAL NAME + -------------------------------- ----- -------------- + P0[15] J12 3 SPI SCK + P0[17] J12 4 SPI MISO + P0[18] J12 5 SPI MOSI + P0[16] J18 5 SPI slave select + Console ------- diff --git a/configs/lincoln60/src/lincoln60.h b/configs/lincoln60/src/lincoln60.h index a22a6c0c8b..1df8839cfe 100644 --- a/configs/lincoln60/src/lincoln60.h +++ b/configs/lincoln60/src/lincoln60.h @@ -69,12 +69,25 @@ * P2[10] 53 BTN1 ****************************************************************************/ -#define LINCOLN60_BUT1 (GPIO_INTBOTH | GPIO_FLOAT | GPIO_PORT2 | GPIO_PIN10) +#define LINCOLN60_BUT1 (GPIO_INTBOTH | GPIO_FLOAT | GPIO_PORT2 | \ + GPIO_PIN10) /* Button IRQ numbers */ #define LINCOLN60_BUT1_IRQ LPC17_IRQ_P0p23 +/**************************************************************************** + * microSD PIN SIGNAL NAME + * -------------------------------- ----- -------------- + * P0[15] J12 3 SPI SCK + * P0[17] J12 4 SPI MISO + * P0[18] J12 5 SPI MOSI + * P0[16] J18 5 SPI slave select + ****************************************************************************/ + +#define LINCOLN60_CS (GPIO_OUTPUT | GPIO_VALUE_ONE | \ + GPIO_PORT0 | GPIO_PIN16) + /**************************************************************************** * Public Types ****************************************************************************/ diff --git a/fs/dirent/fs_opendir.c b/fs/dirent/fs_opendir.c index 198b4ffd4a..e9fe2738c5 100644 --- a/fs/dirent/fs_opendir.c +++ b/fs/dirent/fs_opendir.c @@ -238,7 +238,7 @@ FAR DIR *opendir(FAR const char *path) if (!path || *path == 0 || strcmp(path, "/") == 0) { inode = root_inode; - isroot = true; + isroot = true; relpath = NULL; } else @@ -253,7 +253,8 @@ FAR DIR *opendir(FAR const char *path) /* Find the node matching the path. */ - inode = inode_search(&path, (FAR struct inode**)NULL, (FAR struct inode**)NULL, &relpath); + inode = inode_search(&path, (FAR struct inode**)NULL, + (FAR struct inode**)NULL, &relpath); } /* Did we get an inode? */