summaryrefslogtreecommitdiff
path: root/nuttx/sched/sched_waitpid.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-09 00:26:52 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-02-09 00:26:52 +0000
commit04701a1a031e14674a6f98f235b84f60e27b139a (patch)
tree469d23ab3e3694e0d0ccad47675130074f6d29b1 /nuttx/sched/sched_waitpid.c
parent3219f837f162088ad89b2102d1fcf71b293c14fc (diff)
downloadpx4-nuttx-04701a1a031e14674a6f98f235b84f60e27b139a.tar.gz
px4-nuttx-04701a1a031e14674a6f98f235b84f60e27b139a.tar.bz2
px4-nuttx-04701a1a031e14674a6f98f235b84f60e27b139a.zip
STM32F3Discovery passes all OS tests; Delay loop has been calibrated
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5629 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/sched_waitpid.c')
-rw-r--r--nuttx/sched/sched_waitpid.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/nuttx/sched/sched_waitpid.c b/nuttx/sched/sched_waitpid.c
index edd1f3a97..7d1196350 100644
--- a/nuttx/sched/sched_waitpid.c
+++ b/nuttx/sched/sched_waitpid.c
@@ -350,7 +350,9 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
}
}
}
-#else
+
+#else /* CONFIG_SCHED_CHILD_STATUS */
+
if (rtcb->nchildren == 0)
{
/* There are no children */
@@ -373,7 +375,8 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
goto errout_with_errno;
}
}
-#endif
+
+#endif /* CONFIG_SCHED_CHILD_STATUS */
/* Loop until the child that we are waiting for dies */
@@ -455,7 +458,9 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
goto errout_with_errno;
}
}
-#else
+
+#else /* CONFIG_SCHED_CHILD_STATUS */
+
/* Check if the task has already died. Signals are not queued in
* NuttX. So a possibility is that the child has died and we
* missed the death of child signal (we got some other signal
@@ -473,7 +478,8 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
err = ECHILD;
goto errout_with_errno;
}
-#endif
+
+#endif /* CONFIG_SCHED_CHILD_STATUS */
/* Wait for any death-of-child signal */