summaryrefslogtreecommitdiff
path: root/firmware/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/kernel.c')
-rw-r--r--firmware/kernel.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/firmware/kernel.c b/firmware/kernel.c
index 310832c8af..b073915c04 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -345,7 +345,7 @@ intptr_t queue_send(struct event_queue *q, long id, intptr_t data)
345{ 345{
346 int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL); 346 int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
347 unsigned int wr; 347 unsigned int wr;
348 348
349 lock_cores(); 349 lock_cores();
350 350
351 wr = q->write++ & QUEUE_LENGTH_MASK; 351 wr = q->write++ & QUEUE_LENGTH_MASK;
@@ -495,23 +495,20 @@ void queue_remove_from_head(struct event_queue *q, long id)
495int queue_count(const struct event_queue *q) 495int queue_count(const struct event_queue *q)
496{ 496{
497 int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL); 497 int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
498 int result = 0; 498 int result;
499 499
500#if NUM_CORES > 1 500#if NUM_CORES > 1
501 if (!q->irq_safe) 501 if (!q->irq_safe)
502 lock_cores(); 502 lock_cores();
503#endif 503#endif
504 504
505 if (q->read <= q->write) 505 result = q->write - q->read;
506 result = q->write - q->read; 506
507 else
508 result = QUEUE_LENGTH - (q->read - q->write);
509
510#if NUM_CORES > 1 507#if NUM_CORES > 1
511 if (!q->irq_safe) 508 if (!q->irq_safe)
512 unlock_cores(); 509 unlock_cores();
513#endif 510#endif
514 511
515 set_irq_level(oldlevel); 512 set_irq_level(oldlevel);
516 513
517 return result; 514 return result;