Test for USB storage driver

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1065 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 474 insertions, 0 deletions

diff --git a/nuttx/examples/usbstorage/Makefile b/nuttx/examples/usbstorage/Makefile
new file mode 100644
index 000000000..3ba5aadf6
--- /dev/null
+++ b/nuttx/examples/usbstorage/Makefile
@@ -0,0 +1,80 @@
+############################################################################
+# examples/hello/Makefile
+#
+#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+
+ASRCS	= 
+CSRCS	= usbstrg_main.c
+
+ifeq ($(CONFIG_ARCH_CHIP),lpc214x)
+CSRCS	+= usbstrg_lpc214x.c
+endif
+
+AOBJS	= $(ASRCS:.S=$(OBJEXT))
+COBJS	= $(CSRCS:.c=$(OBJEXT))
+
+SRCS	= $(ASRCS) $(CSRCS)
+OBJS	= $(AOBJS) $(COBJS)
+
+BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
+
+all:	$(BIN)
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+depend: .depend
+
+clean:
+	@rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/examples/usbstorage/usbstrg.h b/nuttx/examples/usbstorage/usbstrg.h
new file mode 100644
index 000000000..ae45aee52
--- /dev/null
+++ b/nuttx/examples/usbstorage/usbstrg.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * examples/usbstorage/usbstrg.h
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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>
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_EXAMPLES_USBSTRG_NLUNS
+#  define CONFIG_EXAMPLES_USBSTRG_NLUNS 1
+#endif
+
+#ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR1
+#  define CONFIG_EXAMPLES_USBSTRG_DEVMINOR1 0
+#endif
+
+#ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH1
+#  define CONFIG_EXAMPLES_USBSTRG_DEVPATH1 "/dev/mmcds0"
+#endif
+
+#if CONFIG_EXAMPLES_USBSTRG_NLUNS > 1
+#  ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR2
+#    error "CONFIG_EXAMPLES_USBSTRG_DEVMINOR2 for LUN=2"
+#  endif
+#  ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH2
+#    error "CONFIG_EXAMPLES_USBSTRG_DEVPATH2 for LUN=2"
+#  endif
+#  if CONFIG_EXAMPLES_USBSTRG_NLUNS > 2
+#    ifndef CONFIG_EXAMPLES_USBSTRG_DEVMINOR3
+#      error "CONFIG_EXAMPLES_USBSTRG_DEVMINOR2 for LUN=3"
+#    endif
+#    ifndef CONFIG_EXAMPLES_USBSTRG_DEVPATH2
+#      error "CONFIG_EXAMPLES_USBSTRG_DEVPATH2 for LUN=3"
+#    endif
+#    if CONFIG_EXAMPLES_USBSTRG_NLUNS > 3
+#      error "CONFIG_EXAMPLES_USBSTRG_NLUNS must be {1,2,3}"
+#    endif
+#  endif
+#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: usbstrg_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ ****************************************************************************/
+
+extern int usbstrg_archinitialize(void);
diff --git a/nuttx/examples/usbstorage/usbstrg_lpc214x.c b/nuttx/examples/usbstorage/usbstrg_lpc214x.c
new file mode 100644
index 000000000..0da2035fc
--- /dev/null
+++ b/nuttx/examples/usbstorage/usbstrg_lpc214x.c
@@ -0,0 +1,121 @@
+/****************************************************************************
+ * examples/usbstorage/usbstrg_lpc214x.c
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Configure and register the LPC214x MMC/SD SPI block driver.
+ *
+ * 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>
+
+#include "usbstrg.h"
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+/* PORT and SLOT number probably depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_MCU123
+#  undef LPC214X_MMCSDSPIPORTNO
+#  define LPC214X_MMCSDSPIPORTNO 1
+#  undef LPC214X_MMCSDSLOTNO
+#  define LPC214X_MMCSDSLOTNO 0
+#else
+   /* Add configuration for new LPC214x boards here */
+#  error "Unrecognized LPC214x board"
+#  undef CONFIG_EXAMPLES_USBSTRG_HAVEUSBDEV
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: usbstrg_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ ****************************************************************************/
+
+int usbstrg_archinitialize(void)
+{
+  FAR struct spi_dev_s *spi;
+  int ret;
+
+  /* Get the SPI port */
+
+  message("usbstrg_archinitialize: Initializing SPI port %d\n",
+          LPC214X_MMCSDSPIPORTNO);
+
+  spi = up_spiinitialize(1);
+  if (!spi)
+    {
+      message("usbstrg_archinitialize: Failed to initialize SPI port %d\n",
+              LPC214X_MMCSDSPIPORTNO);
+      return -ENODEV;
+    }
+
+  message("usbstrg_archinitialize: Successfully initialized SPI port %d\n",
+          LPC214X_MMCSDSPIPORTNO);
+
+  /* Bind the SPI port to the slot */
+
+  message("usbstrg_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
+          LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
+
+  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_USBSTRG_DEVMINOR1, LPC214X_MMCSDSLOTNO, spi);
+  if (ret < 0)
+    {
+      message("usbstrg_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+              LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO, ret);
+      return ret;
+    }
+
+  message("usbstrg_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
+          LPC214X_MMCSDSPIPORTNO, LPC214X_MMCSDSLOTNO);
+  return OK;
+}
diff --git a/nuttx/examples/usbstorage/usbstrg_main.c b/nuttx/examples/usbstorage/usbstrg_main.c
new file mode 100644
index 000000000..a0db2aa5d
--- /dev/null
+++ b/nuttx/examples/usbstorage/usbstrg_main.c
@@ -0,0 +1,164 @@
+/****************************************************************************
+ * examples/usbstorage/usbstrg_main.c
+ *
+ *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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 <stdio.h>
+#include <unistd.h>
+#include <debug.h>
+
+#include <nuttx/usbdev.h>
+
+#include "usbstrg.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * user_initialize
+ ****************************************************************************/
+
+#ifndef CONFIG_HAVE_WEAKFUNCTIONS
+void user_initialize(void)
+{
+  /* Stub that must be provided only if the toolchain does not support weak
+   * functions.
+   */
+}
+#endif
+
+/****************************************************************************
+ * user_start
+ ****************************************************************************/
+
+int user_start(int argc, char *argv[])
+{
+  void *handle;
+  int ret;
+
+  /* Register block drivers (architecture-specific) */
+
+  message("user_start: Creating block drivers\n");
+  ret = usbstrg_archinitialize();
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_archinitialize failed: %d\n", -ret);
+      return 1;
+    }
+
+  /* Then exports the LUN(s) */
+
+  message("user_start: Configuring with NLUNS=%d\n", CONFIG_EXAMPLES_USBSTRG_NLUNS);
+  ret = usbstrg_configure(CONFIG_EXAMPLES_USBSTRG_NLUNS, &handle);
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_configure failed: %d\n", -ret);
+      usbstrg_uninitialize(handle);
+      return 2;
+    }
+  message("user_start: handle=%p\n", handle);
+
+  message("user_start: Bind LUN=0 to %s\n", CONFIG_EXAMPLES_USBSTRG_DEVPATH1);
+  ret = usbstrg_bindlun(handle, CONFIG_EXAMPLES_USBSTRG_DEVPATH1, 0, 0, 0, FALSE);
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_bindlun failed for LUN 1 using %s: %d\n",
+               CONFIG_EXAMPLES_USBSTRG_DEVPATH1, -ret);
+      usbstrg_uninitialize(handle);
+      return 2;
+    }
+
+#if CONFIG_EXAMPLES_USBSTRG_NLUNS > 1
+
+  message("user_start: Bind LUN=1 to %s\n", CONFIG_EXAMPLES_USBSTRG_DEVPATH2);
+  ret = usbstrg_bindlun(handle, CONFIG_EXAMPLES_USBSTRG_DEVPATH2, 1, 0, 0, FALSE);
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_bindlun failed for LUN 2 using %s: %d\n",
+               CONFIG_EXAMPLES_USBSTRG_DEVPATH2, -ret);
+      usbstrg_uninitialize(handle);
+      return 3;
+    }
+
+#if CONFIG_EXAMPLES_USBSTRG_NLUNS > 2
+
+  message("user_start: Bind LUN=2 to %s\n", CONFIG_EXAMPLES_USBSTRG_DEVPATH3);
+  ret = usbstrg_bindlun(handle, CONFIG_EXAMPLES_USBSTRG_DEVPATH3, 2, 0, 0, FALSE);
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_bindlun failed for LUN 3 using %s: %d\n",
+               CONFIG_EXAMPLES_USBSTRG_DEVPATH3, -ret);
+      usbstrg_uninitialize(handle);
+      return 4;
+    }
+
+#endif
+#endif
+
+  ret = usbstrg_exportluns(handle);
+  if (ret < 0)
+    {
+      message("user_start: usbstrg_exportluns failed: %d\n", -ret);
+      usbstrg_uninitialize(handle);
+      return 5;
+    }
+
+  /* Now just hang around and monitor the USB storage activity */
+
+#ifndef CONFIG_DISABLE_SIGNALS
+  for (;;)
+    {
+      sleep(5);
+      message("user_start: Still alive\n");
+    }
+#else
+     message("user_start: Exiting\n");
+ #endif
+}
+