summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-10-30 20:36:23 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-10-30 20:36:23 +0000
commit3c64ace5731c836a6840fdc32c3d58a1cf140d4c (patch)
treebefb30a2557c170df9e3ce47914b6bf6b97ef2e3
parent9d05e50c6e2ab9c1db864ffb797e0bf9325d8a06 (diff)
downloadrockbox-3c64ace5731c836a6840fdc32c3d58a1cf140d4c.zip
rockbox-3c64ace5731c836a6840fdc32c3d58a1cf140d4c.tar.gz
rockbox-3c64ace5731c836a6840fdc32c3d58a1cf140d4c.tar.bz2
rockbox-3c64ace5731c836a6840fdc32c3d58a1cf140d4c.tar.xz
Fix FS#8052 - kernel.c compilation errors when compiling for debug. Just some minor typos that got in with last minute SW corelock changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15380 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/kernel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/kernel.c b/firmware/kernel.c
index 25249c6..803c224 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -1271,7 +1271,7 @@ void semaphore_release(struct semaphore *s)
#endif /* CONFIG_CORELOCK */
/* there should be threads in this queue */
- KERNEL_ASSERT(s->queue.queue != NULL, "semaphore->wakeup");
+ KERNEL_ASSERT(s->queue != NULL, "semaphore->wakeup");
/* a thread was queued - wake it up */
wakeup_thread_no_listlock(&s->queue);
}
@@ -1379,7 +1379,7 @@ void event_set_state(struct event *e, unsigned int state)
{
struct thread_entry *thread;
/* no thread should have ever blocked for unsignaled */
- KERNEL_ASSERT(e->queues[STATE_NONSIGNALED].queue == NULL,
+ KERNEL_ASSERT(e->queues[STATE_NONSIGNALED] == NULL,
"set_event_state->queue[NS]:S");
/* pass to next thread and keep unsignaled - "pulse" */
thread = wakeup_thread_no_listlock(&e->queues[STATE_SIGNALED]);
@@ -1397,7 +1397,7 @@ void event_set_state(struct event *e, unsigned int state)
/* release all threads waiting for unsignaled */
/* no thread should have ever blocked if automatic */
- KERNEL_ASSERT(e->queues[STATE_NONSIGNALED].queue == NULL ||
+ KERNEL_ASSERT(e->queues[STATE_NONSIGNALED] == NULL ||
e->automatic == 0, "set_event_state->queue[NS]:NS");
thread_queue_wake_no_listlock(&e->queues[STATE_NONSIGNALED]);