diff options
Diffstat (limited to 'src/gos/gos_cmsis2.h')
| -rw-r--r-- | src/gos/gos_cmsis2.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index e45dd91f..9e10c012 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -27,26 +27,26 @@ #define gDelayNone 0 #define gDelayForever osWaitForever -typedef gU32 gDelay; -typedef gU32 gTicks; -typedef gU16 gSemcount; +typedef gU32 gDelay; +typedef gU32 gTicks; +typedef gU16 gSemcount; typedef void gThreadreturn; typedef osPriority_t gThreadpriority; -#define MAX_SEMAPHORE_COUNT 65535UL +#define gSemMaxCount 65535UL #define gThreadpriorityLow osPriorityLow -#define gThreadpriorityNormal osPriorityNormal +#define gThreadpriorityNormal osPriorityNormal #define gThreadpriorityHigh osPriorityHigh -typedef osSemaphoreId_t gfxSem; +typedef osSemaphoreId_t gSem; -typedef osMutexId_t gfxMutex; +typedef osMutexId_t gMutex; typedef osThreadId_t gThread; -#define DECLARE_THREAD_STACK(name, sz) gU8 name[1]; // Some compilers don't allow zero sized arrays. Let's waste one byte -#define DECLARE_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void* param) -#define THREAD_RETURN(retval) +#define GFX_THREAD_STACK(name, sz) gU8 name[1]; // Some compilers don't allow zero sized arrays. Let's waste one byte +#define GFX_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void* param) +#define gfxThreadReturn(retval) return /*===========================================================================*/ /* Function declarations. */ @@ -60,19 +60,19 @@ typedef osThreadId_t gThread; #define gfxSystemUnlock() osKernelUnlock() #define gfxSleepMilliseconds(ms) osDelay(ms) -void gfxMutexInit(gfxMutex* pmutex); +void gfxMutexInit(gMutex* pmutex); #define gfxMutexDestroy(pmutex) osMutexDelete(*(pmutex)) #define gfxMutexEnter(pmutex) osMutexAcquire(*(pmutex), gDelayForever) #define gfxMutexExit(pmutex) osMutexRelease(*(pmutex)) -void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit); +void gfxSemInit(gSem* psem, gSemcount val, gSemcount limit); #define gfxSemDestroy(psem) osSemaphoreDelete(*(psem)) -gBool gfxSemWait(gfxSem* psem, gDelay ms); +gBool gfxSemWait(gSem* psem, gDelay ms); #define gfxSemWaitI(psem) gfxSemWait((psem), 0) #define gfxSemSignal(psem) osSemaphoreRelease(*(psem)) #define gfxSemSignalI(psem) osSemaphoreRelease(*(psem)) -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); #define gfxYield() osThreadYield() #define gfxThreadMe() osThreadGetId() #define gfxThreadClose(thread) {} |