From 14786e97b618b8bc2a0ff1c732d45288fe550e33 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Feb 2018 10:01:50 +0100 Subject: Fixing issue in RTX5/CMSIS2 port --- src/gos/gos_cmsis2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gos') diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index 8a54491b..bd8c9042 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -61,7 +61,7 @@ extern "C" { #define gfxExit() os_error(0) #define gfxHalt(msg) os_error(1) -#define gfxSystemTicks() osKernelGetSysTimerCount() +#define gfxSystemTicks() osKernelGetTickCount() #define gfxMillisecondsToTicks(ms) (1000*(ms)/osKernelGetTickFreq()) #define gfxSystemLock() osKernelLock() #define gfxSystemUnlock() osKernelUnlock() -- cgit v1.2.3 From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 27 Feb 2018 17:44:21 +1000 Subject: First set of V3 macro changes --- src/gos/gos.h | 4 +- src/gos/gos_arduino.h | 4 +- src/gos/gos_chibios.h | 17 ++++---- src/gos/gos_cmsis.h | 2 +- src/gos/gos_cmsis2.h | 2 +- src/gos/gos_ecos.c | 2 +- src/gos/gos_ecos.h | 2 - src/gos/gos_freertos.h | 1 - src/gos/gos_keil.h | 6 +-- src/gos/gos_linux.c | 2 +- src/gos/gos_linux.h | 2 +- src/gos/gos_nios.h | 4 +- src/gos/gos_options.h | 84 +++++++++++++++++++------------------- src/gos/gos_raw32.h | 4 +- src/gos/gos_rawrtos.c | 2 +- src/gos/gos_rtx5.h | 6 +-- src/gos/gos_rules.h | 6 +-- src/gos/gos_x_threads.c | 12 +++--- src/gos/gos_x_threads_cortexm01.h | 4 +- src/gos/gos_x_threads_cortexm347.h | 4 +- src/gos/gos_zephyr.h | 2 - 21 files changed, 81 insertions(+), 91 deletions(-) (limited to 'src/gos') diff --git a/src/gos/gos.h b/src/gos/gos.h index da09a38a..9ba12889 100644 --- a/src/gos/gos.h +++ b/src/gos/gos.h @@ -88,8 +88,6 @@ * @note Your platform may use slightly different definitions to these * @{ */ - #define FALSE 0 - #define TRUE 1 #define TIME_IMMEDIATE 0 #define TIME_INFINITE ((delaytime_t)-1) #define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1)) @@ -193,7 +191,7 @@ * @api */ #ifndef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif /** diff --git a/src/gos/gos_arduino.h b/src/gos/gos_arduino.h index 3019d271..a9b0c140 100644 --- a/src/gos/gos_arduino.h +++ b/src/gos/gos_arduino.h @@ -59,8 +59,8 @@ extern "C" { /* Use the generic thread handling and heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h index aedfb492..cb683631 100644 --- a/src/gos/gos_chibios.h +++ b/src/gos/gos_chibios.h @@ -10,10 +10,13 @@ #if GFX_USE_OS_CHIBIOS -// This shouldn't be needed but some people are complaining -// about TRUE/FALSE redefinition so we fix it here. -#undef TRUE -#undef FALSE +#if GFX_COMPAT_V2 + // This shouldn't be needed but some people are complaining + // about TRUE/FALSE redefinition so we fix it here. + // ChibiOS will define them in its own header files. + #undef TRUE + #undef FALSE +#endif #include "ch.h" #include "hal.h" @@ -33,12 +36,6 @@ * are already defined by ChibiOS */ -#if !defined(FALSE) - #define FALSE 0 -#endif -#if !defined(TRUE) - #define TRUE -1 -#endif #if (CH_KERNEL_MAJOR == 3) || (CH_KERNEL_MAJOR == 4) typedef char bool_t; #endif diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h index 85aa1362..aad4cb84 100644 --- a/src/gos/gos_cmsis.h +++ b/src/gos/gos_cmsis.h @@ -99,7 +99,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ /* Use the generic heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_HEAP GFXON #include "gos_x_heap.h" #endif /* GFX_USE_OS_CMSIS */ diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index bd8c9042..1f4eab5e 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -92,7 +92,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ /* Use the generic heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_HEAP GFXON #include "gos_x_heap.h" #endif /* GFX_USE_OS_CMSIS */ diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c index a55773d9..a2af5dbf 100644 --- a/src/gos/gos_ecos.c +++ b/src/gos/gos_ecos.c @@ -12,7 +12,7 @@ void _gosInit(void) { #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" + #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h" #endif #if !GFX_OS_INIT_NO_WARNING #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT diff --git a/src/gos/gos_ecos.h b/src/gos/gos_ecos.h index 0e438fb0..b03243f3 100644 --- a/src/gos/gos_ecos.h +++ b/src/gos/gos_ecos.h @@ -27,8 +27,6 @@ typedef cyg_int32 int32_t; typedef cyg_uint32 uint32_t; typedef cyg_uint32 size_t; -#define TRUE -1 -#define FALSE 0 #define TIME_IMMEDIATE 0 #define TIME_INFINITE 0xFFFFFFFF diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h index a0f1ed18..87ef8163 100644 --- a/src/gos/gos_freertos.h +++ b/src/gos/gos_freertos.h @@ -42,7 +42,6 @@ * int16_t, uint16_t, * int32_t, uint32_t, * size_t - * TRUE, FALSE * are already defined by FreeRTOS */ #define TIME_IMMEDIATE 0 diff --git a/src/gos/gos_keil.h b/src/gos/gos_keil.h index 863986d4..35d6e4e1 100644 --- a/src/gos/gos_keil.h +++ b/src/gos/gos_keil.h @@ -19,13 +19,13 @@ * Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS RTOS port */ -// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE." +// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON." #undef GFX_USE_OS_KEIL -#define GFX_USE_OS_KEIL FALSE +#define GFX_USE_OS_KEIL GFXOFF // Enable generic CMSIS RTOS implementation #undef GFX_USE_OS_CMSIS -#define GFX_USE_OS_CMSIS TRUE +#define GFX_USE_OS_CMSIS GFXON #include "gos_cmsis.h" #endif /* GFX_USE_OS_KEIL */ diff --git a/src/gos/gos_linux.c b/src/gos/gos_linux.c index 43371443..bd4e0060 100644 --- a/src/gos/gos_linux.c +++ b/src/gos/gos_linux.c @@ -13,7 +13,7 @@ #if GFX_USE_OS_LINUX // Linux seems to have deprecated pthread_yield() and now says to use sched_yield() -#define USE_SCHED_NOT_PTHREAD_YIELD TRUE +#define USE_SCHED_NOT_PTHREAD_YIELD GFXON #include #include diff --git a/src/gos/gos_linux.h b/src/gos/gos_linux.h index b9bfe82e..f1973615 100644 --- a/src/gos/gos_linux.h +++ b/src/gos/gos_linux.h @@ -12,7 +12,7 @@ // We don't put this in the general sys_options.h as it is Linux specific. #ifndef GFX_USE_POSIX_SEMAPHORES - #define GFX_USE_POSIX_SEMAPHORES TRUE + #define GFX_USE_POSIX_SEMAPHORES GFXON #endif #include diff --git a/src/gos/gos_nios.h b/src/gos/gos_nios.h index 4aadc45d..75bf5676 100644 --- a/src/gos/gos_nios.h +++ b/src/gos/gos_nios.h @@ -34,8 +34,8 @@ systemticks_t gfxMillisecondsToTicks(delaytime_t ms); // Use the generic thread handling and heap handling -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h index 319af5d5..3f04ca4a 100644 --- a/src/gos/gos_options.h +++ b/src/gos/gos_options.h @@ -22,115 +22,115 @@ */ /** * @brief Use ChibiOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CHIBIOS - #define GFX_USE_OS_CHIBIOS FALSE + #define GFX_USE_OS_CHIBIOS GFXOFF #endif /** * @brief Use FreeRTOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_FREERTOS - #define GFX_USE_OS_FREERTOS FALSE + #define GFX_USE_OS_FREERTOS GFXOFF #endif /** * @brief Use Win32 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_WIN32 - #define GFX_USE_OS_WIN32 FALSE + #define GFX_USE_OS_WIN32 GFXOFF #endif /** * @brief Use a linux based system running X11 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_LINUX - #define GFX_USE_OS_LINUX FALSE + #define GFX_USE_OS_LINUX GFXOFF #endif /** * @brief Use a Mac OS-X based system - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_OSX - #define GFX_USE_OS_OSX FALSE + #define GFX_USE_OS_OSX GFXOFF #endif /** * @brief Use a Raw 32-bit CPU based system (Bare Metal) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RAW32 - #define GFX_USE_OS_RAW32 FALSE + #define GFX_USE_OS_RAW32 GFXOFF #endif /** * @brief Use a eCos - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ECOS - #define GFX_USE_OS_ECOS FALSE + #define GFX_USE_OS_ECOS GFXOFF #endif /** * @brief Use RAWRTOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RAWRTOS - #define GFX_USE_OS_RAWRTOS FALSE + #define GFX_USE_OS_RAWRTOS GFXOFF #endif /** * @brief Use Arduino - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ARDUINO - #define GFX_USE_OS_ARDUINO FALSE + #define GFX_USE_OS_ARDUINO GFXOFF #endif /** * @brief Use CMSIS RTOS compatible OS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CMSIS - #define GFX_USE_OS_CMSIS FALSE + #define GFX_USE_OS_CMSIS GFXOFF #endif /** * @brief Use CMSIS2 RTOS compatible OS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CMSIS2 - #define GFX_USE_OS_CMSIS2 FALSE + #define GFX_USE_OS_CMSIS2 GFXOFF #endif /** * @brief Use Keil CMSIS 1.x (RTOS, RTX4) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_KEIL - #define GFX_USE_OS_KEIL FALSE + #define GFX_USE_OS_KEIL GFXOFF #endif /** * @brief Use Keil RTX5 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RTX5 - #define GFX_USE_OS_RTX5 FALSE + #define GFX_USE_OS_RTX5 GFXOFF #endif /** * @brief Use NIOS-II - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_NIOS - #define GFX_USE_OS_NIOS FALSE + #define GFX_USE_OS_NIOS GFXOFF #endif /** * @brief Use Zephyr - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ZEPHYR - #define GFX_USE_OS_ZEPHYR FALSE + #define GFX_USE_OS_ZEPHYR GFXOFF #endif /** * @brief Use Qt - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_QT - #define GFX_USE_OS_QT FALSE + #define GFX_USE_OS_QT GFXOFF #endif /** * @} @@ -179,7 +179,7 @@ //#define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine /** * @brief Should uGFX avoid initializing the operating system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This is not relevant to all operating systems eg Win32 never initializes the * operating system as uGFX runs as an application outside the boot process. * @note Operating system initialization is not necessarily implemented for all @@ -189,21 +189,21 @@ * demo applications will not work without modification. */ #ifndef GFX_OS_NO_INIT - #define GFX_OS_NO_INIT FALSE + #define GFX_OS_NO_INIT GFXOFF #endif /** * @brief Turn off warnings about initializing the operating system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This is only relevant where GOS cannot initialize the operating * system automatically or the operating system initialization has been * explicitly turned off. */ #ifndef GFX_OS_INIT_NO_WARNING - #define GFX_OS_INIT_NO_WARNING FALSE + #define GFX_OS_INIT_NO_WARNING GFXOFF #endif /** * @brief Call uGFXMain() after all initialisation - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note uGFXMain() is a function defined by the user in their project * that contains the application main code. This is not expected to return * and thus gfxInit() will also never return. This is required for some @@ -213,7 +213,7 @@ * void uGFXMain(void);
*/ #ifndef GFX_OS_CALL_UGFXMAIN - #define GFX_OS_CALL_UGFXMAIN FALSE + #define GFX_OS_CALL_UGFXMAIN GFXOFF #endif /** * @brief When uGFXMain() is started as a thread, what stack size should be used @@ -228,10 +228,10 @@ #endif /** * @brief Should uGFX stuff be added to the FreeRTOS+Tracer - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_FREERTOS_USE_TRACE - #define GFX_FREERTOS_USE_TRACE FALSE + #define GFX_FREERTOS_USE_TRACE GFXOFF #endif /** * @brief How much RAM should uGFX use for the heap when using its own internal heap allocator @@ -250,7 +250,7 @@ #endif /** * @brief Enable wrappers for malloc() and free() - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If enabled, malloc() and free() will be implemented as wrappers that call gfxAlloc() and * gfxFree() in order to provide portability to libraries using these function. * @note Enabling this can solve 'unresolved _sbrk' issues @@ -258,7 +258,7 @@ * portability of uGFX applications across all platforms. */ #ifndef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif /** @} */ diff --git a/src/gos/gos_raw32.h b/src/gos/gos_raw32.h index 2937e52b..5ff38028 100644 --- a/src/gos/gos_raw32.h +++ b/src/gos/gos_raw32.h @@ -70,8 +70,8 @@ extern "C" { /* Use the generic thread handling and heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c index 23b0c6c1..8ff53883 100644 --- a/src/gos/gos_rawrtos.c +++ b/src/gos/gos_rawrtos.c @@ -25,7 +25,7 @@ void _gosInit(void) { #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" + #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h" #endif #if !GFX_OS_INIT_NO_WARNING #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT diff --git a/src/gos/gos_rtx5.h b/src/gos/gos_rtx5.h index b07a2164..9e70d8bb 100644 --- a/src/gos/gos_rtx5.h +++ b/src/gos/gos_rtx5.h @@ -19,13 +19,13 @@ * Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS2 RTOS port */ -// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE." +// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON." #undef GFX_USE_OS_RTX5 -#define GFX_USE_OS_RTX5 FALSE +#define GFX_USE_OS_RTX5 GFXOFF // Enable generic CMSIS RTOS implementation #undef GFX_USE_OS_CMSIS2 -#define GFX_USE_OS_CMSIS2 TRUE +#define GFX_USE_OS_CMSIS2 GFXON #include "gos_cmsis2.h" #endif /* GFX_USE_OS_RTX5 */ diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h index 2ea1b1b2..96b4b795 100644 --- a/src/gos/gos_rules.h +++ b/src/gos/gos_rules.h @@ -20,8 +20,8 @@ #error "GOS: No operating system has been defined." #endif -#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * TRUE - #error "GOS: More than one operation system has been defined as TRUE." +#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * GFXON + #error "GOS: More than one operation system has been defined as GFXON." #endif #if GFX_FREERTOS_USE_TRACE && !GFX_USE_OS_FREERTOS @@ -43,7 +43,7 @@ #endif #endif #undef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif #endif diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index b696ee77..52afd5c1 100644 --- a/src/gos/gos_x_threads.c +++ b/src/gos/gos_x_threads.c @@ -242,8 +242,8 @@ static thread mainthread; // The main thread context * * MACROS: * - * AUTO_DETECT_STACKFRAME TRUE/FALSE - TRUE to auto-detect stack frame structure - * STACK_DIR_UP Macro/bool_t - TRUE if the stack grows up instead of down + * AUTO_DETECT_STACKFRAME GFXON/GFXOFF - GFXON to auto-detect stack frame structure + * STACK_DIR_UP Macro/bool_t - GFXON if the stack grows up instead of down * MASK1 Macro/uint32_t - The 1st mask of jmp_buf elements that need relocation * MASK2 Macro/uint32_t - The 2nd mask of jmp_buf elements that need relocation * STACK_BASE Macro/size_t - The base of the stack frame relative to the local variables @@ -252,8 +252,8 @@ static thread mainthread; // The main thread context */ #if GFX_COMPILER == GFX_COMPILER_MINGW32 - #define AUTO_DETECT_STACKFRAME FALSE - #define STACK_DIR_UP FALSE + #define AUTO_DETECT_STACKFRAME GFXOFF + #define STACK_DIR_UP GFXOFF #define MASK1 0x00000011 #define MASK2 0x00000000 #define STACK_BASE 12 @@ -263,8 +263,8 @@ static thread mainthread; // The main thread context // Use auto-detection of the stack frame format // Assumes all the relevant stuff to be relocated is in the first 256 bytes of the jmpbuf. - #define AUTO_DETECT_STACKFRAME TRUE - #define STACK_DIR_UP stackdirup // TRUE if the stack grow up instead of down + #define AUTO_DETECT_STACKFRAME GFXON + #define STACK_DIR_UP stackdirup // GFXON if the stack grow up instead of down #define MASK1 jmpmask1 // The 1st mask of jmp_buf elements that need relocation #define MASK2 jmpmask2 // The 2nd mask of jmp_buf elements that need relocation #define STACK_BASE stackbase // The base of the stack frame relative to the local variables diff --git a/src/gos/gos_x_threads_cortexm01.h b/src/gos/gos_x_threads_cortexm01.h index 8afe1864..89a7d383 100644 --- a/src/gos/gos_x_threads_cortexm01.h +++ b/src/gos/gos_x_threads_cortexm01.h @@ -14,9 +14,9 @@ #if CORTEX_USE_FPU #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" + #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") + COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") #endif #endif diff --git a/src/gos/gos_x_threads_cortexm347.h b/src/gos/gos_x_threads_cortexm347.h index 8e9ece61..489c0f14 100644 --- a/src/gos/gos_x_threads_cortexm347.h +++ b/src/gos/gos_x_threads_cortexm347.h @@ -15,9 +15,9 @@ #if CORTEX_USE_FPU #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" + #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") + COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") #endif #endif diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h index 741e7587..0acb2c43 100644 --- a/src/gos/gos_zephyr.h +++ b/src/gos/gos_zephyr.h @@ -42,8 +42,6 @@ #define THREAD_RETURN(retval) return - // #define FALSE 0 - // #define TRUE 1 #define TIME_IMMEDIATE K_NO_WAIT #define TIME_INFINITE K_FOREVER #define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1)) -- cgit v1.2.3