Enable network and SD/MMC card support

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

2 files changed, 8 insertions, 18 deletions

diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
index 16a687b07..3c76d96f1 100755
--- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -56,33 +56,25 @@
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_LPC1766STK
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
 #  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
-#    error "The LPC1766-STK MMC/SD is on SSP0"
+#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+#    error "The LPC1766-STK MMC/SD is on SSP1"
 #    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
 #  endif
 #  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
 #    error "The LPC1766-STK MMC/SD is only one slot (0)"
 #    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
 #    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
 #  endif
-#  ifndef CONFIG_LPC17_SSP0
-#    warning "CONFIG_LPC17_SSP0 is not enabled"
+#  ifndef CONFIG_LPC17_SSP1
+#    warning "CONFIG_LPC17_SSP1 is not enabled"
 #  endif
 #else
 #  error "Unrecognized 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)
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
index 9ae27e0af..9a1e72aad 100755
--- a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
@@ -52,8 +52,6 @@
 #include "lpc17_internal.h"

 #include "lpc1766stk_internal.h"

 

-/* The LM3S6965 Eval Kit microSD CS is on SSI0 */

-

 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)

 

 /************************************************************************************

@@ -100,7 +98,7 @@
  * Name: lpc17_sspinitialize

  *

  * Description:

- *   Called to configure SPI chip select GPIO pins for the LM3S6965 Eval Kit.

+ *   Called to configure SPI chip select GPIO pins for the LPC1766-STK.

  *

  ************************************************************************************/

 

@@ -157,7 +155,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
       /* Assert/de-assert the CS pin to the card */

 

       ssp_dumpssp0gpio("lpc17_ssp0select() Entry");

-      lm3s_gpiowrite(LPC1766STK_LCD_CS, !selected);

+      lpc17_gpiowrite(LPC1766STK_LCD_CS, !selected);

       ssp_dumpssp0gpio("lpc17_ssp0select() Exit");

     }

 }

@@ -178,7 +176,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
       /* Assert/de-assert the CS pin to the card */

 

       ssp_dumpssp1gpio("lpc17_ssp1select() Entry");

-      lm3s_gpiowrite(LPC1766STK_MMC_CS, !selected);

+      lpc17_gpiowrite(LPC1766STK_MMC_CS, !selected);

       ssp_dumpssp1gpio("lpc17_ssp1select() Exit");

     }

 }