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

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

apps/ChangeLog.txt

@@ -422,3 +422,5 @@
 	* apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use
 	  mkdir -p then install without the -D.  From Mike Smith.
 	* apps/examples/relays/Makefile: Reduced stack requirement (Darcy Gong).
+	* apps/nshlib and apps/netutils/dhcpc:  Extend the NSH ifconfig command plus
+	  various DHCPC improvements(Darcy Gong).

apps/netutils/dhcpc/dhcpc.c

@@ -351,6 +351,7 @@ void *dhcpc_open(const void *macaddr, int maclen)
   struct dhcpc_state_s *pdhcpc;
   struct sockaddr_in addr;
   struct timeval tv;
+  int ret;
 
   ndbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
        ((uint8_t*)macaddr)[0], ((uint8_t*)macaddr)[1], ((uint8_t*)macaddr)[2],
@@ -369,21 +370,24 @@ void *dhcpc_open(const void *macaddr, int maclen)
 
       /* Create a UDP socket */
 
-      pdhcpc->sockfd    = socket(PF_INET, SOCK_DGRAM, 0);
+      pdhcpc->sockfd = socket(PF_INET, SOCK_DGRAM, 0);
       if (pdhcpc->sockfd < 0)
         {
+          nvdbg("socket handle %d\n",ret);
           free(pdhcpc);
           return NULL;
         }
 
-      /* bind the socket */
+      /* Bind the socket */
 
       addr.sin_family      = AF_INET;
       addr.sin_port        = HTONS(DHCPC_CLIENT_PORT);
       addr.sin_addr.s_addr = INADDR_ANY;
 
-      if (bind(pdhcpc->sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) < 0)
+      ret = bind(pdhcpc->sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in));
+      if (ret < 0)
         {
+          nvdbg("bind status %d\n",ret);
           close(pdhcpc->sockfd);
           free(pdhcpc);
           return NULL;
@@ -393,8 +397,11 @@ void *dhcpc_open(const void *macaddr, int maclen)
 
       tv.tv_sec  = 10;
       tv.tv_usec = 0;
-      if (setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval)) < 0)
+
+      ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval));
+      if (ret < 0)
         {
+          nvdbg("setsockopt status %d\n",ret);
           close(pdhcpc->sockfd);
           free(pdhcpc);
           return NULL;
@@ -410,9 +417,15 @@ void *dhcpc_open(const void *macaddr, int maclen)
 
 void dhcpc_close(void *handle)
 {
-  struct dchcpc_state_internal *pdhcpc = (struct dchcpc_state_internal *)handle;
+  struct dhcpc_state_s *pdhcpc = (struct dhcpc_state_s *)handle;
+
   if (pdhcpc)
     {
+      if (pdhcpc->sockfd)
+        {
+          close(pdhcpc->sockfd);
+        }
+
       free(pdhcpc);
     }
 }

apps/nshlib/README.txt

@@ -389,7 +389,7 @@ o hexdump <file or device>
 
   Dump data in hexadecimal format from a file or character device.
 
-o ifconfig [nic_name [ip]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]
+o ifconfig [nic_name [<ip-address>|dhcp]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]
 
   Show the current configuration of the network, for example:
 

apps/nshlib/nsh_netcmds.c

@@ -81,10 +81,13 @@
 #  endif
 #endif
 
-#ifdef CONFIG_HAVE_GETHOSTBYNAME
+#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
-#  include <netdb.h>
+#  ifdef CONFIG_HAVE_GETHOSTBYNAME
-#else
+#    include <netdb.h>
-#  include <apps/netutils/resolv.h>
+#  else
+#    include <apps/netutils/resolv.h>
+#  endif
+#  include <apps/netutils/dhcpc.h>
 #endif
 
 #include "nsh.h"
@@ -568,8 +571,11 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   FAR char *tmp = NULL;
   FAR char *hw = NULL;
   FAR char *dns = NULL;
-  bool badarg=false;
+  bool badarg = false;
-  uint8_t mac[6];
+  uint8_t mac[IFHWADDRLEN];
+#if defined(CONFIG_NSH_DHCPC)
+  FAR void *handle;
+#endif
 
   /* With one or no arguments, ifconfig simply shows the status of ethernet
    * device:
@@ -673,10 +679,23 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       uip_setmacaddr(intf, mac);
     }
 
-  /* Set host ip address */
+#if defined(CONFIG_NSH_DHCPC)
+  if (!strcmp(hostip, "dhcp"))
+    {
+      /* Set DHCP addr */
+
+      ndbg("DHCPC Mode\n");
+      gip = addr.s_addr = 0;
+    }
+  else
+#endif
+    {
+      /* Set host IP address */
+
+      ndbg("Host IP: %s\n", hostip);
+      gip = addr.s_addr = inet_addr(hostip);
+    }
 
-  ndbg("Host IP: %s\n", hostip);
-  gip = addr.s_addr = inet_addr(hostip);
   uip_sethostaddr(intf, &addr);
 
   /* Set gateway */
@@ -688,11 +707,15 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
     }
   else
     {
-      ndbg("Gateway: default\n");
+      if (gip)
-      gip  = NTOHL(gip);
+        {
-      gip &= ~0x000000ff;
+          ndbg("Gateway: default\n");
-      gip |= 0x00000001;
+          gip  = NTOHL(gip);
-      gip  = HTONL(gip);
+          gip &= ~0x000000ff;
+          gip |= 0x00000001;
+          gip  = HTONL(gip);
+        }
+
       addr.s_addr = gip;
     }
 
