From 8a9ed5195b3345635533b6150b9303abbaf5adf3 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 3 Nov 2018 12:29:30 +1000 Subject: Tidy u gfxSem, gfxMutex and various Macros by converting to new types gSem, gMutex etc --- src/gos/gos_x_threads.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gos/gos_x_threads.c') diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index f9c57460..ce431de6 100644 --- a/src/gos/gos_x_threads.c +++ b/src/gos/gos_x_threads.c @@ -26,11 +26,11 @@ void gfxSystemUnlock(void) { INTERRUPTS_ON(); } -void gfxMutexInit(gfxMutex *pmutex) { +void gfxMutexInit(gMutex *pmutex) { pmutex[0] = 0; } -void gfxMutexEnter(gfxMutex *pmutex) { +void gfxMutexEnter(gMutex *pmutex) { INTERRUPTS_OFF(); while (pmutex[0]) { INTERRUPTS_ON(); @@ -41,16 +41,16 @@ void gfxMutexEnter(gfxMutex *pmutex) { INTERRUPTS_ON(); } -void gfxMutexExit(gfxMutex *pmutex) { +void gfxMutexExit(gMutex *pmutex) { pmutex[0] = 0; } -void gfxSemInit(gfxSem *psem, gSemcount val, gSemcount limit) { +void gfxSemInit(gSem *psem, gSemcount val, gSemcount limit) { psem->cnt = val; psem->limit = limit; } -gBool gfxSemWait(gfxSem *psem, gDelay ms) { +gBool gfxSemWait(gSem *psem, gDelay ms) { gTicks starttm, delay; // Convert our delay to ticks @@ -90,20 +90,20 @@ gBool gfxSemWait(gfxSem *psem, gDelay ms) { return gTrue; } -gBool gfxSemWaitI(gfxSem *psem) { +gBool gfxSemWaitI(gSem *psem) { if (psem->cnt <= 0) return gFalse; psem->cnt--; return gTrue; } -void gfxSemSignal(gfxSem *psem) { +void gfxSemSignal(gSem *psem) { INTERRUPTS_OFF(); gfxSemSignalI(psem); INTERRUPTS_ON(); } -void gfxSemSignalI(gfxSem *psem) { +void gfxSemSignalI(gSem *psem) { if (psem->cnt < psem->limit) psem->cnt++; } @@ -508,7 +508,7 @@ void gfxThreadExit(gThreadreturn ret) { // We never get back here as we didn't re-queue ourselves } -gThread gfxThreadCreate(void *stackarea, gMemSize stacksz, gThreadpriority prio, DECLARE_THREAD_FUNCTION((*fn),p), void *param) { +gThread gfxThreadCreate(void *stackarea, gMemSize stacksz, gThreadpriority prio, GFX_THREAD_FUNCTION((*fn),p), void *param) { thread * t; thread * me; (void) prio; -- cgit v1.2.3