Skip to content

Fix freertos_kernel cmake property, Posix Port #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,6 @@ elseif((FREERTOS_PORT STREQUAL "A_CUSTOM_PORT") AND (NOT TARGET freertos_kernel_
" freertos_kernel)")
endif()

########################################################################
# Requirements
set_property(TARGET freertos_kernel PROPERTY C_STANDARD 90)

########################################################################
# Overall Compile Options
# Note the compile option strategy is to error on everything and then
Expand Down Expand Up @@ -294,3 +290,7 @@ target_link_libraries(freertos_kernel
$<$<TARGET_EXISTS:freertos_config>:freertos_config>
freertos_kernel_port
)

########################################################################
# Requirements
set_property(TARGET freertos_kernel PROPERTY C_STANDARD 90)
2 changes: 1 addition & 1 deletion portable/ThirdParty/GCC/Posix/port.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ static uint64_t prvGetTimeNs( void )

clock_gettime( CLOCK_MONOTONIC, &t );

return ( uint64_t )t.tv_sec * 1000000000ULL + ( uint64_t )t.tv_nsec;
return ( uint64_t )t.tv_sec * ( uint64_t )1000000000UL + ( uint64_t )t.tv_nsec;
}

static uint64_t prvStartTimeNs;
Expand Down