diff --git a/ChangeLog b/ChangeLog index 420f2e51a31e99d86be727db8b0ceab9601ba88b..eaa23ef683f689f72291ed67a82043bd80efe798 100644 --- a/ChangeLog +++ b/ChangeLog @@ -504,4 +504,5 @@ was unnecessarily large. * Added LPC214x SPI1 driver to interface with MMC on mcu123.com board. * Added a simple SPI-based MMC/SD block driver + * NSH: Add LPC214x-specific support to NSH; NSH now mounts any SD cards in the slot. diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html index c017d6eca83571adf45299459e60003d549c58ec..f292c26cd497635856ca3dacbe8187832eca6d3f 100644 --- a/Documentation/NuttShell.html +++ b/Documentation/NuttShell.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1> - <p>Last Updated: September 10, 2008</p> + <p>Last Updated: October 15, 2008</p> </td> </tr> </table> @@ -1820,6 +1820,16 @@ nsh> where a minimal footprint is a necessity and background command execution is not. </td> </tr> + <tr> + <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_MMCSDMINOR</code></b></td> + <td> + If the architecture supports an MMC/SD slot and if the NSH + architecture specific logic is present, this option will provide + the MMC/SD minor number, i.e., the MMC/SD block driver will + be registered as <code>/dev/mmcsd</code><i>N</i> where <i>N</i> is the minor number. + Default is zero. + </td> + </tr> <tr> <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSETC</code></b></td> <td> diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index ef667163cc809f812939d2ef46171b24ff2aceaa..c30a030ba11d9ba9708859eade6eb3a103981a76 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1136,6 +1136,7 @@ nuttx-0.3.17 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> was unnecessarily large. * Added LPC214x SPI1 driver to interface with MMC on mcu123.com board. * Added a simple SPI-based MMC/SD block driver + * NSH: Add LPC214x-specific support to NSH; NSH now mounts any SD cards in the slot. pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig index 11a9b1acc72490e6007f482861b5d99823ecf948..55c716249ea3fcebaed2f43ee3069cf3c8b1d64d 100644 --- a/configs/mcu123-lpc214x/nsh/defconfig +++ b/configs/mcu123-lpc214x/nsh/defconfig @@ -201,7 +201,7 @@ CONFIG_DISABLE_POSIX_TIMERS=n CONFIG_DISABLE_PTHREAD=n CONFIG_DISABLE_SIGNALS=n CONFIG_DISABLE_MQUEUE=n -CONFIG_DISABLE_MOUNTPOINT=y +CONFIG_DISABLE_MOUNTPOINT=n CONFIG_DISABLE_ENVIRON=n # @@ -280,6 +280,19 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_PREALLOC_WDOGS=4 CONFIG_PREALLOC_TIMERS=4 +# +# FAT filesystem configuration +# CONFIG_FS_FAT - Enable FAT filesystem support +# CONFIG_FAT_SECTORSIZE - Max supported sector size +# CONFIG_FS_ROMFS - Enable ROMFS filesystem support +CONFIG_FS_FAT=y +CONFIG_FS_ROMFS=n + +# +# MMC/SD configuration +CONFIG_MMCSD_NSLOTS=1 +CONFIG_MMCSD_READONLY=n + # # TCP/IP and UDP support via uIP # CONFIG_NET - Enable or disable all network features @@ -484,6 +497,12 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Stack and heap information # diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig index 3dfac1fb54ba32f5f0775b7517eac3fac4a3e351..c3e197e69f816e0dcbfe703056e342aed9c57552 100644 --- a/configs/mcu123-lpc214x/ostest/defconfig +++ b/configs/mcu123-lpc214x/ostest/defconfig @@ -280,6 +280,14 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_PREALLOC_WDOGS=4 CONFIG_PREALLOC_TIMERS=4 +# +# FAT filesystem configuration +# CONFIG_FS_FAT - Enable FAT filesystem support +# CONFIG_FAT_SECTORSIZE - Max supported sector size +# CONFIG_FS_ROMFS - Enable ROMFS filesystem support +CONFIG_FS_FAT=n +CONFIG_FS_ROMFS=n + # # TCP/IP and UDP support via uIP # CONFIG_NET - Enable or disable all network features @@ -484,6 +492,12 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Stack and heap information # diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig index ba5289f1404ec4dddcea23c0b9ce836aabc77ab6..aae1c468f9ae6fc85851bc41572654ab4e5e6566 100644 --- a/configs/mcu123-lpc214x/usbserial/defconfig +++ b/configs/mcu123-lpc214x/usbserial/defconfig @@ -281,6 +281,14 @@ CONFIG_MAX_WDOGPARMS=2 CONFIG_PREALLOC_WDOGS=4 CONFIG_PREALLOC_TIMERS=4 +# +# FAT filesystem configuration +# CONFIG_FS_FAT - Enable FAT filesystem support +# CONFIG_FAT_SECTORSIZE - Max supported sector size +# CONFIG_FS_ROMFS - Enable ROMFS filesystem support +CONFIG_FS_FAT=n +CONFIG_FS_ROMFS=n + # # TCP/IP and UDP support via uIP # CONFIG_NET - Enable or disable all network features @@ -485,6 +493,12 @@ CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 CONFIG_EXAMPLES_NSH_FATNSECTORS=1024 CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# +# Architecture-specific NSH options +CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1 +CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 +CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 + # # Settings for examples/usbserial # diff --git a/examples/nsh/Makefile b/examples/nsh/Makefile index b8fa7ae732b05bb0ea3b6fed5cb080e7f072fba5..30f3408cc5050f9aaa51482fa6c80801314506cd 100644 --- a/examples/nsh/Makefile +++ b/examples/nsh/Makefile @@ -59,6 +59,11 @@ ifneq ($(CONFIG_EXAMPLES_NSH_DISABLESCRIPT),y) CSRCS += nsh_test.c endif +ifeq ($(CONFIG_ARCH_CHIP),lpc214x) +CSRCS += nsh_lpc214x.c +CFLAGS += -DCONFIG_EXAMPLES_NSH_ARCHINIT=1 +endif + AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) diff --git a/examples/nsh/README.txt b/examples/nsh/README.txt index c2182e91d1b66756d12d21dbb1d0e136df6b99f7..f1236ff4540ce2dc5916f154c7bb920491816ad1 100644 --- a/examples/nsh/README.txt +++ b/examples/nsh/README.txt @@ -760,6 +760,13 @@ NSH-Specific Configuration Settings where a minimal footprint is a necessity and background command execution is not. + * CONFIG_EXAMPLES_NSH_MMCSDMINOR + If the architecture supports an MMC/SD slot and if the NSH + architecture specific logic is present, this option will provide + the MMC/SD minor number, i.e., the MMC/SD block driver will + be registered as /dev/mmcsdN where N is the minor number. + Default is zero. + * CONFIG_EXAMPLES_NSH_ROMFSETC Mount a ROMFS filesystem at /etc and provide a startup script at /etc/init.d/rcS. The default startup script will mount diff --git a/examples/nsh/nsh.h b/examples/nsh/nsh.h index b98cec49b8319efbf15bf4181ef1cf8dd6b416dd..c4374198f03fe1d1975b9d4826cdae3e8d0dae85 100644 --- a/examples/nsh/nsh.h +++ b/examples/nsh/nsh.h @@ -284,11 +284,22 @@ extern const char g_fmtinternalerror[]; #ifdef CONFIG_EXAMPLES_NSH_ROMFSETC extern int nsh_romfsetc(void); +#else +# define nsh_romfsetc() (-ENOSYS) #endif + #if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) extern int nsh_script(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const char *path); #endif +/* Architecture-specific initialization */ + +#ifdef CONFIG_EXAMPLES_NSH_ARCHINIT +extern int nsh_archinitialize(void); +#else +# define nsh_archinitialize() (-ENOSYS) +#endif + /* Message handler */ extern int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline); diff --git a/examples/nsh/nsh_lpc214x.c b/examples/nsh/nsh_lpc214x.c new file mode 100644 index 0000000000000000000000000000000000000000..8d715db777a7bbd506a0c47d7ab58f5156bec0bc --- /dev/null +++ b/examples/nsh/nsh_lpc214x.c @@ -0,0 +1,160 @@ +/**************************************************************************** + * examples/nsh/nsh_lpc214x.c + * + * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * This logic emulates the Prolific PL2303 serial/USB converter + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/spi.h> +#include <nuttx/mmcsd.h> + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +/* PORT and SLOT number probably depend on the board configuration */ + +#ifdef CONFIG_ARCH_BOARD_MCU123 +# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1 +# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 +# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1 +# error "The LPC214x MMC/SD is on SPI1" +# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO +# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1 +# endif +# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +# error "The LPC214x MMC/SD is on SPI1" +# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 +# endif +#else + /* Add configuration for new LPC214x boards here */ +# error "Unrecognized LPC214x board" +# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#endif + +/* Can't support USB features if USB is not enabled */ + +#ifndef CONFIG_USBDEV +# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +#endif + +/* Can't support MMC/SD features if mountpoints are disabled */ + +#if defined(CONFIG_DISABLE_MOUNTPOINT) +# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#endif + +#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR +# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0 +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_lowprintf(__VA_ARGS__) +# else +# define message(...) printf(__VA_ARGS__) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_lowprintf +# else +# define message printf +# endif +#endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nsh_archinitialize + * + * Description: + * Perform architecture specific initialization + * + ****************************************************************************/ + +int nsh_archinitialize(void) +{ + FAR struct spi_dev_s *spi; + int ret; + + /* Get the SPI port */ + + message("nsh_archinitialize: Initializing SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + + spi = up_spiinitialize(1); + if (!spi) + { + message("nsh_archinitialize: Failed to initialize SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + return -ENODEV; + } + + message("nsh_archinitialize: Successfully initialized SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + + /* Bind the SPI port to the slot */ + + message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + + ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi); + if (ret < 0) + { + message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret); + return ret; + } + + message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + return OK; +} diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c index 6acf48d530b13ad25aba19c50728f8053b15ec3d..7579c9fa3cea4b87ec89c6193ff53e7413694de0 100644 --- a/examples/nsh/nsh_main.c +++ b/examples/nsh/nsh_main.c @@ -856,9 +856,11 @@ int user_start(int argc, char *argv[]) /* Mount the /etc filesystem */ -#ifdef CONFIG_EXAMPLES_NSH_ROMFSETC (void)nsh_romfsetc(); -#endif + + /* Perform architecture-specific initialization (if available) */ + + (void)nsh_archinitialize(); /* Set the priority of this task to something in the middle so that 'nice' * can both raise and lower the priority.