From 7e923ed682829d6006dcadc83394a13b6570673a Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Thu, 18 Apr 2024 10:10:36 +0000 Subject: [PATCH] Fix C90 errors for unsigned long long integers --- examples/cmake_example/CMakeLists.txt | 3 ++- include/event_groups.h | 8 ++++---- portable/template/portmacro.h | 2 +- tasks.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/cmake_example/CMakeLists.txt b/examples/cmake_example/CMakeLists.txt index bff9317de..7b31cc52a 100644 --- a/examples/cmake_example/CMakeLists.txt +++ b/examples/cmake_example/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.15) - project(example) set(FREERTOS_KERNEL_PATH "../../") @@ -71,3 +70,5 @@ add_executable(${PROJECT_NAME} ) target_link_libraries(${PROJECT_NAME} freertos_kernel freertos_config) + +set_property(TARGET freertos_kernel PROPERTY C_STANDARD 90) \ No newline at end of file diff --git a/include/event_groups.h b/include/event_groups.h index 8ff26799b..fd5655c5e 100644 --- a/include/event_groups.h +++ b/include/event_groups.h @@ -50,10 +50,10 @@ #define eventWAIT_FOR_ALL_BITS ( ( uint32_t ) 0x04000000UL ) #define eventEVENT_BITS_CONTROL_BYTES ( ( uint32_t ) 0xff000000UL ) #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_64_BITS ) - #define eventCLEAR_EVENTS_ON_EXIT_BIT ( ( uint64_t ) 0x0100000000000000ULL ) - #define eventUNBLOCKED_DUE_TO_BIT_SET ( ( uint64_t ) 0x0200000000000000ULL ) - #define eventWAIT_FOR_ALL_BITS ( ( uint64_t ) 0x0400000000000000ULL ) - #define eventEVENT_BITS_CONTROL_BYTES ( ( uint64_t ) 0xff00000000000000ULL ) + #define eventCLEAR_EVENTS_ON_EXIT_BIT ( ( uint64_t ) 0x0100000000000000 ) + #define eventUNBLOCKED_DUE_TO_BIT_SET ( ( uint64_t ) 0x0200000000000000 ) + #define eventWAIT_FOR_ALL_BITS ( ( uint64_t ) 0x0400000000000000 ) + #define eventEVENT_BITS_CONTROL_BYTES ( ( uint64_t ) 0xff00000000000000 ) #endif /* if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS ) */ /* *INDENT-OFF* */ diff --git a/portable/template/portmacro.h b/portable/template/portmacro.h index 199053208..3b5da0dd2 100644 --- a/portable/template/portmacro.h +++ b/portable/template/portmacro.h @@ -40,7 +40,7 @@ typedef unsigned char UBaseType_t; #define portMAX_DELAY ( TickType_t ) 0xffffffffUL #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_64_BITS ) typedef uint64_t TickType_t; - #define portMAX_DELAY ( TickType_t ) 0xffffffffffffffffULL + #define portMAX_DELAY ( TickType_t ) 0xffffffffffffffff #else #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width. #endif diff --git a/tasks.c b/tasks.c index 2ec9d6d83..9092ca103 100644 --- a/tasks.c +++ b/tasks.c @@ -295,7 +295,7 @@ #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS ) #define taskEVENT_LIST_ITEM_VALUE_IN_USE ( ( uint32_t ) 0x80000000UL ) #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_64_BITS ) - #define taskEVENT_LIST_ITEM_VALUE_IN_USE ( ( uint64_t ) 0x8000000000000000ULL ) + #define taskEVENT_LIST_ITEM_VALUE_IN_USE ( ( uint64_t ) 0x8000000000000000 ) #endif /* Indicates that the task is not actively running on any core. */