diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
| commit | 00aeab86eb311f57d026931499ae5935c00857b1 (patch) | |
| tree | 44fe653eabd0362e2f97fbafdbdf96ffb4de08d2 /src/gos | |
| parent | 29251f33bd106cfdc317fa00c10ecfb3a64fcc2d (diff) | |
| parent | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (diff) | |
| download | uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.gz uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.bz2 uGFX-00aeab86eb311f57d026931499ae5935c00857b1.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'src/gos')
| -rw-r--r-- | src/gos/gos.h | 6 | ||||
| -rw-r--r-- | src/gos/gos_freertos.h | 1 | ||||
| -rw-r--r-- | src/gos/gos_osx.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/gos/gos.h b/src/gos/gos.h index af9486f8..048d5765 100644 --- a/src/gos/gos.h +++ b/src/gos/gos.h @@ -77,7 +77,7 @@ * * @param[in] reval The value which should be returned */ - #define THREAD_RETURN(retval); + #define THREAD_RETURN(retval) return retval /** * @name Various platform (and operating system) constants @@ -474,10 +474,6 @@ #include "src/gos/gos_ecos.h" #elif GFX_USE_OS_ARDUINO #include "src/gos/gos_arduino.h" -#elif GFX_USE_OS_CMSIS - #include "src/gos/gos_cmsis.h" -#elif GFX_USE_OS_KEIL - #include "src/gos/gos_keil.h" #else #error "Your operating system is not supported yet" #endif diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h index 574e13ae..9b3d1023 100644 --- a/src/gos/gos_freertos.h +++ b/src/gos/gos_freertos.h @@ -63,6 +63,7 @@ typedef portBASE_TYPE threadpriority_t; #define DECLARE_THREAD_STACK(name, sz) size_t *name = (size_t *)sz #define DECLARE_THREAD_FUNCTION(fnName, param) threadreturn_t fnName(void *param) #define THREAD_RETURN(retval) + portTickType MS2ST(portTickType ms); typedef struct { diff --git a/src/gos/gos_osx.h b/src/gos/gos_osx.h index e5764b81..44853937 100644 --- a/src/gos/gos_osx.h +++ b/src/gos/gos_osx.h @@ -27,7 +27,7 @@ typedef pthread_mutex_t gfxMutex; #define DECLARE_THREAD_FUNCTION(fnName, param) threadreturn_t fnName(void *param) #define DECLARE_THREAD_STACK(name, sz) uint8_t name[0]; -#define THREAD_RETURN(retval) return reval +#define THREAD_RETURN(retval) return retval #define gfxExit() exit(0) #define gfxAlloc(sz) malloc(sz) |