aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-08-16 17:21:01 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-08-16 17:21:01 +0200
commit28a2d8ca791b8bc74e52a26773ab3863bc37f145 (patch)
tree4101b9dbb5166df2926f5a87967970856aeb9599 /src
parent83b29284aa56691f4dc158defa57c58035eec814 (diff)
downloaduGFX-28a2d8ca791b8bc74e52a26773ab3863bc37f145.tar.gz
uGFX-28a2d8ca791b8bc74e52a26773ab3863bc37f145.tar.bz2
uGFX-28a2d8ca791b8bc74e52a26773ab3863bc37f145.zip
Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
Diffstat (limited to 'src')
-rw-r--r--src/gos/gos_chibios.c2
-rw-r--r--src/gos/gos_ecos.c4
-rw-r--r--src/gos/gos_freertos.c4
-rw-r--r--src/gos/gos_options.h4
-rw-r--r--src/gos/gos_rawrtos.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/gos/gos_chibios.c b/src/gos/gos_chibios.c
index 4c79bd3d..eb839dc6 100644
--- a/src/gos/gos_chibios.c
+++ b/src/gos/gos_chibios.c
@@ -35,7 +35,7 @@
void _gosInit(void)
{
- #if !GFX_NO_OS_INIT
+ #if !GFX_OS_NO_INIT
/* Don't Initialize if the user already has */
#if CH_KERNEL_MAJOR == 2
if (!chThdSelf()) {
diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c
index cdad86da..b3476b22 100644
--- a/src/gos/gos_ecos.c
+++ b/src/gos/gos_ecos.c
@@ -11,8 +11,8 @@
void _gosInit(void)
{
- #if !GFX_NO_OS_INIT
- #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+ #if !GFX_OS_NO_INIT
+ #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif
#if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call cyg_scheduler_start() before gfxInit() in your application!"
diff --git a/src/gos/gos_freertos.c b/src/gos/gos_freertos.c
index 7b978738..227caf31 100644
--- a/src/gos/gos_freertos.c
+++ b/src/gos/gos_freertos.c
@@ -24,8 +24,8 @@
void _gosInit(void)
{
- #if !GFX_NO_OS_INIT
- #error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+ #if !GFX_OS_NO_INIT
+ #error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif
#if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call vTaskStartScheduler() before gfxInit() in your application!"
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h
index 600c3085..c80a9f39 100644
--- a/src/gos/gos_options.h
+++ b/src/gos/gos_options.h
@@ -128,8 +128,8 @@
* system in your application code. Note that on these operating systems the
* demo applications will not work without modification.
*/
- #ifndef GFX_NO_OS_INIT
- #define GFX_NO_OS_INIT FALSE
+ #ifndef GFX_OS_NO_INIT
+ #define GFX_OS_NO_INIT FALSE
#endif
/**
* @brief Turn off warnings about initializing the operating system
diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c
index 8efe2235..a33c49b3 100644
--- a/src/gos/gos_rawrtos.c
+++ b/src/gos/gos_rawrtos.c
@@ -24,8 +24,8 @@
void _gosInit(void)
{
- #if !GFX_NO_OS_INIT
- #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h"
+ #if !GFX_OS_NO_INIT
+ #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif
#if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call raw_os_start() before gfxInit() in your application!"