diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-13 21:43:17 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-13 21:43:17 +0200 |
| commit | 1f8b5efc21a029e8fae647fde31d703cf0d1be23 (patch) | |
| tree | af5bc0a63a5a6290974b7833ab1326e0aed1b163 /src/gos/gos_keil.h | |
| parent | 9d3fc8b36cb57fa23c0b838a54a8bc67328f9672 (diff) | |
| download | uGFX-1f8b5efc21a029e8fae647fde31d703cf0d1be23.tar.gz uGFX-1f8b5efc21a029e8fae647fde31d703cf0d1be23.tar.bz2 uGFX-1f8b5efc21a029e8fae647fde31d703cf0d1be23.zip | |
Fixing Keil RTOX port. Now compiling (untested)
Diffstat (limited to 'src/gos/gos_keil.h')
| -rw-r--r-- | src/gos/gos_keil.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/gos/gos_keil.h b/src/gos/gos_keil.h index df2db720..f966b956 100644 --- a/src/gos/gos_keil.h +++ b/src/gos/gos_keil.h @@ -15,6 +15,8 @@ #if GFX_USE_OS_KEIL +#include "cmsis_os.h" + #ifndef GFX_OS_HEAP_SIZE #define GFX_OS_HEAP_SIZE 10240 #endif @@ -23,6 +25,8 @@ /* Type definitions */ /*===========================================================================*/ +typedef uint8_t bool_t; + #define TIME_IMMEDIATE 0 #define TIME_INFINITE osWaitForever typedef uint32_t delaytime_t; @@ -37,14 +41,14 @@ typedef osPriority threadpriority_t; #define HIGH_PRIORITY osPriorityHigh typedef struct gfxSem { - osSemaphoreId id; - osSemaphoreDef(id); - } gfxSem; + osSemaphoreDef_t def; + osSemaphoreId id; +} gfxSem; typedef struct gfxMutex { - osMutexId id; - osMutexDef(id); - } gfxMutex; + osMutexDef_t def; + osMutexId id; +} gfxMutex; typedef osThreadId gfxThreadHandle; @@ -89,10 +93,10 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ #endif /*===========================================================================*/ -/* Use the generic thread handling and heap handling */ +/* Use the generic heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_HEAP TRUE #include "gos_x_heap.h" #endif /* GFX_USE_OS_KEIL */ |