diff options
| author | Joel Bodenmann <info@b-electronics.ch> | 2018-10-01 11:16:15 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2018-10-01 11:16:15 +0200 |
| commit | fe8c80f4346c0c728495f7ccf5fcb6da4bc469b5 (patch) | |
| tree | e476a4ccce4714139af036bfb61b69d95d7d574e /src | |
| parent | df0200c0f9662b51b4e9b5cfa0ab7e222c3b7a48 (diff) | |
| parent | e56ed290e3512c15317fb1763d3a9a9392241b43 (diff) | |
| download | uGFX-fe8c80f4346c0c728495f7ccf5fcb6da4bc469b5.tar.gz uGFX-fe8c80f4346c0c728495f7ccf5fcb6da4bc469b5.tar.bz2 uGFX-fe8c80f4346c0c728495f7ccf5fcb6da4bc469b5.zip | |
Merge branch 'hotfix/fsyncqueue' of XenotriX/uGFX into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/gqueue/gqueue.c | 8 | ||||
| -rw-r--r-- | 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); /** @} */ /** |