Merge pull request #544 from eclipse-threadx/devv6.5.1.202602_rel

Merging changes for the v.6.5.1.202602 release

3 files changed, 218 insertions, 2 deletions

diff --git a/common_smp/CMakeLists.txt b/common_smp/CMakeLists.txt
new file mode 100644
index 00000000..80b9d315
--- /dev/null
+++ b/common_smp/CMakeLists.txt
@@ -0,0 +1,218 @@
+function(target_sources_if_not_overridden filename)
+    list(FIND TX_SRC_OVERRIDES ${filename} OVERRIDE_FOUND)
+    if( OVERRIDE_FOUND EQUAL -1 )
+        # message(STATUS "** Using original ${filename} from common_smp/src **")
+        target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src/${filename})
+    endif()
+endfunction()
+
+# These files can be overridden by setting them in the variable list named TX_SRC_OVERRIDES
+target_sources_if_not_overridden("tx_thread_delete.c")
+target_sources_if_not_overridden("tx_thread_reset.c")
+
+target_sources(${PROJECT_NAME}
+    PRIVATE
+    # {{BEGIN_TARGET_SOURCES}}
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_allocate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_pool_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_block_release.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_allocate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_pool_search.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_byte_release.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_set_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_event_flags_set.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_initialize_high_level.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_initialize_kernel_enter.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_initialize_kernel_setup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_misra.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_priority_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_mutex_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_flush.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_front_send.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_receive.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_send_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_queue_send.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_ceiling_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_cleanup.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_put_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_semaphore_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_entry_exit_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_identify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_preemption_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_priority_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_relinquish.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_reset.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_resume.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_shell_entry.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_sleep.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_core_exclude_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_core_exclude.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_current_state_set.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_debug_entry_insert.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_high_level_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_rebalance_execute_list.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_smp_utilities.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_stack_analyze.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_stack_error_handler.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_stack_error_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_suspend.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_system_preempt_check.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_system_resume.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_system_suspend.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_terminate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_time_slice_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_time_slice.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_timeout.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_thread_wait_abort.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_time_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_time_set.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_activate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_deactivate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_expiration_process.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_performance_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_performance_system_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_smp_core_exclude_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_smp_core_exclude.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_system_activate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_system_deactivate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_timer_thread_entry.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_buffer_full_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_disable.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_enable.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_event_filter.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_event_unfilter.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_initialize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_interrupt_control.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_isr_enter_insert.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_isr_exit_insert.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_object_register.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_object_unregister.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/tx_trace_user_event_insert.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_allocate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_pool_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_pool_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_pool_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_pool_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_block_release.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_allocate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_pool_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_pool_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_pool_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_pool_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_byte_release.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_set_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_event_flags_set.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_mutex_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_flush.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_front_send.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_receive.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_send_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_queue_send.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_ceiling_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_prioritize.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_put_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_semaphore_put.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_entry_exit_notify.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_info_get.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_preemption_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_priority_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_relinquish.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_reset.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_resume.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_suspend.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_terminate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_time_slice_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_thread_wait_abort.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_activate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_change.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_create.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_deactivate.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_delete.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/txe_timer_info_get.c
+    # {{END_TARGET_SOURCES}}
+)
+
+# Add the Common/inc directory to the project include list
+target_include_directories(${PROJECT_NAME} 
+    SYSTEM
+    PUBLIC 
+    ${CMAKE_CURRENT_LIST_DIR}/inc
+)
diff --git a/common_smp/src/tx_thread_system_resume.c b/common_smp/src/tx_thread_system_resume.c
index 256c06f2..476af380 100644
--- a/common_smp/src/tx_thread_system_resume.c
+++ b/common_smp/src/tx_thread_system_resume.c
@@ -960,4 +960,3 @@ VOID  _tx_thread_system_ni_resume(TX_THREAD *thread_ptr)
     _tx_thread_system_resume(thread_ptr);
 }
 #endif
-
diff --git a/common_smp/src/tx_thread_system_suspend.c b/common_smp/src/tx_thread_system_suspend.c
index d5bf5cc7..a64b4efa 100644
--- a/common_smp/src/tx_thread_system_suspend.c
+++ b/common_smp/src/tx_thread_system_suspend.c
@@ -984,4 +984,3 @@ VOID  _tx_thread_system_ni_suspend(TX_THREAD *thread_ptr, ULONG timeout)
     _tx_thread_system_suspend(thread_ptr);
 }
 #endif
-