diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-22 14:46:36 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-22 14:46:36 -0600 |
| commit | 421a14767a16b25a4bd7c6cda472cb1f3e0204aa (patch) | |
| tree | 03d1177ea03c4f9df865543e58251ca92636e8fe | |
| parent | 7173b753465022f69af8ac35174e2da574f015c0 (diff) | |
| download | nuttx-421a14767a16b25a4bd7c6cda472cb1f3e0204aa.tar.gz nuttx-421a14767a16b25a4bd7c6cda472cb1f3e0204aa.tar.bz2 nuttx-421a14767a16b25a4bd7c6cda472cb1f3e0204aa.zip | |
Cosmetic changes to comments; refresh configuration
| -rw-r--r-- | nuttx/configs/dk-tm4c129x/nsh/defconfig | 8 | ||||
| -rw-r--r-- | nuttx/net/tcp/tcp_send_buffered.c | 2 | ||||
| -rw-r--r-- | nuttx/net/utils/net_lock.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/nuttx/configs/dk-tm4c129x/nsh/defconfig b/nuttx/configs/dk-tm4c129x/nsh/defconfig index 720cefed5..0fa4f5e91 100644 --- a/nuttx/configs/dk-tm4c129x/nsh/defconfig +++ b/nuttx/configs/dk-tm4c129x/nsh/defconfig @@ -974,6 +974,14 @@ CONFIG_NSH_NETINIT_SIGNO=18 CONFIG_NSH_NETINIT_RETRYMSEC=2000 CONFIG_NSH_NETINIT_THREAD_STACKSIZE=1568 CONFIG_NSH_NETINIT_THREAD_PRIORITY=100 + +# +# IP Address Configuration +# + +# +# IPv4 Addresses +# CONFIG_NSH_IPADDR=0x0a000002 CONFIG_NSH_DRIPADDR=0x0a000001 CONFIG_NSH_NETMASK=0xffffff00 diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c index cc4bc0326..43f80a856 100644 --- a/nuttx/net/tcp/tcp_send_buffered.c +++ b/nuttx/net/tcp/tcp_send_buffered.c @@ -1035,7 +1035,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf, psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_IDLE); - /* Check for a errors. Errors are signaled by negative errno values + /* Check for errors. Errors are signalled by negative errno values * for the send length */ diff --git a/nuttx/net/utils/net_lock.c b/nuttx/net/utils/net_lock.c index a8ee355ab..2569dca7f 100644 --- a/nuttx/net/utils/net_lock.c +++ b/nuttx/net/utils/net_lock.c @@ -199,7 +199,7 @@ int net_lockedwait(sem_t *sem) sched_lock(); /* No context switches */ if (g_holder == me) { - /* Release the uIP semaphore, remembering the count */ + /* Release the network lock, remembering my count */ count = g_count; g_holder = NO_HOLDER; @@ -210,7 +210,7 @@ int net_lockedwait(sem_t *sem) ret = sem_wait(sem); - /* Recover the uIP semaphore at the proper count */ + /* Recover the network lock at the proper count */ _net_takesem(); g_holder = me; |