summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-06-30 17:52:59 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-06-30 17:52:59 -0600
commit4573a26f7651c08a2410219c2404b4d7c4362576 (patch)
tree2d04ffce8cbd426d319078db4d5ab861624a771d
parent87ac6625ffbdc3e18aec7278149a57db210ba178 (diff)
downloadnuttx-4573a26f7651c08a2410219c2404b4d7c4362576.tar.gz
nuttx-4573a26f7651c08a2410219c2404b4d7c4362576.tar.bz2
nuttx-4573a26f7651c08a2410219c2404b4d7c4362576.zip
Cosmetic changes, updates to README files, updates to some comments
-rw-r--r--apps/nshlib/README.txt4
-rw-r--r--apps/nshlib/nsh_netcmds.c2
-rw-r--r--nuttx/configs/sama5d4-ek/README.txt14
-rw-r--r--nuttx/configs/viewtool-stm32f107/README.txt2
4 files changed, 15 insertions, 7 deletions
diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt
index f4dc84be7..d894c9deb 100644
--- a/apps/nshlib/README.txt
+++ b/apps/nshlib/README.txt
@@ -483,8 +483,8 @@ o ifconfig [nic_name [<ip-address>|dhcp]] [dr|gw|gateway <dr-address>] [netmask
eth0 HWaddr 00:18:11:80:10:06
IPaddr:10.0.0.2 DRaddr:10.0.0.1 Mask:255.255.255.0
- if uIP statistics are enabled (CONFIG_NET_STATISTICS), then
- this command will also show the detailed state of uIP.
+ if networking statistics are enabled (CONFIG_NET_STATISTICS), then
+ this command will also show the detailed state of transfers by protocol.
o ifdown <nic-name>
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 4ea58d974..83bd56c76 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -169,7 +169,7 @@ static inline uint16_t ping_newid(void)
#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG)
static inline void net_statistics(FAR struct nsh_vtbl_s *vtbl)
{
- nsh_output(vtbl, "uIP IP ");
+ nsh_output(vtbl, " IP ");
#ifdef CONFIG_NET_TCP
nsh_output(vtbl, " TCP");
#endif
diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt
index 7d3c4e858..8dde9120d 100644
--- a/nuttx/configs/sama5d4-ek/README.txt
+++ b/nuttx/configs/sama5d4-ek/README.txt
@@ -3355,9 +3355,17 @@ Configurations
If these behaviors are a problem for you, then you may want to
disable HSMCI0 as well.
- 9. Networking support via the can be added to NSH by modifying the
- configuration. See the "Networking" section above for detailed
- configuration settings.
+ 9. Networking is supported via EMAC0. See the "Networking" section
+ above for detailed configuration settings. DHCP is not used in
+ this configuration; rather, a hard-coded IP address of 10.0.0.2 is
+ used with a netmask of 255.255.255.0. The host is assumed to be
+ 10.0.0.1 in places. You can reconfigure to enabled DHCPC or to
+ change these addresses as you see fit.
+
+ Since networking is enabled, you will see some boot-up delays until
+ the network connection is established. These delays can be quite
+ large if no network is attached (A production design would bring up
+ the network asynchronously to avoid these start up delays).
10. The SAMA5D4-EK includes for an AT25 serial DataFlash. That support is
NOT enabled in this configuration. Support for that serial FLASH can
diff --git a/nuttx/configs/viewtool-stm32f107/README.txt b/nuttx/configs/viewtool-stm32f107/README.txt
index 7b863fdf8..fec00aa26 100644
--- a/nuttx/configs/viewtool-stm32f107/README.txt
+++ b/nuttx/configs/viewtool-stm32f107/README.txt
@@ -592,7 +592,7 @@ Configurations
3. Since networking is enabled, you will see some boot-up delays when
the network connection is established. These delays can be quite
- large is no network is attached (A production design to bring up the
+ large if no network is attached (A production design to bring up the
network asynchronously to avoid these start up delays).
4. This configuration uses the default USART1 serial console. That