From 53db27bef821f1380f2752fc3f3919c6b544a140 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 27 Apr 2014 11:38:24 -0600 Subject: Minor updates to READMEs and comments --- nuttx/configs/16z/README.txt | 9 +++++++-- nuttx/configs/z16f2800100zcog/README.txt | 5 +++++ nuttx/sched/pthread_join.c | 9 ++++----- nuttx/sched/task_exithook.c | 26 +++++++++++++------------- 4 files changed, 29 insertions(+), 20 deletions(-) (limited to 'nuttx') diff --git a/nuttx/configs/16z/README.txt b/nuttx/configs/16z/README.txt index bcaacbe15..8b8a0ae6f 100644 --- a/nuttx/configs/16z/README.txt +++ b/nuttx/configs/16z/README.txt @@ -167,6 +167,9 @@ The patch can also be removed with: See the section "Selecting Configurations" below. +UPDATE: 2014-4-27: The nsh example still does not run correctly. This +is believe to be caused by additional, undiagnosed compiler errors. + Serial Console ============== @@ -312,7 +315,9 @@ nsh 1. Note that you must apply the ZNEO patch if you are using ZDS-II 5.0.1. See the README.txt file in the parent directory for more information. - 2. This configuration does not run correctly. There is currently a - problem with the SRAM accesses. + 2. This configuration does not run correctly. This is believed to a yet + another ZDS-II compiler problem. The corresponding NSH configuration + of the z16f2800100zcog does work, however, so this could also be an + issue with the 16z. Check out any README.txt files in these s. diff --git a/nuttx/configs/z16f2800100zcog/README.txt b/nuttx/configs/z16f2800100zcog/README.txt index 1502a266f..c999b9d63 100644 --- a/nuttx/configs/z16f2800100zcog/README.txt +++ b/nuttx/configs/z16f2800100zcog/README.txt @@ -106,6 +106,11 @@ The patch can also be removed with: See the section "Selecting Configurations" below. +UPDATE: 2014-4-27: The configs/16z/nsh example still does not run +correctly. This is believe to be caused by additional, undiagnosed +compiler errors. At present, these compiler bugs do not seem to effect +the z16f2800100zcog. + Serial Console ============== diff --git a/nuttx/sched/pthread_join.c b/nuttx/sched/pthread_join.c index 92d3bfe69..7db332327 100644 --- a/nuttx/sched/pthread_join.c +++ b/nuttx/sched/pthread_join.c @@ -48,7 +48,7 @@ #include "pthread_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -89,9 +89,9 @@ * Return Value: * 0 if successful. Otherwise, one of the following error codes: * - * EINVAL The value specified by thread does not refer to ajoinable + * EINVAL The value specified by thread does not refer to joinable * thread. - * ESRCH No thread could be found corresponding to thatspecified by the + * ESRCH No thread could be found corresponding to that specified by the * given thread ID. * EDEADLK A deadlock was detected or the value of thread specifies the * calling thread. @@ -218,7 +218,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value) sdbg("exit_value=0x%p\n", pjoin->exit_value); } - /* Post the thread's data semaphore so that the exitting thread + /* Post the thread's data semaphore so that the exiting thread * will know that we have received the data. */ @@ -253,4 +253,3 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value) sdbg("Returning %d\n", ret); return ret; } - diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c index 7e1fbdf0c..e776bb155 100644 --- a/nuttx/sched/task_exithook.c +++ b/nuttx/sched/task_exithook.c @@ -53,7 +53,7 @@ #include "sig_internal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -80,7 +80,7 @@ * Name: task_atexit * * Description: - * Call any registerd atexit function(s) + * Call any registered atexit function(s) * ****************************************************************************/ @@ -90,7 +90,7 @@ static inline void task_atexit(FAR struct tcb_s *tcb) FAR struct task_group_s *group = tcb->group; /* Make sure that we have not already left the group. Only the final - * exitting thread in the task group should trigger the atexit() + * exiting thread in the task group should trigger the atexit() * callbacks. */ @@ -100,7 +100,7 @@ static inline void task_atexit(FAR struct tcb_s *tcb) int index; /* Call each atexit function in reverse order of registration atexit() - * functions are registered from lower to higher arry indices; they + * functions are registered from lower to higher array indices; they * must be called in the reverse order of registration when the task * group exits, i.e., from higher to lower indices. */ @@ -140,7 +140,7 @@ static inline void task_atexit(FAR struct tcb_s *tcb) * Name: task_onexit * * Description: - * Call any registerd on_exit function(s) + * Call any registered on_exit function(s) * ****************************************************************************/ @@ -150,7 +150,7 @@ static inline void task_onexit(FAR struct tcb_s *tcb, int status) FAR struct task_group_s *group = tcb->group; /* Make sure that we have not already left the group. Only the final - * exitting thread in the task group should trigger the atexit() + * exiting thread in the task group should trigger the atexit() * callbacks. */ @@ -160,9 +160,9 @@ static inline void task_onexit(FAR struct tcb_s *tcb, int status) int index; /* Call each on_exit function in reverse order of registration. - * on_exit() functions are registered from lower to higher arry + * on_exit() functions are registered from lower to higher array * indices; they must be called in the reverse order of registration - * when the task grroup exits, i.e., from higher to lower indices. + * when the task group exits, i.e., from higher to lower indices. */ for (index = CONFIG_SCHED_ONEXIT_MAX-1; index >= 0; index--) @@ -266,7 +266,7 @@ static inline void task_groupexit(FAR struct task_group_s *group) DEBUGASSERT(child); if (child) { - /* Mark that all members of the child task group has exit'ed */ + /* Mark that all members of the child task group has exited */ child->ch_flags |= CHILD_FLAG_EXITED; } @@ -336,7 +336,7 @@ static inline void task_sigchild(gid_t pgid, FAR struct tcb_s *ctcb, int status) task_groupexit(pgrp); /* Create the siginfo structure. We don't actually know the cause. - * That is a bug. Let's just say that the child task just exit-ted + * That is a bug. Let's just say that the child task just exited * for now. */ @@ -387,7 +387,7 @@ static inline void task_sigchild(FAR struct tcb_s *ptcb, #endif /* CONFIG_SCHED_CHILD_STATUS */ /* Create the siginfo structure. We don't actually know the cause. - * That is a bug. Let's just say that the child task just exit-ted + * That is a bug. Let's just say that the child task just exited * for now. */ @@ -501,7 +501,7 @@ static inline void task_exitwakeup(FAR struct tcb_s *tcb, int status) #endif { /* Report the exit status. We do not nullify tg_statloc here - * because we want to prent other tasks from registering for + * because we want to prevent other tasks from registering for * the return status. There is only one task per task group, * there for, this logic should execute exactly once in the * lifetime of the task group. @@ -577,7 +577,7 @@ static inline void task_flushstreams(FAR struct tcb_s *tcb) * * Description: * This function implements some of the internal logic of exit() and - * task_delete(). This function performs some cleanup and other actions + * task_delete(). This function performs some clean-up and other actions * required when a task exits: * * - All open streams are flushed and closed. -- cgit v1.2.3