diff --git a/changelog.txt b/changelog.txt index 97c7cea1..ed180ff3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -19,7 +19,7 @@ CHANGE: Added type gBool to replace V2.x bool_t, and values gT CHANGE: Added type gDelay to replace V2.x delaytime_t and values gDelayNone/gDelayForever to replace TIME_IMMEDIATE/TIME_INFINITE CHANGE: Added type gTicks to replace V2.x systemticks_t CHANGE: Added type gThreadreturn to replace V2.x threadreturn_t -CHANGE: Added type gThreadpriority to replace V2.x threadpriority_t +CHANGE: Added type gThreadpriority to replace V2.x threadpriority_t and values gThreadpriorityLow/Normal/High to replace LOW_/NORMAL_/HIGH_PRIORITY CHANGE: Added type gPoint to replace V2.x point and point_t CHANGE: Added type gCoord to replace V2.x coord_t CHANGE: Added type gPixel to replace V2.x pixel_t diff --git a/demos/3rdparty/notepad-2/notepadApp.h b/demos/3rdparty/notepad-2/notepadApp.h index 04405223..661aaaf2 100644 --- a/demos/3rdparty/notepad-2/notepadApp.h +++ b/demos/3rdparty/notepad-2/notepadApp.h @@ -38,7 +38,7 @@ #include "notepadCore.h" #include "notepadUIDefines.h" -#define NPAD_THD_PRIO NORMAL_PRIORITY +#define NPAD_THD_PRIO gThreadpriorityNormal #define NPAD_THD_WA_SIZE 512 void nSetColorScheme(NColorScheme sch); diff --git a/demos/3rdparty/notepad-2/notepadCore.h b/demos/3rdparty/notepad-2/notepadCore.h index dc75be3e..e4b78cdc 100644 --- a/demos/3rdparty/notepad-2/notepadCore.h +++ b/demos/3rdparty/notepad-2/notepadCore.h @@ -37,7 +37,7 @@ /* Configuration */ #define NCORE_THD_STACK_SIZE 256 -#define NCORE_THD_PRIO NORMAL_PRIORITY +#define NCORE_THD_PRIO gThreadpriorityNormal #define NCORE_MODE_DRAW 0 #define NCORE_MODE_ERASE 1 diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c index 1ca82d00..12f95f61 100644 --- a/demos/applications/combo/bounce.c +++ b/demos/applications/combo/bounce.c @@ -153,7 +153,7 @@ void doBounce(GHandle parent, gBool start) { if (start) { run = gTrue; gh = parent; - thread = gfxThreadCreate(0, 0x200, LOW_PRIORITY, task, 0); + thread = gfxThreadCreate(0, 0x200, gThreadpriorityLow, task, 0); } else if (run) { run = gFalse; gfxThreadWait(thread); diff --git a/demos/applications/combo/mandelbrot.c b/demos/applications/combo/mandelbrot.c index 8033957c..866131e3 100644 --- a/demos/applications/combo/mandelbrot.c +++ b/demos/applications/combo/mandelbrot.c @@ -89,7 +89,7 @@ void doMandlebrot(GHandle parent, gBool start) { if (start) { run = gTrue; gh = parent; - thread = gfxThreadCreate(0, 0x400, LOW_PRIORITY, task, 0); + thread = gfxThreadCreate(0, 0x400, gThreadpriorityLow, task, 0); } else if (run) { run = gFalse; gfxThreadWait(thread); diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c index d824ca06..d6ec0e2e 100644 --- a/demos/games/justget10/jg10.c +++ b/demos/games/justget10/jg10.c @@ -460,7 +460,7 @@ void jg10Start(void) { #endif initField(); guiCreate(); - gfxThreadCreate(0, 1024, NORMAL_PRIORITY, thdJg10, 0); + gfxThreadCreate(0, 1024, gThreadpriorityNormal, thdJg10, 0); while (!jg10GameOver) { gfxSleepMilliseconds(100); } diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c index 19d8c373..5a0b4c41 100644 --- a/demos/games/minesweeper/mines.c +++ b/demos/games/minesweeper/mines.c @@ -382,7 +382,7 @@ void minesStart(void) #endif initField(); - gfxThreadCreate(0, 1024, NORMAL_PRIORITY, thdMines, 0); + gfxThreadCreate(0, 1024, gThreadpriorityNormal, thdMines, 0); while (!minesGameOver) { gfxSleepMilliseconds(100); } diff --git a/demos/games/tetris/tetris.c b/demos/games/tetris/tetris.c index ad8debd7..cd4cc315 100644 --- a/demos/games/tetris/tetris.c +++ b/demos/games/tetris/tetris.c @@ -498,7 +498,7 @@ void tetrisStart(void) { tetrisGameOver = gFalse; printGameOver(); // removes "Game Over!" if tetrisGameOver == gFalse tetrisPreviousGameTime = gfxSystemTicks(); - gfxThreadCreate(0, 1024, NORMAL_PRIORITY, thdTetris, 0); + gfxThreadCreate(0, 1024, gThreadpriorityNormal, thdTetris, 0); while (!tetrisGameOver) { gfxSleepMilliseconds(1000); } diff --git a/demos/modules/gos/threads/main.c b/demos/modules/gos/threads/main.c index 4ef81411..1caef39b 100644 --- a/demos/modules/gos/threads/main.c +++ b/demos/modules/gos/threads/main.c @@ -51,8 +51,8 @@ int main(void) gfxInit(); // Give this plenty of stack. Stack size optimisation should be a production change only - gfxThreadCreate(0, 2048, NORMAL_PRIORITY, heartbeat1, 0); - gfxThreadCreate(0, 2048, NORMAL_PRIORITY, heartbeat2, 0); + gfxThreadCreate(0, 2048, gThreadpriorityNormal, heartbeat1, 0); + gfxThreadCreate(0, 2048, gThreadpriorityNormal, heartbeat2, 0); while (1) { DEBUGWRITE("thread main\n"); diff --git a/demos/modules/gos/threads_advanced/main.c b/demos/modules/gos/threads_advanced/main.c index 0ae8649c..dd4332ed 100644 --- a/demos/modules/gos/threads_advanced/main.c +++ b/demos/modules/gos/threads_advanced/main.c @@ -107,7 +107,7 @@ int main(void) /* Create a static thread from the default heap with normal priority. * We pass a the parameter to the thread which tells the thread whether to return or not */ - thd = gfxThreadCreate(NULL, 2048, NORMAL_PRIORITY, Thread_function, (void*)&exitThread); + thd = gfxThreadCreate(NULL, 2048, gThreadpriorityNormal, Thread_function, (void*)&exitThread); /* Start the timer. The callback function will be called once after 2000ms * We will pass the thread handle as a parameter so the timer can ask the thread to terminate diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c index dc396cfb..b24c40ba 100644 --- a/demos/tools/uGFXnetDisplay/main.c +++ b/demos/tools/uGFXnetDisplay/main.c @@ -81,7 +81,7 @@ #define StartSockets() Start_LWIP(); #else #include "lwipthread.h" - #define StartSockets() gfxThreadClose(gfxThreadCreate(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, NORMAL_PRIORITY, lwip_thread, 0)) + #define StartSockets() gfxThreadClose(gfxThreadCreate(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, gThreadpriorityNormal, lwip_thread, 0)) #endif #if !LWIP_SOCKET @@ -358,7 +358,7 @@ int main(proto_args) { #if GFX_USE_GINPUT && GINPUT_NEED_MOUSE // Start the mouse thread if needed if (cmd[3]) - gfxThreadClose(gfxThreadCreate(waNetThread, sizeof(waNetThread), HIGH_PRIORITY, NetThread, 0)); + gfxThreadClose(gfxThreadCreate(waNetThread, sizeof(waNetThread), gThreadpriorityHigh, NetThread, 0)); #endif // Process incoming instructions diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index 7e5c85f9..6282f62a 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -330,7 +330,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif fprintf(stderr, "Running GFX Window in %d bit color\n", vis.depth); - if (!(hth = gfxThreadCreate(waXThread, sizeof(waXThread), HIGH_PRIORITY, ThreadX, 0))) { + if (!(hth = gfxThreadCreate(waXThread, sizeof(waXThread), gThreadpriorityHigh, ThreadX, 0))) { fprintf(stderr, "Cannot start X Thread\n"); XCloseDisplay(dis); exit(0); diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index d1f78fac..92e746a7 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -124,7 +124,7 @@ #define StartSockets() Start_LWIP(); #else #include "lwipthread.h" - #define StartSockets() gfxThreadClose(gfxThreadCreate(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, NORMAL_PRIORITY, lwip_thread, 0)) + #define StartSockets() gfxThreadClose(gfxThreadCreate(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, gThreadpriorityNormal, lwip_thread, 0)) #endif #if !LWIP_SOCKET @@ -435,7 +435,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // Initialise the receiver thread (if it hasn't been done already) if (!hThread) { MUTEX_INIT; - hThread = gfxThreadCreate(waNetThread, sizeof(waNetThread), HIGH_PRIORITY, NetThread, 0); + hThread = gfxThreadCreate(waNetThread, sizeof(waNetThread), gThreadpriorityHigh, NetThread, 0); gfxThreadClose(hThread); } diff --git a/gfxconf.example.h b/gfxconf.example.h index c5def9dd..38c68073 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -264,7 +264,7 @@ /////////////////////////////////////////////////////////////////////////// //#define GFX_USE_GTIMER GFXOFF -//#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY +//#define GTIMER_THREAD_PRIORITY gThreadpriorityHigh //#define GTIMER_THREAD_WORKAREA_SIZE 2048 diff --git a/src/gos/gos.h b/src/gos/gos.h index e8684d6f..67ef0ddd 100644 --- a/src/gos/gos.h +++ b/src/gos/gos.h @@ -99,12 +99,12 @@ * @note Your platform may use slightly different definitions to these * @{ */ - #define gDelayNone 0 + #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 - #define HIGH_PRIORITY 2 + #define gThreadpriorityLow 0 + #define gThreadpriorityNormal 1 + #define gThreadpriorityHigh 2 /** @} */ /** @@ -495,14 +495,17 @@ #if GFX_COMPAT_V2 typedef gDelay delaytime_t; + #if !GFX_USE_OS_CHIBIOS + // These values are defined by ChibiOS itself + #define TIME_IMMEDIATE gDelayNone + #define TIME_INFINITE gDelayForever + #endif 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 + #define LOW_PRIORITY gThreadpriorityLow + #define NORMAL_PRIORITY gThreadpriorityNormal + #define HIGH_PRIORITY gThreadpriorityHigh #endif #endif /* _GOS_H */ diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h index 450603c7..f9a85a88 100644 --- a/src/gos/gos_chibios.h +++ b/src/gos/gos_chibios.h @@ -39,9 +39,9 @@ typedef msg_t gThreadreturn; typedef tprio_t gThreadpriority; #define MAX_SEMAPHORE_COUNT ((gSemcount)(((unsigned long)((gSemcount)(-1))) >> 1)) -#define LOW_PRIORITY LOWPRIO -#define NORMAL_PRIORITY NORMALPRIO -#define HIGH_PRIORITY HIGHPRIO +#define gThreadpriorityLow LOWPRIO +#define gThreadpriorityNormal NORMALPRIO +#define gThreadpriorityHigh HIGHPRIO #define DECLARE_THREAD_STACK(name, sz) WORKING_AREA(name, sz) #define DECLARE_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(void *param) diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h index 0f2d66f5..a5d9c474 100644 --- a/src/gos/gos_cmsis.h +++ b/src/gos/gos_cmsis.h @@ -34,9 +34,9 @@ typedef void gThreadreturn; typedef osPriority gThreadpriority; #define MAX_SEMAPHORE_COUNT osFeature_Semaphore -#define LOW_PRIORITY osPriorityLow -#define NORMAL_PRIORITY osPriorityNormal -#define HIGH_PRIORITY osPriorityHigh +#define gThreadpriorityLow osPriorityLow +#define gThreadpriorityNormal osPriorityNormal +#define gThreadpriorityHigh osPriorityHigh typedef struct gfxSem { uint32_t semaphore[2]; diff --git a/src/gos/gos_cmsis2.c b/src/gos/gos_cmsis2.c index 31c79164..affc7a37 100644 --- a/src/gos/gos_cmsis2.c +++ b/src/gos/gos_cmsis2.c @@ -44,12 +44,12 @@ void _gosPostInit(void) osKernelInitialize(); /* Fall Through */ case osKernelReady: - gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, NORMAL_PRIORITY, startUGFX_CMSIS2, 0); + gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, gThreadpriorityNormal, startUGFX_CMSIS2, 0); osKernelStart(); gfxHalt("Unable to start CMSIS V2 scheduler. Out of memory?"); break; default: - gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, NORMAL_PRIORITY, startUGFX_CMSIS2, 0); + gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, gThreadpriorityNormal, startUGFX_CMSIS2, 0); break; } #endif diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index 49c6cee2..7ff69cff 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -34,9 +34,9 @@ typedef void gThreadreturn; typedef osPriority_t gThreadpriority; #define MAX_SEMAPHORE_COUNT 65535UL -#define LOW_PRIORITY osPriorityLow -#define NORMAL_PRIORITY osPriorityNormal -#define HIGH_PRIORITY osPriorityHigh +#define gThreadpriorityLow osPriorityLow +#define gThreadpriorityNormal osPriorityNormal +#define gThreadpriorityHigh osPriorityHigh typedef osSemaphoreId_t gfxSem; diff --git a/src/gos/gos_ecos.h b/src/gos/gos_ecos.h index c7f4f1df..1ab7d42c 100644 --- a/src/gos/gos_ecos.h +++ b/src/gos/gos_ecos.h @@ -29,9 +29,9 @@ typedef cyg_addrword_t gThreadpriority; typedef cyg_handle_t gfxThreadHandle; #define MAX_SEMAPHORE_COUNT 0x7FFFFFFF -#define LOW_PRIORITY (CYGNUM_KERNEL_SCHED_PRIORITIES-2) -#define NORMAL_PRIORITY (CYGNUM_KERNEL_SCHED_PRIORITIES/2) -#define HIGH_PRIORITY 0 +#define gThreadpriorityLow (CYGNUM_KERNEL_SCHED_PRIORITIES-2) +#define gThreadpriorityNormal (CYGNUM_KERNEL_SCHED_PRIORITIES/2) +#define gThreadpriorityHigh 0 #define DECLARE_THREAD_STACK(name, sz) struct { cyg_thread t; unsigned char stk[(sz) & ~3]; } name[1] #define DECLARE_THREAD_FUNCTION(fnName, param) gThreadreturn fnName(cyg_addrword_t param) diff --git a/src/gos/gos_freertos.c b/src/gos/gos_freertos.c index d4aa0462..7152997f 100644 --- a/src/gos/gos_freertos.c +++ b/src/gos/gos_freertos.c @@ -52,7 +52,7 @@ void _gosPostInit(void) { #if !GFX_OS_NO_INIT && GFX_OS_CALL_UGFXMAIN if (xTaskGetSchedulerState() == taskSCHEDULER_NOT_STARTED) { - gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, NORMAL_PRIORITY, startUGFX_FreeRTOS, 0); + gfxThreadCreate(0, GFX_OS_UGFXMAIN_STACKSIZE, gThreadpriorityNormal, startUGFX_FreeRTOS, 0); vTaskStartScheduler(); gfxHalt("Unable to start FreeRTOS scheduler. Out of memory?"); } diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h index b65efdac..90c5af4c 100644 --- a/src/gos/gos_freertos.h +++ b/src/gos/gos_freertos.h @@ -33,9 +33,9 @@ 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 +#define gThreadpriorityLow 0 +#define gThreadpriorityNormal configMAX_PRIORITIES/2 +#define gThreadpriorityHigh configMAX_PRIORITIES-1 /* FreeRTOS will allocate the stack when creating the thread */ #define DECLARE_THREAD_STACK(name, sz) uint8_t name[1] diff --git a/src/gos/gos_linux.h b/src/gos/gos_linux.h index 1e7ff392..a2a09262 100644 --- a/src/gos/gos_linux.h +++ b/src/gos/gos_linux.h @@ -52,9 +52,9 @@ typedef pthread_mutex_t gfxMutex; #define gDelayNone 0 #define gDelayForever ((gDelay)-1) #define MAX_SEMAPHORE_COUNT ((gSemcount)-1) -#define LOW_PRIORITY 10 -#define NORMAL_PRIORITY 0 -#define HIGH_PRIORITY -10 +#define gThreadpriorityLow 10 +#define gThreadpriorityNormal 0 +#define gThreadpriorityHigh -10 #if GFX_USE_POSIX_SEMAPHORES typedef struct gfxSem { diff --git a/src/gos/gos_osx.h b/src/gos/gos_osx.h index 3f693258..5dcc63f3 100644 --- a/src/gos/gos_osx.h +++ b/src/gos/gos_osx.h @@ -44,9 +44,9 @@ typedef pthread_mutex_t gfxMutex; #define gDelayNone 0 #define gDelayForever ((gDelay)-1) #define MAX_SEMAPHORE_COUNT ((gSemcount)-1) -#define LOW_PRIORITY 10 -#define NORMAL_PRIORITY 0 -#define HIGH_PRIORITY -10 +#define gThreadpriorityLow 10 +#define gThreadpriorityNormal 0 +#define gThreadpriorityHigh -10 typedef struct gfxSem { pthread_mutex_t mtx; diff --git a/src/gos/gos_qt.h b/src/gos/gos_qt.h index cd2dbbb4..5338808e 100644 --- a/src/gos/gos_qt.h +++ b/src/gos/gos_qt.h @@ -17,9 +17,9 @@ #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 -#define HIGH_PRIORITY 4 +#define gThreadpriorityLow 2 +#define gThreadpriorityNormal 3 +#define gThreadpriorityHigh 4 typedef int gTicks; typedef int gDelay; diff --git a/src/gos/gos_rawrtos.h b/src/gos/gos_rawrtos.h index 1fb20f90..c04a543b 100644 --- a/src/gos/gos_rawrtos.h +++ b/src/gos/gos_rawrtos.h @@ -14,9 +14,9 @@ typedef uint32_t gThreadreturn; typedef RAW_U8 gThreadpriority; #define MAX_SEMAPHORE_COUNT RAW_SEMAPHORE_COUNT -#define LOW_PRIORITY (CONFIG_RAW_PRIO_MAX-2) -#define NORMAL_PRIORITY (CONFIG_RAW_PRIO_MAX/2) -#define HIGH_PRIORITY 1 +#define gThreadpriorityLow (CONFIG_RAW_PRIO_MAX-2) +#define gThreadpriorityNormal (CONFIG_RAW_PRIO_MAX/2) +#define gThreadpriorityHigh 1 typedef RAW_SEMAPHORE gfxSem; typedef RAW_MUTEX gfxMutex; diff --git a/src/gos/gos_win32.h b/src/gos/gos_win32.h index c4033f5c..ce2a4c10 100644 --- a/src/gos/gos_win32.h +++ b/src/gos/gos_win32.h @@ -38,9 +38,9 @@ typedef int gThreadpriority; #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 -#define HIGH_PRIORITY THREAD_PRIORITY_ABOVE_NORMAL +#define gThreadpriorityLow THREAD_PRIORITY_BELOW_NORMAL +#define gThreadpriorityNormal THREAD_PRIORITY_NORMAL +#define gThreadpriorityHigh THREAD_PRIORITY_ABOVE_NORMAL typedef HANDLE gfxSem; typedef HANDLE gfxMutex; diff --git a/src/gos/gos_x_threads.h b/src/gos/gos_x_threads.h index a1ba67a1..7b7509c4 100644 --- a/src/gos/gos_x_threads.h +++ b/src/gos/gos_x_threads.h @@ -37,9 +37,9 @@ typedef int gThreadpriority; #define gDelayNone 0 #define gDelayForever ((gDelay)-1) #define MAX_SEMAPHORE_COUNT 0x7FFF -#define LOW_PRIORITY 0 -#define NORMAL_PRIORITY 1 -#define HIGH_PRIORITY 2 +#define gThreadpriorityLow 0 +#define gThreadpriorityNormal 1 +#define gThreadpriorityHigh 2 typedef struct { gSemcount cnt; diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h index 662a0c82..ce57e131 100644 --- a/src/gos/gos_zephyr.h +++ b/src/gos/gos_zephyr.h @@ -33,9 +33,9 @@ typedef int gThreadpriority; #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 -#define HIGH_PRIORITY 0 +#define gThreadpriorityLow CONFIG_NUM_PREEMPT_PRIORITIES-1 +#define gThreadpriorityNormal 1 +#define gThreadpriorityHigh 0 typedef struct k_sem gfxSem; diff --git a/src/gtimer/gtimer_options.h b/src/gtimer/gtimer_options.h index dc0c6141..d3fd5f0d 100644 --- a/src/gtimer/gtimer_options.h +++ b/src/gtimer/gtimer_options.h @@ -28,10 +28,10 @@ */ /** * @brief Defines the GTIMER thread priority - * @details Defaults to HIGH_PRIORITY + * @details Defaults to gThreadpriorityHigh */ #ifndef GTIMER_THREAD_PRIORITY - #define GTIMER_THREAD_PRIORITY HIGH_PRIORITY + #define GTIMER_THREAD_PRIORITY gThreadpriorityHigh #endif /** * @brief Defines the size of the timer threads work area (stack+structures).