aboutsummaryrefslogtreecommitdiffstats
path: root/src/gos
diff options
context:
space:
mode:
Diffstat (limited to 'src/gos')
-rw-r--r--src/gos/gos.h19
-rw-r--r--src/gos/gos_chibios.c16
-rw-r--r--src/gos/gos_chibios.h6
-rw-r--r--src/gos/gos_cmsis.h6
-rw-r--r--src/gos/gos_cmsis2.h6
-rw-r--r--src/gos/gos_ecos.c12
-rw-r--r--src/gos/gos_ecos.h4
-rw-r--r--src/gos/gos_freertos.h4
-rw-r--r--src/gos/gos_linux.c16
-rw-r--r--src/gos/gos_linux.h6
-rw-r--r--src/gos/gos_osx.c12
-rw-r--r--src/gos/gos_osx.h6
-rw-r--r--src/gos/gos_qt.h4
-rw-r--r--src/gos/gos_rawrtos.c2
-rw-r--r--src/gos/gos_rawrtos.h6
-rw-r--r--src/gos/gos_win32.c4
-rw-r--r--src/gos/gos_win32.h6
-rw-r--r--src/gos/gos_x_threads.c20
-rw-r--r--src/gos/gos_x_threads.h4
-rw-r--r--src/gos/gos_zephyr.h4
20 files changed, 83 insertions, 80 deletions
diff --git a/src/gos/gos.h b/src/gos/gos.h
index 5db10fef..e8684d6f 100644
--- a/src/gos/gos.h
+++ b/src/gos/gos.h
@@ -99,8 +99,8 @@
* @note Your platform may use slightly different definitions to these
* @{
*/
- #define TIME_IMMEDIATE 0
- #define TIME_INFINITE ((gDelay)-1)
+ #define gDelayNone 0
+ #define gDelayForever ((gDelay)-1)
#define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1))
#define LOW_PRIORITY 0
#define NORMAL_PRIORITY 1
@@ -215,9 +215,9 @@
*
* @param[in] ms The number milliseconds to sleep
*
- * @note Specifying TIME_IMMEDIATE will yield the current thread but return
+ * @note Specifying gDelayNone will yield the current thread but return
* on the next time slice.
- * @note Specifying TIME_INFINITE will sleep forever.
+ * @note Specifying gDelayForever will sleep forever.
*
* @api
*/
@@ -228,8 +228,8 @@
*
* @param[in] us The number microseconds to sleep
*
- * @note Specifying TIME_IMMEDIATE will return immediately (no sleeping)
- * @note Specifying TIME_INFINITE will sleep forever.
+ * @note Specifying gDelayNone will return immediately (no sleeping)
+ * @note Specifying gDelayForever will sleep forever.
*
* @api
*/
@@ -372,7 +372,7 @@
/**
* @brief Test if a wait on a semaphore can be satisfied immediately
- * @details Equivalent to @p gfxSemWait(psem, TIME_IMMEDIATE) except it can be called at interrupt level
+ * @details Equivalent to @p gfxSemWait(psem, gDelayNone) except it can be called at interrupt level
* @return gFalse if the wait would occur occurred otherwise gTrue
*
* @param[in] psem A pointer to the semaphore
@@ -498,6 +498,11 @@
typedef gTicks systemticks_t;
typedef gThreadreturn threadreturn_t;
typedef gThreadpriority threadpriority_t;
+ #if !GFX_USE_OS_CHIBIOS
+ // These are defined by ChibiOS itself
+ #define TIME_IMMEDIATE gDelayNone
+ #define TIME_INFINITE gDelayForever
+ #endif
#endif
#endif /* _GOS_H */
diff --git a/src/gos/gos_chibios.c b/src/gos/gos_chibios.c
index ef7a3336..c5a89b5a 100644
--- a/src/gos/gos_chibios.c
+++ b/src/gos/gos_chibios.c
@@ -84,8 +84,8 @@ void *gfxRealloc(void *ptr, size_t oldsz, size_t newsz)
void gfxSleepMilliseconds(gDelay ms)
{
switch(ms) {
- case TIME_IMMEDIATE: chThdYield(); return;
- case TIME_INFINITE: chThdSleep(TIME_INFINITE); return;
+ case gDelayNone: chThdYield(); return;
+ case gDelayForever: chThdSleep(TIME_INFINITE); return;
default: chThdSleepMilliseconds(ms); return;
}
}
@@ -93,8 +93,8 @@ void gfxSleepMilliseconds(gDelay ms)
void gfxSleepMicroseconds(gDelay ms)
{
switch(ms) {
- case TIME_IMMEDIATE: return;
- case TIME_INFINITE: chThdSleep(TIME_INFINITE); return;
+ case gDelayNone: return;
+ case gDelayForever: chThdSleep(TIME_INFINITE); return;
default: chThdSleepMicroseconds(ms); return;
}
}
@@ -122,14 +122,14 @@ gBool gfxSemWait(gfxSem *psem, gDelay ms)
{
#if CH_KERNEL_MAJOR <= 2
switch(ms) {
- case TIME_IMMEDIATE: return chSemWaitTimeout(&psem->sem, TIME_IMMEDIATE) != RDY_TIMEOUT;
- case TIME_INFINITE: chSemWait(&psem->sem); return gTrue;
+ case gDelayNone: return chSemWaitTimeout(&psem->sem, TIME_IMMEDIATE) != RDY_TIMEOUT;
+ case gDelayForever: chSemWait(&psem->sem); return gTrue;
default: return chSemWaitTimeout(&psem->sem, gfxMillisecondsToTicks(ms)) != RDY_TIMEOUT;
}
#else
switch(ms) {
- case TIME_IMMEDIATE: return chSemWaitTimeout(&psem->sem, TIME_IMMEDIATE) != MSG_TIMEOUT;
- case TIME_INFINITE: chSemWait(&psem->sem); return gTrue;
+ case gDelayNone: return chSemWaitTimeout(&psem->sem, TIME_IMMEDIATE) != MSG_TIMEOUT;
+ case gDelayForever: chSemWait(&psem->sem); return gTrue;
default: return chSemWaitTimeout(&psem->sem, gfxMillisecondsToTicks(ms)) != MSG_TIMEOUT;
}
#endif
diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index 77680a9c..450603c7 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -25,10 +25,8 @@
/* Type definitions */
/*===========================================================================*/
-/**
- * TIME_IMMEDIATE, TIME_INFINITE
- * are already defined by ChibiOS
- */
+#define gDelayNone TIME_IMMEDIATE
+#define gDelayForever TIME_INFINITE
#if CH_KERNEL_MAJOR <= 4
typedef systime_t gDelay;
diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h
index 4473b9d1..0f2d66f5 100644
--- a/src/gos/gos_cmsis.h
+++ b/src/gos/gos_cmsis.h
@@ -25,8 +25,8 @@
/* Type definitions */
/*===========================================================================*/
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE osWaitForever
+#define gDelayNone 0
+#define gDelayForever osWaitForever
typedef uint32_t gDelay;
typedef uint32_t gTicks;
typedef uint16_t gSemcount;
@@ -69,7 +69,7 @@ typedef osThreadId gfxThreadHandle;
void gfxMutexInit(gfxMutex* pmutex);
#define gfxMutexDestroy(pmutex) osMutexDelete((pmutex)->id)
-#define gfxMutexEnter(pmutex) osMutexWait((pmutex)->id, TIME_INFINITE)
+#define gfxMutexEnter(pmutex) osMutexWait((pmutex)->id, gDelayForever)
#define gfxMutexExit(pmutex) osMutexRelease((pmutex)->id)
void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit);
diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h
index a6cde139..49c6cee2 100644
--- a/src/gos/gos_cmsis2.h
+++ b/src/gos/gos_cmsis2.h
@@ -25,8 +25,8 @@
/* Type definitions */
/*===========================================================================*/
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE osWaitForever
+#define gDelayNone 0
+#define gDelayForever osWaitForever
typedef uint32_t gDelay;
typedef uint32_t gTicks;
typedef uint16_t gSemcount;
@@ -62,7 +62,7 @@ typedef osThreadId_t gfxThreadHandle;
void gfxMutexInit(gfxMutex* pmutex);
#define gfxMutexDestroy(pmutex) osMutexDelete(*(pmutex))
-#define gfxMutexEnter(pmutex) osMutexAcquire(*(pmutex), TIME_INFINITE)
+#define gfxMutexEnter(pmutex) osMutexAcquire(*(pmutex), gDelayForever)
#define gfxMutexExit(pmutex) osMutexRelease(*(pmutex))
void gfxSemInit(gfxSem* psem, gSemcount val, gSemcount limit);
diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c
index 9b38d3b0..92ba6526 100644
--- a/src/gos/gos_ecos.c
+++ b/src/gos/gos_ecos.c
@@ -35,8 +35,8 @@ void _gosDeinit(void)
void gfxSleepMilliseconds(gDelay ms)
{
switch(ms) {
- case TIME_IMMEDIATE: cyg_thread_yield(); return;
- case TIME_INFINITE: cyg_thread_suspend(cyg_thread_self()); return;
+ case gDelayNone: cyg_thread_yield(); return;
+ case gDelayForever: cyg_thread_suspend(cyg_thread_self()); return;
default: cyg_thread_delay(gfxMillisecondsToTicks(ms)); return;
}
}
@@ -44,8 +44,8 @@ void gfxSleepMilliseconds(gDelay ms)
void gfxSleepMicroseconds(gDelay ms)
{
switch(ms) {
- case TIME_IMMEDIATE: return;
- case TIME_INFINITE: cyg_thread_suspend(cyg_thread_self()); return;
+ case gDelayNone: return;
+ case gDelayForever: cyg_thread_suspend(cyg_thread_self()); return;
default: cyg_thread_delay(gfxMillisecondsToTicks(ms/1000)); return;
}
}
@@ -67,8 +67,8 @@ void gfxSemDestroy(gfxSem *psem)
gBool gfxSemWait(gfxSem *psem, gDelay ms)
{
switch(ms) {
- case TIME_IMMEDIATE: return cyg_semaphore_trywait(&psem->sem);
- case TIME_INFINITE: return cyg_semaphore_wait(&psem->sem);
+ case gDelayNone: return cyg_semaphore_trywait(&psem->sem);
+ case gDelayForever: return cyg_semaphore_wait(&psem->sem);
default: return cyg_semaphore_timed_wait(&psem->sem, gfxMillisecondsToTicks(ms)+cyg_current_time());
}
}
diff --git a/src/gos/gos_ecos.h b/src/gos/gos_ecos.h
index 6f360ba1..c7f4f1df 100644
--- a/src/gos/gos_ecos.h
+++ b/src/gos/gos_ecos.h
@@ -18,8 +18,8 @@
/* Type definitions */
/*===========================================================================*/
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE 0xFFFFFFFF
+#define gDelayNone 0
+#define gDelayForever 0xFFFFFFFF
typedef cyg_ucount32 gDelay;
typedef cyg_tick_count_t gTicks;
diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h
index 68831d02..b65efdac 100644
--- a/src/gos/gos_freertos.h
+++ b/src/gos/gos_freertos.h
@@ -24,8 +24,8 @@
/* Type definitions */
/*===========================================================================*/
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE ((gDelay)-1)
+#define gDelayNone 0
+#define gDelayForever ((gDelay)-1)
typedef uint32_t gDelay;
typedef portTickType gTicks;
typedef int32_t gSemcount;
diff --git a/src/gos/gos_linux.c b/src/gos/gos_linux.c
index ca6b2576..43e85b3e 100644
--- a/src/gos/gos_linux.c
+++ b/src/gos/gos_linux.c
@@ -64,11 +64,11 @@ void gfxSleepMilliseconds(gDelay ms) {
struct timespec ts;
switch(ms) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
linuxyield();
return;
- case TIME_INFINITE:
+ case gDelayForever:
while(1)
sleep(60);
return;
@@ -85,11 +85,11 @@ void gfxSleepMicroseconds(gDelay us) {
struct timespec ts;
switch(us) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
linuxyield();
return;
- case TIME_INFINITE:
+ case gDelayForever:
while(1)
sleep(60);
return;
@@ -147,10 +147,10 @@ gThreadreturn gfxThreadWait(gfxThreadHandle thread) {
}
gBool gfxSemWait(gfxSem *pSem, gDelay ms) {
switch (ms) {
- case TIME_INFINITE:
+ case gDelayForever:
return sem_wait(&pSem->sem) ? gFalse : gTrue;
- case TIME_IMMEDIATE:
+ case gDelayNone:
return sem_trywait(&pSem->sem) ? gFalse : gTrue;
default:
@@ -189,12 +189,12 @@ gThreadreturn gfxThreadWait(gfxThreadHandle thread) {
pthread_mutex_lock(&pSem->mtx);
switch (ms) {
- case TIME_INFINITE:
+ case gDelayForever:
while (!pSem->cnt)
pthread_cond_wait(&pSem->cond, &pSem->mtx);
break;
- case TIME_IMMEDIATE:
+ case gDelayNone:
if (!pSem->cnt) {
pthread_mutex_unlock(&pSem->mtx);
return gFalse;
diff --git a/src/gos/gos_linux.h b/src/gos/gos_linux.h
index 201ee61c..1e7ff392 100644
--- a/src/gos/gos_linux.h
+++ b/src/gos/gos_linux.h
@@ -46,11 +46,11 @@ typedef pthread_mutex_t gfxMutex;
#define gfxMutexDestroy(pmtx) pthread_mutex_destroy(pmtx)
#define gfxMutexEnter(pmtx) pthread_mutex_lock(pmtx)
#define gfxMutexExit(pmtx) pthread_mutex_unlock(pmtx)
-#define gfxSemWaitI(psem) gfxSemWait(psem, TIME_IMMEDIATE)
+#define gfxSemWaitI(psem) gfxSemWait(psem, gDelayNone)
#define gfxSemSignalI(psem) gfxSemSignal(psem)
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE ((gDelay)-1)
+#define gDelayNone 0
+#define gDelayForever ((gDelay)-1)
#define MAX_SEMAPHORE_COUNT ((gSemcount)-1)
#define LOW_PRIORITY 10
#define NORMAL_PRIORITY 0
diff --git a/src/gos/gos_osx.c b/src/gos/gos_osx.c
index 5aae802f..a0676d96 100644
--- a/src/gos/gos_osx.c
+++ b/src/gos/gos_osx.c
@@ -57,8 +57,8 @@ void gfxSleepMilliseconds(gDelay ms) {
struct timespec ts;
switch(ms) {
- case TIME_IMMEDIATE: gfxYield(); return;
- case TIME_INFINITE: while(1) sleep(60); return;
+ case gDelayNone: gfxYield(); return;
+ case gDelayForever: while(1) sleep(60); return;
default:
ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms % 1000) * 1000000;
@@ -71,8 +71,8 @@ void gfxSleepMicroseconds(gDelay us) {
struct timespec ts;
switch(us) {
- case TIME_IMMEDIATE: gfxYield(); return;
- case TIME_INFINITE: while(1) sleep(60); return;
+ case gDelayNone: gfxYield(); return;
+ case gDelayForever: while(1) sleep(60); return;
default:
ts.tv_sec = us / 1000000;
ts.tv_nsec = (us % 1000000) * 1000;
@@ -135,11 +135,11 @@ void gfxSemDestroy(gfxSem *pSem) {
gBool gfxSemWait(gfxSem *pSem, gDelay ms) {
pthread_mutex_lock(&pSem->mtx);
switch (ms) {
- case TIME_INFINITE:
+ case gDelayForever:
while (!pSem->cnt)
pthread_cond_wait(&pSem->cond, &pSem->mtx);
break;
- case TIME_IMMEDIATE:
+ case gDelayNone:
if (!pSem->cnt) {
pthread_mutex_unlock(&pSem->mtx);
return gFalse;
diff --git a/src/gos/gos_osx.h b/src/gos/gos_osx.h
index 33ead2b4..3f693258 100644
--- a/src/gos/gos_osx.h
+++ b/src/gos/gos_osx.h
@@ -38,11 +38,11 @@ typedef pthread_mutex_t gfxMutex;
#define gfxMutexDestroy(pmtx) pthread_mutex_destroy(pmtx)
#define gfxMutexEnter(pmtx) pthread_mutex_lock(pmtx)
#define gfxMutexExit(pmtx) pthread_mutex_unlock(pmtx)
-#define gfxSemWaitI(psem) gfxSemWait(psem, TIME_IMMEDIATE)
+#define gfxSemWaitI(psem) gfxSemWait(psem, gDelayNone)
#define gfxSemSignalI(psem) gfxSemSignal(psem)
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE ((gDelay)-1)
+#define gDelayNone 0
+#define gDelayForever ((gDelay)-1)
#define MAX_SEMAPHORE_COUNT ((gSemcount)-1)
#define LOW_PRIORITY 10
#define NORMAL_PRIORITY 0
diff --git a/src/gos/gos_qt.h b/src/gos/gos_qt.h
index fe9c5e34..cd2dbbb4 100644
--- a/src/gos/gos_qt.h
+++ b/src/gos/gos_qt.h
@@ -14,8 +14,8 @@
#define DECLARE_THREAD_STACK(name, sz) uint8_t name[0]
#define THREAD_RETURN(retval) return retval
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE ((gDelay)-1)
+#define gDelayNone 0
+#define gDelayForever ((gDelay)-1)
#define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1))
#define LOW_PRIORITY 2
#define NORMAL_PRIORITY 3
diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c
index b39b0701..d9d31df3 100644
--- a/src/gos/gos_rawrtos.c
+++ b/src/gos/gos_rawrtos.c
@@ -70,7 +70,7 @@ gBool gfxSemWait(gfxSem* psem, gDelay ms)
gBool gfxSemWaitI(gfxSem* psem)
{
- if(raw_semaphore_get((psem), TIME_IMMEDIATE)==RAW_SUCCESS)
+ if(raw_semaphore_get((psem), RAW_NO_WAIT)==RAW_SUCCESS)
return gTrue;
return gFalse;
}
diff --git a/src/gos/gos_rawrtos.h b/src/gos/gos_rawrtos.h
index 355c766f..1fb20f90 100644
--- a/src/gos/gos_rawrtos.h
+++ b/src/gos/gos_rawrtos.h
@@ -5,8 +5,8 @@
#include "raw_api.h"
-#define TIME_IMMEDIATE (RAW_NO_WAIT)
-#define TIME_INFINITE (RAW_WAIT_FOREVER)
+#define gDelayNone (RAW_NO_WAIT)
+#define gDelayForever (RAW_WAIT_FOREVER)
typedef uint32_t gDelay;
typedef RAW_TICK_TYPE gTicks;
typedef int32_t gSemcount;
@@ -38,7 +38,7 @@ typedef RAW_TASK_OBJ* gfxThreadHandle;
#define gfxSystemUnlock() {}
#define gfxMutexInit(pmutex) raw_mutex_create(pmutex, (RAW_U8 *)"", RAW_MUTEX_INHERIT_POLICY, 3)
#define gfxMutexDestroy(pmutex) raw_mutex_delete(pmutex)
-#define gfxMutexEnter(pmutex) raw_mutex_get(pmutex, TIME_INFINITE)
+#define gfxMutexEnter(pmutex) raw_mutex_get(pmutex, gDelayForever)
#define gfxMutexExit(pmutex) raw_mutex_put(pmutex)
#define gfxSemInit(psem, val, limit) raw_semaphore_create(psem, "", val)
#define gfxSemDestroy(psem) raw_semaphore_delete(psem)
diff --git a/src/gos/gos_win32.c b/src/gos/gos_win32.c
index c2511dfa..8e822c9e 100644
--- a/src/gos/gos_win32.c
+++ b/src/gos/gos_win32.c
@@ -43,10 +43,10 @@ void gfxSleepMicroseconds(gDelay ms) {
LARGE_INTEGER t1, t2, tdiff;
switch(ms) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
return;
- case TIME_INFINITE:
+ case gDelayForever:
while(1)
Sleep(1000);
return;
diff --git a/src/gos/gos_win32.h b/src/gos/gos_win32.h
index 10412119..c4033f5c 100644
--- a/src/gos/gos_win32.h
+++ b/src/gos/gos_win32.h
@@ -35,8 +35,8 @@ typedef int gThreadpriority;
#define DECLARE_THREAD_STACK(name, sz) uint8_t name[1];
#define THREAD_RETURN(retval) return retval
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE INFINITE
+#define gDelayNone 0
+#define gDelayForever INFINITE
#define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1))
#define LOW_PRIORITY THREAD_PRIORITY_BELOW_NORMAL
#define NORMAL_PRIORITY THREAD_PRIORITY_NORMAL
@@ -60,7 +60,7 @@ typedef HANDLE gfxThreadHandle;
#define gfxMutexExit(pmutex) ReleaseMutex(*(pmutex))
#define gfxSemInit(psem, val, limit) *(psem) = CreateSemaphore(0, val, limit, 0)
#define gfxSemDestroy(psem) CloseHandle(*(psem))
-#define gfxSemWaitI(psem) gfxSemWait((psem), TIME_IMMEDIATE)
+#define gfxSemWaitI(psem) gfxSemWait((psem), gDelayNone)
#define gfxSemSignal(psem) ReleaseSemaphore(*(psem), 1, 0)
#define gfxSemSignalI(psem) ReleaseSemaphore(*(psem), 1, 0)
#define gfxThreadMe() GetCurrentThread()
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c
index a4a3eb31..5b81b25a 100644
--- a/src/gos/gos_x_threads.c
+++ b/src/gos/gos_x_threads.c
@@ -56,11 +56,11 @@ gBool gfxSemWait(gfxSem *psem, gDelay ms) {
// Convert our delay to ticks
starttm = 0;
switch (ms) {
- case TIME_IMMEDIATE:
- delay = TIME_IMMEDIATE;
+ case gDelayNone:
+ delay = gDelayNone;
break;
- case TIME_INFINITE:
- delay = TIME_INFINITE;
+ case gDelayForever:
+ delay = gDelayForever;
break;
default:
delay = gfxMillisecondsToTicks(ms);
@@ -73,9 +73,9 @@ gBool gfxSemWait(gfxSem *psem, gDelay ms) {
INTERRUPTS_ON();
// Check if we have exceeded the defined delay
switch (delay) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
return gFalse;
- case TIME_INFINITE:
+ case gDelayForever:
break;
default:
if (gfxSystemTicks() - starttm >= delay)
@@ -117,9 +117,9 @@ void gfxSleepMilliseconds(gDelay ms) {
// Safety first
switch (ms) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
return;
- case TIME_INFINITE:
+ case gDelayForever:
while(1)
gfxYield();
return;
@@ -139,9 +139,9 @@ void gfxSleepMicroseconds(gDelay ms) {
// Safety first
switch (ms) {
- case TIME_IMMEDIATE:
+ case gDelayNone:
return;
- case TIME_INFINITE:
+ case gDelayForever:
while(1)
gfxYield();
return;
diff --git a/src/gos/gos_x_threads.h b/src/gos/gos_x_threads.h
index 69b586c6..a1ba67a1 100644
--- a/src/gos/gos_x_threads.h
+++ b/src/gos/gos_x_threads.h
@@ -34,8 +34,8 @@ typedef int gThreadpriority;
#define DECLARE_THREAD_STACK(name, sz) uint8_t name[(sz) & ~3];
#define THREAD_RETURN(retval) return retval
-#define TIME_IMMEDIATE 0
-#define TIME_INFINITE ((gDelay)-1)
+#define gDelayNone 0
+#define gDelayForever ((gDelay)-1)
#define MAX_SEMAPHORE_COUNT 0x7FFF
#define LOW_PRIORITY 0
#define NORMAL_PRIORITY 1
diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h
index 1bfccf8b..662a0c82 100644
--- a/src/gos/gos_zephyr.h
+++ b/src/gos/gos_zephyr.h
@@ -30,8 +30,8 @@ typedef int gThreadpriority;
#define THREAD_RETURN(retval) return
-#define TIME_IMMEDIATE K_NO_WAIT
-#define TIME_INFINITE K_FOREVER
+#define gDelayNone K_NO_WAIT
+#define gDelayForever K_FOREVER
#define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1))
#define LOW_PRIORITY CONFIG_NUM_PREEMPT_PRIORITIES-1
#define NORMAL_PRIORITY 1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:48:01 +0000