diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 12:29:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 12:29:30 +1000 |
| commit | 8a9ed5195b3345635533b6150b9303abbaf5adf3 (patch) | |
| tree | b57c4580a50b261e75a19e53124acb3670d47b6f /src/gtimer | |
| parent | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (diff) | |
| download | uGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.tar.gz uGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.tar.bz2 uGFX-8a9ed5195b3345635533b6150b9303abbaf5adf3.zip | |
Tidy u gfxSem, gfxMutex and various Macros by converting to new types gSem, gMutex etc
Diffstat (limited to 'src/gtimer')
| -rw-r--r-- | src/gtimer/gtimer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index 7dbd7f90..cd7ecb9f 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -18,18 +18,18 @@ #define TimeIsWithin(x, start, end) ((end >= start && x >= start && x <= end) || (end < start && (x >= start || x <= end))) /* This mutex protects access to our tables */ -static gfxMutex mutex; +static gMutex mutex; static gThread hThread = 0; -static GTimer *pTimerHead = 0; -static gfxSem waitsem; +static GTimer *pTimerHead = 0; +static gSem waitsem; static gTicks ticks2ms; -static DECLARE_THREAD_STACK(waTimerThread, GTIMER_THREAD_WORKAREA_SIZE); +static GFX_THREAD_STACK(waTimerThread, GTIMER_THREAD_WORKAREA_SIZE); /*===========================================================================*/ /* Driver local functions. */ /*===========================================================================*/ -static DECLARE_THREAD_FUNCTION(GTimerThreadHandler, arg) { +static GFX_THREAD_FUNCTION(GTimerThreadHandler, arg) { GTimer *pt; gTicks tm; gTicks nxtTimeout; @@ -109,7 +109,7 @@ static DECLARE_THREAD_FUNCTION(GTimerThreadHandler, arg) { lastTime = tm; gfxMutexExit(&mutex); } - THREAD_RETURN(0); + gfxThreadReturn(0); } void _gtimerInit(void) |