From e56ed290e3512c15317fb1763d3a9a9392241b43 Mon Sep 17 00:00:00 2001 From: Tibo Clausen Date: Mon, 1 Oct 2018 11:15:24 +0200 Subject: [PATCH] Fix fully sync queue --- src/gqueue/gqueue.c | 8 ++++---- src/gqueue/gqueue.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gqueue/gqueue.c b/src/gqueue/gqueue.c index 77a7647b..d8922424 100644 --- a/src/gqueue/gqueue.c +++ b/src/gqueue/gqueue.c @@ -296,7 +296,7 @@ void _gqueueDeinit(void) pqueue->head = pqueue->tail = 0; gfxSemInit(&pqueue->sem, 0, MAX_SEMAPHORE_COUNT); } - void gfxQueueFSyncDeinit(gfxQueueGSync *pqueue) { + void gfxQueueFSyncDeinit(gfxQueueFSync *pqueue) { while(gfxQueueFSyncGet(pqueue, gDelayNone)); pqueue->head = pqueue->tail = 0; gfxSemDestroy(&pqueue->sem); @@ -355,12 +355,12 @@ void _gqueueDeinit(void) return gfxSemWait(&pitem->sem, ms); } - gBool gfxQueueFSyncInsert(gfxQueueFSync *pqueue, gfxQueueFSyncItem *pitem, gfxQueueASyncItem *pafter, gDelay ms) { + gBool gfxQueueFSyncInsert(gfxQueueFSync *pqueue, gfxQueueFSyncItem *pitem, gfxQueueFSyncItem *pafter, gDelay ms) { if (!pitem) return; // Safety gfxSemInit(&pitem->sem, 0, 1); gfxSystemLock(); - if (pafter && gfxQueueGSyncIsInI(pqueue, pafter)) { + if (pafter && gfxQueueFSyncIsInI(pqueue, pafter)) { pitem->next = pafter->next; pafter->next = pitem; if (pqueue->tail == pafter) @@ -419,7 +419,7 @@ void _gqueueDeinit(void) return res; } gBool gfxQueueFSyncIsInI(gfxQueueFSync *pqueue, const gfxQueueFSyncItem *pitem) { - gfxQueueASyncItem *pi; + gfxQueueFSyncItem *pi; for(pi = pqueue->head; pi; pi = pi->next) { if (pi == pitem) diff --git a/src/gqueue/gqueue.h b/src/gqueue/gqueue.h index 9cde670d..9c292783 100644 --- a/src/gqueue/gqueue.h +++ b/src/gqueue/gqueue.h @@ -223,7 +223,7 @@ void gfxQueueASyncInsert(gfxQueueASync *pqueue, gfxQueueASyncItem *pitem, gfxQue void gfxQueueASyncInsertI(gfxQueueASync *pqueue, gfxQueueASyncItem *pitem, gfxQueueASyncItem *pafter); void gfxQueueGSyncInsert(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem, gfxQueueASyncItem *pafter); void gfxQueueGSyncInsertI(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem, gfxQueueASyncItem *pafter); -gBool gfxQueueFSyncInsert(gfxQueueFSync *pqueue, gfxQueueFSyncItem *pitem, gfxQueueASyncItem *pafter, gDelay ms); +gBool gfxQueueFSyncInsert(gfxQueueFSync *pqueue, gfxQueueFSyncItem *pitem, gfxQueueFSyncItem *pafter, gDelay ms); /** @} */ /**