diff options
Diffstat (limited to 'src/gos/gos_freertos.h')
| -rw-r--r-- | src/gos/gos_freertos.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h index e7ee43b8..68831d02 100644 --- a/src/gos/gos_freertos.h +++ b/src/gos/gos_freertos.h @@ -25,21 +25,21 @@ /*===========================================================================*/ #define TIME_IMMEDIATE 0 -#define TIME_INFINITE ((delaytime_t)-1) -typedef uint32_t delaytime_t; -typedef portTickType systemticks_t; -typedef int32_t semcount_t; -typedef void threadreturn_t; -typedef portBASE_TYPE threadpriority_t; - -#define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1)) +#define TIME_INFINITE ((gDelay)-1) +typedef uint32_t gDelay; +typedef portTickType gTicks; +typedef int32_t gSemcount; +typedef void gThreadreturn; +typedef portBASE_TYPE gThreadpriority; + +#define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1)) #define LOW_PRIORITY 0 #define NORMAL_PRIORITY configMAX_PRIORITIES/2 #define HIGH_PRIORITY configMAX_PRIORITIES-1 /* FreeRTOS will allocate the stack when creating the thread */ #define DECLARE_THREAD_STACK(name, sz) uint8_t name[1] -#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) typedef xSemaphoreHandle gfxSem; @@ -56,7 +56,7 @@ typedef xTaskHandle gfxThreadHandle; #define gfxFree(ptr) vPortFree(ptr) #define gfxYield() taskYIELD() #define gfxSystemTicks() xTaskGetTickCount() -#define gfxMillisecondsToTicks(ms) ((systemticks_t)((ms) / portTICK_PERIOD_MS)) +#define gfxMillisecondsToTicks(ms) ((gTicks)((ms) / portTICK_PERIOD_MS)) #define gfxSystemLock() taskENTER_CRITICAL() #define gfxSystemUnlock() taskEXIT_CRITICAL() @@ -66,20 +66,20 @@ void gfxMutexInit(gfxMutex* s); #define gfxMutexExit(pmutex) xSemaphoreGive(*(pmutex)) void *gfxRealloc(void *ptr, size_t oldsz, size_t newsz); -void gfxSleepMilliseconds(delaytime_t ms); -void gfxSleepMicroseconds(delaytime_t ms); +void gfxSleepMilliseconds(gDelay ms); +void gfxSleepMicroseconds(gDelay ms); -void gfxSemInit(gfxSem* psem, semcount_t val, semcount_t limit); +void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit); #define gfxSemDestroy(psem) vSemaphoreDelete(*(psem)) -gBool gfxSemWait(gfxSem* psem, delaytime_t ms); +gBool gfxSemWait(gfxSem* psem, gDelay ms); gBool gfxSemWaitI(gfxSem* psem); void gfxSemSignal(gfxSem* psem); void gfxSemSignalI(gfxSem* 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 gfxThreadMe() xTaskGetCurrentTaskHandle() #if INCLUDE_eTaskGetState == 1 - threadreturn_t gfxThreadWait(gfxThreadHandle thread); + gThreadreturn gfxThreadWait(gfxThreadHandle thread); #endif #define gfxThreadClose(thread) |