aboutsummaryrefslogtreecommitdiff
path: root/nuttx/arch/z16/src/common/up_reprioritizertr.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-24 19:19:38 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-24 19:19:38 +0000
commit25e9b8d0846b68a18014c63146234193bfe539e8 (patch)
treee48f905cc912d6a082af49fb9e631a5a5b66d251 /nuttx/arch/z16/src/common/up_reprioritizertr.c
parent91504abf89988b25322cd04f416c44bfbfbc86c2 (diff)
downloadpx4-firmware-25e9b8d0846b68a18014c63146234193bfe539e8.tar.gz
px4-firmware-25e9b8d0846b68a18014c63146234193bfe539e8.tar.bz2
px4-firmware-25e9b8d0846b68a18014c63146234193bfe539e8.zip
Fix poll/select issue reported by Qiang
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5559 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z16/src/common/up_reprioritizertr.c')
-rw-r--r--nuttx/arch/z16/src/common/up_reprioritizertr.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/nuttx/arch/z16/src/common/up_reprioritizertr.c b/nuttx/arch/z16/src/common/up_reprioritizertr.c
index 0363184cd..6e76d6ce1 100644
--- a/nuttx/arch/z16/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/z16/src/common/up_reprioritizertr.c
@@ -1,7 +1,7 @@
/****************************************************************************
* common/up_reprioritizertr.c
*
- * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -91,9 +91,14 @@ void up_reprioritize_rtr(FAR _TCB *tcb, uint8_t priority)
/* Verify that the caller is sane */
if (tcb->task_state < FIRST_READY_TO_RUN_STATE ||
- tcb->task_state > LAST_READY_TO_RUN_STATE ||
- priority < SCHED_PRIORITY_MIN ||
- priority > SCHED_PRIORITY_MAX)
+ tcb->task_state > LAST_READY_TO_RUN_STATE
+#if SCHED_PRIORITY_MIN > 0
+ || priority < SCHED_PRIORITY_MIN
+#endif
+#if SCHED_PRIORITY_MAX < UINT8_MAX
+ || priority > SCHED_PRIORITY_MAX
+#endif
+ )
{
PANIC(OSERR_BADREPRIORITIZESTATE);
}