diff options
Diffstat (limited to 'src/gos/gos_cmsis2.h')
| -rw-r--r-- | src/gos/gos_cmsis2.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index 7504d530..a6cde139 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -27,11 +27,11 @@ #define TIME_IMMEDIATE 0 #define TIME_INFINITE osWaitForever -typedef uint32_t delaytime_t; -typedef uint32_t systemticks_t; -typedef uint16_t semcount_t; -typedef void threadreturn_t; -typedef osPriority_t threadpriority_t; +typedef uint32_t gDelay; +typedef uint32_t gTicks; +typedef uint16_t gSemcount; +typedef void gThreadreturn; +typedef osPriority_t gThreadpriority; #define MAX_SEMAPHORE_COUNT 65535UL #define LOW_PRIORITY osPriorityLow @@ -45,7 +45,7 @@ typedef osMutexId_t gfxMutex; typedef osThreadId_t gfxThreadHandle; #define DECLARE_THREAD_STACK(name, sz) uint8_t name[1]; // Some compilers don't allow zero sized arrays. Let's waste one byte -#define DECLARE_THREAD_FUNCTION(fnName, param) threadreturn_t fnName(void* param) +#define DECLARE_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void* param) #define THREAD_RETURN(retval) /*===========================================================================*/ @@ -65,14 +65,14 @@ void gfxMutexInit(gfxMutex* pmutex); #define gfxMutexEnter(pmutex) osMutexAcquire(*(pmutex), TIME_INFINITE) #define gfxMutexExit(pmutex) osMutexRelease(*(pmutex)) -void gfxSemInit(gfxSem* psem, semcount_t val, semcount_t limit); +void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit); #define gfxSemDestroy(psem) osSemaphoreDelete(*(psem)) -gBool gfxSemWait(gfxSem* psem, delaytime_t ms); +gBool gfxSemWait(gfxSem* psem, gDelay ms); #define gfxSemWaitI(psem) gfxSemWait((psem), 0) #define gfxSemSignal(psem) osSemaphoreRelease(*(psem)) #define gfxSemSignalI(psem) osSemaphoreRelease(*(psem)) -gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_t prio, DECLARE_THREAD_FUNCTION((*fn),p), void* param); +gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, gThreadpriority prio, DECLARE_THREAD_FUNCTION((*fn),p), void* param); #define gfxYield() osThreadYield() #define gfxThreadMe() osThreadGetId() #define gfxThreadClose(thread) {} |