@@ -728,6 +751,48 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   resolv_conf(&addr);
 #endif
 
+#if defined(CONFIG_NSH_DHCPC)
+  /* Get the MAC address of the NIC */
+
+  if (!gip)
+    {
+      uip_getmacaddr("eth0", mac);
+
+      /* Set up the DHCPC modules */
+
+      handle = dhcpc_open(&mac, IFHWADDRLEN);
+
+      /* Get an IP address.  Note that there is no logic for renewing the IP address in this
+       * example.  The address should be renewed in ds.lease_time/2 seconds.
+       */
+
+      if (handle)
+        {
+          struct dhcpc_state ds;
+
+          (void)dhcpc_request(handle, &ds);
+          uip_sethostaddr("eth0", &ds.ipaddr);
+
+          if (ds.netmask.s_addr != 0)
+            {
+              uip_setnetmask("eth0", &ds.netmask);
+            }
+
+          if (ds.default_router.s_addr != 0)
+            {
+              uip_setdraddr("eth0", &ds.default_router);
+            }
+
+          if (ds.dnsaddr.s_addr != 0)
+            {
+              resolv_conf(&ds.dnsaddr);
+            }
+
+          dhcpc_close(handle);
+        }
+    }
+#endif
+
   return OK;
 }
 #endif

apps/nshlib/nsh_netinit.c

@@ -156,7 +156,7 @@ int nsh_netinit(void)
     {
         struct dhcpc_state ds;
         (void)dhcpc_request(handle, &ds);
-        uip_sethostaddr("eth1", &ds.ipaddr);
+        uip_sethostaddr("eth0", &ds.ipaddr);
         if (ds.netmask.s_addr != 0)
           {
             uip_setnetmask("eth0", &ds.netmask);

apps/nshlib/nsh_parse.c

@@ -235,7 +235,7 @@ static const struct cmdmap_s g_cmdmap[] =
 
 #ifdef CONFIG_NET
 # ifndef CONFIG_NSH_DISABLE_IFCONFIG
-  { "ifconfig", cmd_ifconfig, 1, 11, "[nic_name [ip]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]" },
+  { "ifconfig", cmd_ifconfig, 1, 11, "[nic_name [<ip-address>|dhcp]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]" },
 # endif
 # ifndef CONFIG_NSH_DISABLE_IFUPDOWN
   { "ifdown",   cmd_ifdown,   2, 2,  "<nic_name>" },

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.

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>.

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)
 }

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

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;
+}

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)
 }

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

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;
+}