From 675205a5de511c334f43ab7a130eac28fa951a44 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 29 Jan 2008 23:58:39 +0000 Subject: [PATCH] Misc fixes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@584 42af7a65-404d-4744-a932-0658087f49c3 --- configs/z16f2800100zcog/ostest/defconfig | 2 +- examples/ostest/mqueue.c | 2 +- sched/sched_setuptaskfiles.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig index 92315d28df..eb24435af2 100644 --- a/configs/z16f2800100zcog/ostest/defconfig +++ b/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/examples/ostest/mqueue.c b/examples/ostest/mqueue.c index e15d4680c4..44a5e103f9 100644 --- a/examples/ostest/mqueue.c +++ b/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/sched/sched_setuptaskfiles.c b/sched/sched_setuptaskfiles.c index 79c0ff44b3..2d03a4c4fd 100644 --- a/sched/sched_setuptaskfiles.c +++ b/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 * * 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 @@ -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) {