Add chip ID funcitions for Shenzhou and Cloudctrl boards; Extened NSH ifconfig command and improve DHCPC -- All from Darcy Gong

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

8 files changed, 214 insertions, 4 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 9e8ddf44d..810e0eb40 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3697,3 +3697,6 @@
 	  Windows build.
 	* nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c: Resources not being released when
 	  I2C is uninitialized.
+	* cloudctrl/src/up_chipid.c and shenzhou/src/up_chipid.c:  Add functions to
+	  get chip ID.  Contributed by Darcy Gong.  These should not be board-dependent,
+	  but should be in arch/arm/src/stm32 where they can be used from any board.
diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html
index 1b14f96f6..0b5f7aa11 100644
--- a/nuttx/Documentation/NuttShell.html
+++ b/nuttx/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: November 9, 2012</p>
+      <p>Last Updated: November 27, 2012</p>
     </td>
   </tr>
 </table>
@@ -1219,7 +1219,7 @@ hexdump &lt;file or device&gt;
 
 <p><b>Command Syntax:</b></p>
 <ul><pre>
-ifconfig [nic_name [ip]] [dr|gw|gateway &lt;dr-address&gt;] [netmask &lt;net-mask&gt;] [dns &lt;dns-address&gt;] [hw &lt;hw-mac&gt;]]
+ifconfig [nic_name [&lt;ip-address&gt;|dhcp]] [dr|gw|gateway &lt;dr-address&gt;] [netmask &lt;net-mask&gt;] [dns &lt;dns-address&gt;] [hw &lt;hw-mac&gt;]]
 </pre></ul>
 <p>
   <b>Synopsis</b>.
diff --git a/nuttx/configs/cloudctrl/include/board.h b/nuttx/configs/cloudctrl/include/board.h
index 5f5e86ebc..3afdb9cb8 100644
--- a/nuttx/configs/cloudctrl/include/board.h
+++ b/nuttx/configs/cloudctrl/include/board.h
@@ -406,6 +406,17 @@ EXTERN void relays_resetmodes(uint32_t relays_stat);
 EXTERN void relays_powermodes(uint32_t relays_stat);
 #endif
 
+/************************************************************************************
+ * Chip ID functions
+ *
+ * Description:
+ *   Non-standard functions to obtain chip ID information.
+ *
+ ************************************************************************************/
+
+EXTERN const char *stm32_getchipid(void);
+EXTERN const char *stm32_getchipid_string(void);
+
 #undef EXTERN
 #if defined(__cplusplus)
 }
diff --git a/nuttx/configs/cloudctrl/src/Makefile b/nuttx/configs/cloudctrl/src/Makefile
index 37c944f4d..e04853115 100644
--- a/nuttx/configs/cloudctrl/src/Makefile
+++ b/nuttx/configs/cloudctrl/src/Makefile
@@ -41,7 +41,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_spi.c
+CSRCS		= up_boot.c up_spi.c up_chipid.c
 
 ifeq ($(CONFIG_HAVE_CXX),y)
 CSRCS		+= up_cxxinitialize.c
diff --git a/nuttx/configs/cloudctrl/src/up_chipid.c b/nuttx/configs/cloudctrl/src/up_chipid.c
new file mode 100644
index 000000000..55018edd4
--- /dev/null
+++ b/nuttx/configs/cloudctrl/src/up_chipid.c
@@ -0,0 +1,93 @@
+/************************************************************************************
+ * configs/cloudctrl/src/up_chipid.c
+ * arch/arm/src/board/up_chipid.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *           Darcy Gong <darcy.gong@gmail.com>
+ *
+ * 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 <stdio.h>
+
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+const char *stm32_getchipid(void)
+{
+  static char cpuid[12];
+  int i;
+
+  for (i = 0; i < 12; i++)
+    {
+      cpuid[i] = getreg8(0x1ffff7e8+i);
+    }
+
+  return cpuid;
+}
+
+const char *stm32_getchipid_string(void)
+{
+  static char cpuid[27];
+  int c;
+  int i;
+
+  for (i = 0, c = 0; i < 12; i++)
+    {
+      sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8+11-i));
+      c += 2;
+      if (i % 4 == 3)
+        {
+          cpuid[c++] = '-';
+        }
+    }
+
+  cpuid[26] = '\0';
+  return cpuid;
+}
diff --git a/nuttx/configs/shenzhou/include/board.h b/nuttx/configs/shenzhou/include/board.h
index efc15c73d..7c4d983a1 100644
--- a/nuttx/configs/shenzhou/include/board.h
+++ b/nuttx/configs/shenzhou/include/board.h
@@ -452,6 +452,17 @@ EXTERN void relays_resetmodes(uint32_t relays_stat);
 EXTERN void relays_powermodes(uint32_t relays_stat);
 #endif
 
+/************************************************************************************
+ * Chip ID functions
+ *
+ * Description:
+ *   Non-standard functions to obtain chip ID information.
+ *
+ ************************************************************************************/
+
+EXTERN const char *stm32_getchipid(void);
+EXTERN const char *stm32_getchipid_string(void);
+
 #undef EXTERN
 #if defined(__cplusplus)
 }
diff --git a/nuttx/configs/shenzhou/src/Makefile b/nuttx/configs/shenzhou/src/Makefile
index b70a6e9ce..28c42c392 100644
--- a/nuttx/configs/shenzhou/src/Makefile
+++ b/nuttx/configs/shenzhou/src/Makefile
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_spi.c up_mmcsd.c
+CSRCS		= up_boot.c up_spi.c up_mmcsd.c up_chipid.c
 
 ifeq ($(CONFIG_HAVE_CXX),y)
 CSRCS		+= up_cxxinitialize.c
diff --git a/nuttx/configs/shenzhou/src/up_chipid.c b/nuttx/configs/shenzhou/src/up_chipid.c
new file mode 100644
index 000000000..e2978e54a
--- /dev/null
+++ b/nuttx/configs/shenzhou/src/up_chipid.c
@@ -0,0 +1,92 @@
+/************************************************************************************
+ * configs/shenzhou/src/up_chipid.c
+ * arch/arm/src/board/up_chipid.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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 <stdio.h>
+
+#include <arch/board/board.h>
+
+#include "up_arch.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+const char *stm32_getchipid(void)
+{
+  static char cpuid[12];
+  int i;
+
+  for (i = 0; i < 12; i++)
+    {
+      cpuid[i] = getreg8(0x1ffff7e8+i);
+    }
+
+  return cpuid;
+}
+
+const char *stm32_getchipid_string(void)
+{
+  static char cpuid[27];
+  int c;
+  int i;
+
+  for (i = 0, c = 0; i < 12; i++)
+    {
+      sprintf(&cpuid[c], "%02X", getreg8(0x1ffff7e8+11-i));
+      c += 2;
+      if (i % 4 == 3)
+        {
+          cpuid[c++] = '-';
+        }
+    }
+
+  cpuid[26] = '\0';
+  return cpuid;
+}