diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-31 17:59:22 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-01-31 17:59:22 +0000 |
| commit | 8a99a139ba3683e981c9e71c57f7fce313d92cae (patch) | |
| tree | 2dfeb694139cc0dbfcbb69bcbaae8ff6ddecbdd3 /nuttx/sched/mq_timedreceive.c | |
| parent | b1fd89b2e088a49381c698ef69904124605e81dc (diff) | |
| download | px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.tar.gz px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.tar.bz2 px4-nuttx-8a99a139ba3683e981c9e71c57f7fce313d92cae.zip | |
Z16F integration changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@595 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/mq_timedreceive.c')
| -rw-r--r-- | nuttx/sched/mq_timedreceive.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/sched/mq_timedreceive.c b/nuttx/sched/mq_timedreceive.c index 45aa6a813..6f0d93d2b 100644 --- a/nuttx/sched/mq_timedreceive.c +++ b/nuttx/sched/mq_timedreceive.c @@ -1,7 +1,7 @@ /**************************************************************************** - * mq_timedreceive.c + * sched/mq_timedreceive.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. * @@ -86,7 +86,7 @@ * ****************************************************************************/ -static void mq_rcvtimeout(int argc, uint32 pid, ...) +static void mq_rcvtimeout(int argc, uint32 pid) { FAR _TCB *wtcb; irqstate_t saved_state; @@ -192,7 +192,7 @@ ssize_t mq_timedreceive(mqd_t mqdes, void *msg, size_t msglen, irqstate_t saved_state; int ret = ERROR; - DEBUGASSERT(!up_interrupt_context()); + DEBUGASSERT(up_interrupt_context() == FALSE); /* Verify the input parameters and, in case of an error, set * errno appropriately. |