summaryrefslogtreecommitdiff
path: root/nuttx/sched/sem_holder.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-03-13 00:54:10 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2009-03-13 00:54:10 +0000
commitdbade675fdd1f84f620d0cda54caf0f23953733c (patch)
tree72a2add154442414455c9dc8983f2e28277e505d /nuttx/sched/sem_holder.c
parent3f719364f834d32d2a4b14445a5178ac7d1326ef (diff)
downloadpx4-nuttx-dbade675fdd1f84f620d0cda54caf0f23953733c.tar.gz
px4-nuttx-dbade675fdd1f84f620d0cda54caf0f23953733c.tar.bz2
px4-nuttx-dbade675fdd1f84f620d0cda54caf0f23953733c.zip
Add test for CONFIG_SEM_PREALLOCHOLDERS > 0
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1597 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/sem_holder.c')
-rw-r--r--nuttx/sched/sem_holder.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/nuttx/sched/sem_holder.c b/nuttx/sched/sem_holder.c
index 3806bfdc9..21440752f 100644
--- a/nuttx/sched/sem_holder.c
+++ b/nuttx/sched/sem_holder.c
@@ -252,9 +252,6 @@ static int sem_boostholderprio(struct semholder_s *pholder, FAR sem_t *sem, FAR
{
FAR _TCB *htcb = (FAR _TCB *)pholder->holder;
FAR _TCB *rtcb = (FAR _TCB*)arg;
-#if CONFIG_SEM_NNESTPRIO > 0
- int i;
-#endif
/* Make sure that the thread is still active. If it exited without releasing
* its counts, then that would be a bad thing. But we can take no real
@@ -301,7 +298,7 @@ static int sem_boostholderprio(struct semholder_s *pholder, FAR sem_t *sem, FAR
}
else
{
- sdgb("CONFIG_SEM_NNESTPRIO exceeded\n");
+ sdbg("CONFIG_SEM_NNESTPRIO exceeded\n");
}
}
@@ -358,7 +355,7 @@ static int sem_verifyholder(struct semholder_s *pholder, FAR sem_t *sem, FAR voi
FAR _TCB *htcb = (FAR _TCB *)pholder->holder;
#if CONFIG_SEM_NNESTPRIO > 0
- DEBUGASSERT(htcb->npend_repri == 0);
+ DEBUGASSERT(htcb->npend_reprio == 0);
#endif
DEBUGASSERT(htcb->sched_priority == htcb->base_priority);
return 0;
@@ -404,7 +401,7 @@ static int sem_restoreholderprio(struct semholder_s *pholder, FAR sem_t *sem, FA
{
/* No... the thread has only been boosted once */
- DEBUGASSERT(hctb->sched_priority == stcb->sched_priority && npend_reprio == 0);
+ DEBUGASSERT(htcb->sched_priority == stcb->sched_priority && htcb->npend_reprio == 0);
rpriority = htcb->base_priority;
}