Move board specific files from examples/nsh to board source directories

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

3 files changed, 178 insertions, 7 deletions

diff --git a/nuttx/configs/olimex-strp711/src/Makefile b/nuttx/configs/olimex-strp711/src/Makefile
index 5d8c82b97..a46c97c84 100644
--- a/nuttx/configs/olimex-strp711/src/Makefile
+++ b/nuttx/configs/olimex-strp711/src/Makefile
@@ -41,6 +41,9 @@ CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_spi.c up_leds.c up_buttons.c
+ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+CSRCS		+= up_nsh.c
+endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c
new file mode 100644
index 000000000..cf4f55807
--- /dev/null
+++ b/nuttx/configs/olimex-strp711/src/up_nsh.c
@@ -0,0 +1,168 @@
+/****************************************************************************
+ * config/olimex-strp711/src/up_nsh.c
+ * arch/arm/src/board/up_nsh.c
+ *
+ *   Copyright (C) 2009 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 <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_OLIMEX_STRP711
+#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#  ifdef CONFIG_STR71X_BSPI1
+#    define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
+#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#      error "The Olimex STR-P711 MMC/SD is on BSPI1"
+#      undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
+#      define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    endif
+#    if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#      error "The Olimex STR-P711 MMC/SD is on BSPI1 slot 0"
+#      undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#      define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    endif
+#  else
+#    undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  endif
+#else
+   /* Add configuration for new STR71x boards here */
+#  error "Unrecognized STR71x 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;
+
+#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+
+  /* Get the SPI port */
+
+  message("nsh_archinitialize: Initializing SPI port %d\n",
+          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+
+  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  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);
+#endif
+
+  return OK;
+}
diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c
index 02b68bf72..dc520449d 100644
--- a/nuttx/configs/olimex-strp711/src/up_spi.c
+++ b/nuttx/configs/olimex-strp711/src/up_spi.c
@@ -116,7 +116,7 @@
 #define BSPI0_GPIO0_SCLK (0x0004)
 #define BSPI0_GPIO0_SS   (0x0008)
 
-#define BSPIO_GPIO0-ALT  (BSPI0_GPIO0_MISO|BSPI0_GPIO0_MOSI|BSPI0_GPIO0_SCLK)
+#define BSPIO_GPIO0_ALT  (BSPI0_GPIO0_MISO|BSPI0_GPIO0_MOSI|BSPI0_GPIO0_SCLK)
 #define BSPIO_GPIO0_OUT   BSPI0_GPIO0_SS
 #define BSPIO_GPIO0_ALL  (0x000f)
 
@@ -125,7 +125,7 @@
 #define BSPI1_GPIO0_SCLK (0x0040)
 #define BSPI1_GPIO0_SS   (0x0080)
 
-#define BSPI1_GPIO0-ALT  (BSPI1_GPIO0_MISO|BSPI1_GPIO0_MOSI|BSPI1_GPIO0_SCLK)
+#define BSPI1_GPIO0_ALT  (BSPI1_GPIO0_MISO|BSPI1_GPIO0_MOSI|BSPI1_GPIO0_SCLK)
 #define BSPI1_GPIO0_OUT   BSPI1_GPIO0_SS
 #define BSPI1_GPIO0_ALL  (0x00f0)
 
@@ -504,12 +504,12 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
   ubyte ret = 0;
   uint16 reg16 = getreg16(STR71X_GPIO1_PD);
 
-  if ((re16 & MMCSD_GPIO1_WPIN) != 0)
+  if ((reg16 & MMCSD_GPIO1_WPIN) != 0)
     {
       ret |= SPI_STATUS_WRPROTECTED;
     }
 
-  if ((re16 & MMCSD_GPIO1_CPIN) != 0)
+  if ((reg16 & MMCSD_GPIO1_CPIN) != 0)
     {
       ret |= SPI_STATUS_PRESENT;
     }
@@ -653,7 +653,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
  *
  ****************************************************************************/
 
-static void spi_recvblock(FAR struct spi_dev_s *dev, FAR const *buffer, size_t buflen)
+static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen)
 {
   FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
   FAR ubyte *ptr = (FAR ubyte*)buffer;
@@ -736,7 +736,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       putreg16(reg16, STR71X_GPIO0_PC0);
 
       reg16  = getreg16(STR71X_GPIO0_PC1);
-      req16 &= ~BSPIO_GPIO0_ALL;
+      reg16 &= ~BSPIO_GPIO0_ALL;
       reg16 |= BSPIO_GPIO0_ALT;
       putreg16(reg16, STR71X_GPIO0_PC1);
 
@@ -778,7 +778,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
       putreg16(reg16, STR71X_GPIO0_PC0);
 
       reg16  = getreg16(STR71X_GPIO0_PC1);
-      req16 &= ~BSPI1_GPIO0_ALL;
+      reg16 &= ~BSPI1_GPIO0_ALL;
       reg16 |= BSPI1_GPIO0_ALT;
       putreg16(reg16, STR71X_GPIO0_PC1);