Debuggin SPI-based MicroSD card

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

5 files changed, 35 insertions, 19 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index fb7cea4f5..91aa689d6 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1376,5 +1376,9 @@
 	* arch/arm/src/lpc17xx/lpc17_ssp.c -- Fix compilation errors when SSP1 is
 	  selected.
 	* configs/olimex-lpc1766stk/nsh -- Enable network and SD/MMC card support in
-	  NSH (not verified on initial check-in)
+	  NSH.  Networking and telnetd interface functional.  Still testing SPI-based
+	  SD/MMC.
+	* examples/nsh/nsh_netinit.c -- Fix NSH bug.  If CONFIG_NET is selected, but
+	  CONFIG_EXAMPLES_NSH_TELNETD is not selected, then the network is never
+      initialized and bad things happen if you try to ping.
 
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 25797e2a0..beb581b9e 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: November 28, 2010</p>
+      <p>Last Updated: November 29, 2010</p>
     </td>
   </tr>
 </table>
@@ -1997,7 +1997,11 @@ nuttx-5.15 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
     * arch/arm/src/lpc17xx/lpc17_ssp.c -- Fix compilation errors when SSP1 is
       selected.
     * configs/olimex-lpc1766stk/nsh -- Enable network and SD/MMC card support in
-      NSH (not verified on initial check-in)
+	  NSH.  Networking and telnetd interface functional.  Still testing SPI-based
+	  SD/MMC.
+	* examples/nsh/nsh_netinit.c -- Fix NSH bug.  If CONFIG_NET is selected, but
+	  CONFIG_EXAMPLES_NSH_TELNETD is not selected, then the network is never
+      initialized and bad things happen if you try to ping.
 
 pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
index a148fe8c9..e0331f09e 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -65,20 +65,21 @@
  * Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
-
-#undef SSP_DEBUG     /* Define to enable debug */
-#undef SSP_VERBOSE   /* Define to enable verbose debug */
+/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+ * 
+ * CONFIG_SSP_DEBUG - Define to enable basic SSP debug
+ * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
+ */
 
-#ifdef SSP_DEBUG
+#ifdef CONFIG_SSP_DEBUG
 #  define sspdbg  lldbg
-#  ifdef SSP_VERBOSE
+#  ifdef CONFIG_SSP_VERBOSE
 #    define spivdbg lldbg
 #  else
 #    define spivdbg(x...)
 #  endif
 #else
-#  undef SSP_VERBOSE
+#  undef CONFIG_SSP_VERBOSE
 #  define sspdbg(x...)
 #  define spivdbg(x...)
 #endif
@@ -96,6 +97,10 @@
  * use the CCLK undivided to get the SSP_CLOCK.
  */
 
+#if LPC17_CCLK > 100000000
+#  error "CCLK <= 100,000,000 assumed"
+#endif
+
 #define SSP_PCLKSET_DIV    SYSCON_PCLKSEL_CCLK
 #define SSP_CLOCK          LPC17_CCLK
 
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index 65264b770..7fab1335b 100755
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -653,7 +653,9 @@ Where <subdir> is one of the following:
 

   nsh:

     Configures the NuttShell (nsh) located at examples/nsh.  The

-    Configuration enables only the serial  NSH interfaces.

+    Configuration enables both the serial and telnet NSH interfaces.

+    Support for the board's SPI-based MicroSD card is included

+    (but not passing tests as of this writing).

 

   ostest:

     This configuration directory, performs a simple OS test using

diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
index 9a1e72aad..be5b81222 100755
--- a/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_ssp.c
@@ -58,27 +58,28 @@
  * Definitions

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

 

-/* Enables debug output from this file (needs CONFIG_DEBUG too) */

+/* The following enable debug output from this file (needs CONFIG_DEBUG too).

+ * 

+ * CONFIG_SSP_DEBUG - Define to enable basic SSP debug

+ * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug

+ */

 

-#undef SSP_DEBUG   /* Define to enable debug */

-#undef SSP_VERBOSE /* Define to enable verbose debug */

-

-#ifdef SSP_DEBUG

+#ifdef CONFIG_SSP_DEBUG

 #  define sspdbg  lldbg

-#  ifdef SSP_VERBOSE

+#  ifdef CONFIG_SSP_VERBOSE

 #    define sspvdbg lldbg

 #  else

 #    define sspvdbg(x...)

 #  endif

 #else

-#  undef SSP_VERBOSE

+#  undef CONFIG_SSP_VERBOSE

 #  define sspdbg(x...)

 #  define sspvdbg(x...)

 #endif

 

 /* Dump GPIO registers */

 

-#ifdef SSP_VERBOSE

+#ifdef CONFIG_SSP_VERBOSE

 #  define ssp_dumpssp0gpio(m) lpc17_dumpgpio(LPC1766STK_LCD_CS, m)

 #  define ssp_dumpssp1gpio(m) lpc17_dumpgpio(LPC1766STK_MMC_CS, m)

 #else