diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-29 23:58:39 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-29 23:58:39 +0000 |
commit | b15595dcc890f5f9440cf6150e707a5f1739d396 (patch) | |
tree | f35b2d0ceac0252a4221ee57abe87c1a76878066 /nuttx | |
parent | d8eec36ace6f20f255b285e83fd6667058fd8f63 (diff) | |
download | px4-nuttx-b15595dcc890f5f9440cf6150e707a5f1739d396.tar.gz px4-nuttx-b15595dcc890f5f9440cf6150e707a5f1739d396.tar.bz2 px4-nuttx-b15595dcc890f5f9440cf6150e707a5f1739d396.zip |
Misc fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@584 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/z16f2800100zcog/ostest/defconfig | 2 | ||||
-rw-r--r-- | nuttx/examples/ostest/mqueue.c | 2 | ||||
-rw-r--r-- | nuttx/sched/sched_setuptaskfiles.c | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index 92315d28d..eb24435af 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig @@ -171,7 +171,7 @@ CONFIG_DEV_CONSOLE=y CONFIG_DISABLE_CLOCK=n CONFIG_DISABLE_POSIX_TIMERS=n CONFIG_DISABLE_PTHREAD=n -CONFIG_DISABLE_SIGNALS=n +CONFIG_DISABLE_SIGNALS=y CONFIG_DISABLE_MQUEUE=n CONFIG_DISABLE_MOUNTPOINT=n CONFIG_DISABLE_ENVIRON=n diff --git a/nuttx/examples/ostest/mqueue.c b/nuttx/examples/ostest/mqueue.c index e15d4680c..44a5e103f 100644 --- a/nuttx/examples/ostest/mqueue.c +++ b/nuttx/examples/ostest/mqueue.c @@ -367,11 +367,11 @@ void mqueue_test(void) printf("mqueue_test: Killing receiver\n"); pthread_kill(receiver, 9); -#endif /* Wait a bit to see if the thread exits on its own */ usleep(500*1000); +#endif /* Then cancel the thread and see if it did */ diff --git a/nuttx/sched/sched_setuptaskfiles.c b/nuttx/sched/sched_setuptaskfiles.c index 79c0ff44b..2d03a4c4f 100644 --- a/nuttx/sched/sched_setuptaskfiles.c +++ b/nuttx/sched/sched_setuptaskfiles.c @@ -1,7 +1,7 @@ -/************************************************************ +/**************************************************************************** * sched_setuptaskfiles.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 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. * @@ -31,11 +31,11 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> @@ -49,15 +49,15 @@ #if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0 -/************************************************************ +/**************************************************************************** * Private Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Public Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Function: sched_setuptaskfiles * * Description: @@ -72,7 +72,7 @@ * * Assumptions: * - ************************************************************/ + ****************************************************************************/ int sched_setuptaskfiles(FAR _TCB *tcb) { |