diff options
Diffstat (limited to 'src/gos/gos_cmsis.h')
| -rw-r--r-- | src/gos/gos_cmsis.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h index aad4cb84..72b59ce9 100644 --- a/src/gos/gos_cmsis.h +++ b/src/gos/gos_cmsis.h @@ -15,7 +15,6 @@ #if GFX_USE_OS_CMSIS -#include <stdbool.h> #include "cmsis_os.h" #ifndef GFX_OS_HEAP_SIZE @@ -26,8 +25,6 @@ /* Type definitions */ /*===========================================================================*/ -typedef bool bool_t; - #define TIME_IMMEDIATE 0 #define TIME_INFINITE osWaitForever typedef uint32_t delaytime_t; @@ -62,10 +59,6 @@ typedef osThreadId gfxThreadHandle; /* Function declarations. */ /*===========================================================================*/ -#ifdef __cplusplus -extern "C" { -#endif - #define gfxExit() os_error(0) #define gfxHalt(msg) os_error(1) #define gfxSystemTicks() osKernelSysTick() @@ -81,8 +74,8 @@ void gfxMutexInit(gfxMutex* pmutex); void gfxSemInit(gfxSem* psem, semcount_t val, semcount_t limit); void gfxSemDestroy(gfxSem* psem); -bool_t gfxSemWait(gfxSem* psem, delaytime_t ms); -bool_t gfxSemWaitI(gfxSem* psem); +gBool gfxSemWait(gfxSem* psem, delaytime_t ms); +gBool gfxSemWaitI(gfxSem* psem); void gfxSemSignal(gfxSem* psem); void gfxSemSignalI(gfxSem* psem); @@ -91,10 +84,6 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ #define gfxThreadMe() osThreadGetId() #define gfxThreadClose(thread) {} -#ifdef __cplusplus -} -#endif - /*===========================================================================*/ /* Use the generic heap handling */ /*===========================================================================*/ |