Removed unused code.

Add RXv1 port.

CMakeLists.txt

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
 
 # Set up the project
 project(threadx
-    VERSION 6.0.0 
     LANGUAGES C ASM
 )
 
@@ -12,6 +11,8 @@ endif()
 if(NOT DEFINED THREADX_TOOLCHAIN)
     message(FATAL_ERROR "Error: THREADX_TOOLCHAIN not defined")
 endif()
+message(STATUS "THREADX_ARCH: ${THREADX_ARCH}")
+message(STATUS "THREADX_TOOLCHAIN: ${THREADX_TOOLCHAIN}")
 
 # Define our target library and an alias for consumers
 add_library(${PROJECT_NAME})
@@ -21,7 +22,11 @@ add_library("azrtos::${PROJECT_NAME}" ALIAS ${PROJECT_NAME})
 set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
 
 # Pick up the port specific variables and apply them
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
+if(DEFINED THREADX_CUSTOM_PORT)
+    add_subdirectory(${THREADX_CUSTOM_PORT} threadx_port)
+else()
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
+endif()
 
 # Pick up the common stuff
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)

LICENSED-HARDWARE.txt

@@ -1,6 +1,6 @@
 LICENSED HARDWARE LIST
 
-Last Updated: 2020-12-15
+Last Updated: 2021-04-01
 
 Microsoft has entered into OEM Agreements with manufacturers of the following
 microprocessors and microcontrollers (the “hardware”) to enable those
@@ -29,12 +29,15 @@ Microchip:
 
 NXP:
 
-    NXP i.MX RT10xx series crossover MCUs
+    i.MX RT10xx and RT116x/7x series crossover MCUs
+    LPC5500 series
+
 
 Renesas:
 
     Synergy Platform
     RX Family of MCUs
+    RA Family of MCUs
     RZ Family of MPUs
 
 --------------------------------------------------------------------------------

README.md

@@ -85,6 +85,10 @@ Each official release (preview or GA) will be tagged to mark the commit and push
 
 Azure RTOS provides OEMs with components to secure communication and to create code and data isolation using underlying MCU/MPU hardware protection mechanisms. It is ultimately the responsibility of the device builder to ensure the device fully meets the evolving security requirements associated with its specific use case.
 
+# Adaptation layer for ThreadX
+
+Azure RTOS ThreadX is an advanced real-time operating system (RTOS) designed specifically for deeply embedded applications. To help ease application migration to Auzre RTOS, ThreadX provides [adaption layers](https://github.com/azure-rtos/threadx/tree/master/utility/rtos_compatibility_layers) for various legacy RTOS APIs (FreeRTOS, POSIX, OSEK, etc.).
+
 # Licensing
 
 License terms for using Azure RTOS are defined in the LICENSE.txt file of this repo. Please refer to this file for all definitive licensing information. No additional license fees are required for deploying Azure RTOS on hardware defined in the LICENSED-HARDWARE.txt file. If you are using hardware not defined in the LICENSED-HARDWARE.txt file or have licensing questions in general, please contact Microsoft directly at https://azure-rtos.ms-iot-contact.com/

cmake/arm-none-eabi.cmake

@@ -17,7 +17,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
 set(CMAKE_C_FLAGS   "${MCPU_FLAGS} ${VFP_FLAGS} ${SPEC_FLAGS} -fdata-sections -ffunction-sections -mlong-calls" CACHE INTERNAL "c compiler flags")
 set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -fdata-sections -ffunction-sections -fno-rtti -fno-exceptions -mlong-calls" CACHE INTERNAL "cxx compiler flags")
-set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
+set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
 set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags")
 
 SET(CMAKE_C_FLAGS_DEBUG "-Og -g -ggdb3" CACHE INTERNAL "c debug compiler flags")

common/inc/tx_api.h

@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    tx_api.h                                            PORTABLE C      */
-/*                                                           6.1.3        */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -61,6 +61,23 @@
 /*  12-31-2020      William E. Lamie        Modified comment(s), and      */
 /*                                            increased patch version,    */
 /*                                            resulting in version 6.1.3  */
+/*  03-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            order defines numerically,  */
+/*                                            add option to remove FileX  */
+/*                                            pointer,                    */
+/*                                            resulting in version 6.1.5  */
+/*  04-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.6  */
+/*  06-02-2021      Yuxin Zhou              Modified comment(s), added    */
+/*                                            Execution Profile support,  */
+/*                                            resulting in version 6.1.7  */
+/*  08-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.8  */
+/*  10-15-2021      Yuxin Zhou              Modified comment(s),          */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -93,7 +110,7 @@ extern   "C" {
 #define AZURE_RTOS_THREADX
 #define THREADX_MAJOR_VERSION           6
 #define THREADX_MINOR_VERSION           1
-#define THREADX_PATCH_VERSION           3
+#define THREADX_PATCH_VERSION           9
 
 /* Define the following symbol for backward compatibility */
 #define EL_PRODUCT_THREADX
@@ -154,7 +171,6 @@ extern   "C" {
 
 #define TX_SUCCESS                      ((UINT) 0x00)
 #define TX_DELETED                      ((UINT) 0x01)
-#define TX_NO_MEMORY                    ((UINT) 0x10)
 #define TX_POOL_ERROR                   ((UINT) 0x02)
 #define TX_PTR_ERROR                    ((UINT) 0x03)
 #define TX_WAIT_ERROR                   ((UINT) 0x04)
@@ -169,6 +185,7 @@ extern   "C" {
 #define TX_NO_INSTANCE                  ((UINT) 0x0D)
 #define TX_THREAD_ERROR                 ((UINT) 0x0E)
 #define TX_PRIORITY_ERROR               ((UINT) 0x0F)
+#define TX_NO_MEMORY                    ((UINT) 0x10)
 #define TX_START_ERROR                  ((UINT) 0x10)
 #define TX_DELETE_ERROR                 ((UINT) 0x11)
 #define TX_RESUME_ERROR                 ((UINT) 0x12)
@@ -422,7 +439,9 @@ typedef struct TX_THREAD_STRUCT
     TX_THREAD_EXTENSION_2
 
     /* Define a pointer type for FileX extensions.  */
+#ifndef TX_NO_FILEX_POINTER
     VOID                *tx_thread_filex_ptr;
+#endif
 
     /* Define the priority inheritance variables. These will be used
        to manage priority inheritance changes applied to this thread
@@ -488,6 +507,17 @@ typedef struct TX_THREAD_STRUCT
        is typically defined to whitespace in tx_port.h.  */
     TX_THREAD_EXTENSION_3
 
+
+    /* Define variables for supporting execution profile. */
+    /* Note that in ThreadX 5.x, user would define TX_ENABLE_EXECUTION_CHANGE_NOTIFY and use TX_THREAD_EXTENSION_3
+       to define the following two variables.
+       For Azure RTOS 6, user shall use TX_EXECUTION_PROFILE_ENABLE instead of TX_ENABLE_EXECUTION_CHANGE_NOTIFY,
+       and SHALL NOT add variables to TX_THREAD_EXTENSION_3. */
+#if (defined(TX_EXECUTION_PROFILE_ENABLE) && !defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY))
+    unsigned long long  tx_thread_execution_time_total;
+    unsigned long long  tx_thread_execution_time_last_start;
+#endif
+
     /* Define suspension sequence number.  This is used to ensure suspension is still valid when
        cleanup routine executes.  */
     ULONG               tx_thread_suspension_sequence;
@@ -1092,7 +1122,6 @@ UINT    _tx_trace_interrupt_control(UINT new_posture);
 
 #ifdef TX_ENABLE_MULTI_ERROR_CHECKING
 
-
 /* Services with MULTI runtime error checking ThreadX.  */
 
 #define tx_block_allocate                           _txr_block_allocate
@@ -1790,7 +1819,6 @@ VOID                    _tx_misra_user_timer_pointer_get(TX_TIMER_INTERNAL *inte
 VOID                    _tx_misra_thread_stack_check(TX_THREAD *thread_ptr, VOID **highest_stack);
 VOID                    _tx_misra_trace_event_insert(ULONG event_id, VOID *info_field_1, ULONG info_field_2, ULONG info_field_3, ULONG info_field_4, ULONG filter, ULONG time_stamp);
 UINT                    _tx_misra_always_true(void);
-
 UCHAR                   **_tx_misra_indirect_void_to_uchar_pointer_convert(VOID **pointer);
 UCHAR                   **_tx_misra_uchar_to_indirect_uchar_pointer_convert(UCHAR *pointer);
 UCHAR                   *_tx_misra_block_pool_to_uchar_pointer_convert(TX_BLOCK_POOL *pool);
@@ -1823,7 +1851,6 @@ VOID                    _tx_misra_semaphore_put_notify_not_used(VOID (*semaphore
 VOID                    _tx_misra_thread_not_used(TX_THREAD *thread_ptr);
 VOID                    _tx_misra_thread_entry_exit_notify_not_used(VOID (*thread_entry_exit_notify)(TX_THREAD *notify_thread_ptr, UINT id));
 
-
 #define TX_MEMSET(a,b,c)                                _tx_misra_memset((a), (UINT) (b), (UINT) (c))
 #define TX_UCHAR_POINTER_ADD(a,b)                       _tx_misra_uchar_pointer_add((UCHAR *) (a), (ULONG) (b))
 #define TX_UCHAR_POINTER_SUB(a,b)                       _tx_misra_uchar_pointer_sub((UCHAR *) (a), (ULONG) (b))
@@ -1842,8 +1869,6 @@ VOID                    _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
 #define TX_TRACE_IN_LINE_INSERT(i,a,b,c,d,e)            _tx_misra_trace_event_insert((ULONG) (i), (VOID *) (a), (ULONG) (b), (ULONG) (c), (ULONG) (d), (ULONG) (e), ((ULONG) TX_TRACE_TIME_SOURCE));
 #endif
 #define TX_LOOP_FOREVER                                 (_tx_misra_always_true() == TX_TRUE)
-
-
 #define TX_INDIRECT_VOID_TO_UCHAR_POINTER_CONVERT(a)    _tx_misra_indirect_void_to_uchar_pointer_convert((a))
 #define TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(a)   _tx_misra_uchar_to_indirect_uchar_pointer_convert((a))
 #define TX_BLOCK_POOL_TO_UCHAR_POINTER_CONVERT(a)       _tx_misra_block_pool_to_uchar_pointer_convert((a))
@@ -1879,7 +1904,6 @@ VOID                    _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
 #define TX_THREAD_NOT_USED(a)                           _tx_misra_thread_not_used((a))
 #define TX_THREAD_ENTRY_EXIT_NOTIFY_NOT_USED(a)         _tx_misra_thread_entry_exit_notify_not_used((a))
 
-
 #else
 
 /* Define the TX_MEMSET macro to the standard library function, if not already defined.  */
@@ -1908,8 +1932,6 @@ VOID                    _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
                                                             (b) =  (TX_TIMER *) working_ptr; \
                                                         }
 #define TX_LOOP_FOREVER                                 ((UINT) 1)
-
-
 #define TX_INDIRECT_VOID_TO_UCHAR_POINTER_CONVERT(a)    ((UCHAR **) ((VOID *) (a)))
 #define TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(a)   ((UCHAR **) ((VOID *) (a)))
 #define TX_BLOCK_POOL_TO_UCHAR_POINTER_CONVERT(a)       ((UCHAR *) ((VOID *) (a)))

common/inc/tx_thread.h

@@ -26,7 +26,7 @@
 /*  COMPONENT DEFINITION                                   RELEASE        */
 /*                                                                        */
 /*    tx_thread.h                                         PORTABLE C      */
-/*                                                           6.1.2        */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -48,6 +48,9 @@
 /*                                            moved TX_THREAD_GET_SYSTEM_ */
 /*                                            STATE to tx_api.h,          */
 /*                                            resulting in version 6.1.2  */
+/*  10-15-2021     Scott Larson             Modified comment(s), improved */
+/*                                            stack check error handling, */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -114,6 +117,7 @@
 #endif
 
 
+
 /* Define the get system state macro. By default, it simply maps to the variable _tx_thread_system_state.  */
 /* This symbol is moved to tx_api.h. Therefore removed from this file.
 #ifndef TX_THREAD_GET_SYSTEM_STATE
@@ -437,7 +441,7 @@ THREAD_DECLARE  VOID            (*_tx_thread_mutex_release)(TX_THREAD *thread_pt
 THREAD_DECLARE  ULONG           _tx_build_options;
 
 
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 
 /* Define the global function pointer for stack error handling. If a stack error is
    detected and the application has registered a stack error handler, it will be

common/inc/tx_user_sample.h

@@ -26,7 +26,7 @@
 /*  PORT SPECIFIC C INFORMATION                            RELEASE        */
 /*                                                                        */
 /*    tx_user.h                                           PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*                                                                        */
 /*  AUTHOR                                                                */
 /*                                                                        */
@@ -47,6 +47,17 @@
 /*  05-19-2020      William E. Lamie        Initial Version 6.0           */
 /*  09-30-2020      Yuxin Zhou              Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-02-2021      Scott Larson            Modified comment(s),          */
+/*                                            added option to remove      */
+/*                                            FileX pointer,              */
+/*                                            resulting in version 6.1.5  */
+/*  06-02-2021      Scott Larson            Added options for multiple    */
+/*                                            block pool search & delay,  */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021      Yuxin Zhou              Modified comment(s), added    */
+/*                                            user-configurable symbol    */
+/*                                            TX_TIMER_TICKS_PER_SECOND   */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -76,6 +87,7 @@
         TX_DISABLE_PREEMPTION_THRESHOLD
         TX_DISABLE_REDUNDANT_CLEARING
         TX_DISABLE_NOTIFY_CALLBACKS
+        TX_NO_FILEX_POINTER
         TX_NOT_INTERRUPTABLE
         TX_TIMER_PROCESS_IN_ISR
 
@@ -98,6 +110,25 @@
 #define TX_TIMER_THREAD_PRIORITY                ????
 */
 
+/* Define the common timer tick reference for use by other middleware components. The default
+   value is 10ms (i.e. 100 ticks, defined in tx_api.h), but may be replaced by a port-specific
+   version in tx_port.h or here.
+   Note: the actual hardware timer value may need to be changed (usually in tx_initialize_low_level).  */
+
+/*
+#define TX_TIMER_TICKS_PER_SECOND       ((ULONG) 100)
+*/
+
+/* Determine if there is a FileX pointer in the thread control block.
+   By default, the pointer is there for legacy/backwards compatibility.
+   The pointer must also be there for applications using FileX.
+   Define this to save space in the thread control block.
+*/
+
+/*
+#define TX_NO_FILEX_POINTER
+*/
+
 /* Determine if timer expirations (application timers, timeouts, and tx_thread_sleep calls
    should be processed within the a system timer thread or directly in the timer ISR.
    By default, the timer thread is used. When the following is defined, the timer expiration
@@ -255,5 +286,17 @@
 #define TX_TIMER_ENABLE_PERFORMANCE_INFO
 */
 
+/*  Override options for byte pool searches of multiple blocks. */
+
+/*
+#define TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH    20
+*/
+
+/*  Override options for byte pool search delay to avoid thrashing. */
+
+/*
+#define TX_BYTE_POOL_DELAY_VALUE              3
+*/
+
 #endif
 

common/src/tx_byte_pool_search.c

@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_byte_pool_search                                PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -79,6 +79,9 @@
 /*  05-19-2020      William E. Lamie        Initial Version 6.0           */
 /*  09-30-2020      Yuxin Zhou              Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021      Scott Larson            Improve possible free bytes   */
+/*                                            calculation,                */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UCHAR  *_tx_byte_pool_search(TX_BYTE_POOL *pool_ptr, ULONG memory_size)
@@ -96,13 +99,16 @@ UINT            first_free_block_found =  TX_FALSE;
 TX_THREAD       *thread_ptr;
 ALIGN_TYPE      *free_ptr;
 UCHAR           *work_ptr;
+ULONG           total_theoretical_available;
 
 
     /* Disable interrupts.  */
     TX_DISABLE
 
     /* First, determine if there are enough bytes in the pool.  */
-    if (memory_size >= pool_ptr -> tx_byte_pool_available)
+    /* Theoretical bytes available = free bytes + ((fragments-2) * overhead of each block) */
+    total_theoretical_available = pool_ptr -> tx_byte_pool_available + ((pool_ptr -> tx_byte_pool_fragments - 2) * ((sizeof(UCHAR *)) + (sizeof(ALIGN_TYPE))));
+    if (memory_size >= total_theoretical_available)
     {
 
         /* Restore interrupts.  */
@@ -146,7 +152,6 @@ UCHAR           *work_ptr;
                 /* Determine if this is the first free block.  */
                 if (first_free_block_found == TX_FALSE)
                 {
-
                     /* This is the first free block.  */
                     pool_ptr->tx_byte_pool_search =  current_ptr;
 
@@ -207,14 +212,12 @@ UCHAR           *work_ptr;
                         /* See if the search pointer is affected.  */
                         if (pool_ptr -> tx_byte_pool_search ==  next_ptr)
                         {
-                    
                             /* Yes, update the search pointer.   */
                             pool_ptr -> tx_byte_pool_search =  current_ptr;
                         }
                     }
                     else
                     {
-
                         /* Neighbor is not free so we can skip over it!  */
                         next_block_link_ptr =  TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(next_ptr);
                         current_ptr =  *next_block_link_ptr;
@@ -222,7 +225,6 @@ UCHAR           *work_ptr;
                         /* Decrement the examined block count to account for this one.  */
                         if (examine_blocks != ((UINT) 0))
                         {
-
                             examine_blocks--;
 
 #ifdef TX_BYTE_POOL_ENABLE_PERFORMANCE_INFO

common/src/tx_mutex_priority_change.c

@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_mutex_priority_change                           PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.6        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -78,6 +78,10 @@
 /*                                            calling                     */
 /*                                            _tx_thread_system_suspend,  */
 /*                                            resulting in version 6.1    */
+/*  04-02-2021      Scott Larson            Modified comments, fixed      */
+/*                                            mapping current thread's    */
+/*                                            priority rather than next,  */
+/*                                            resulting in version 6.1.6  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_mutex_priority_change(TX_THREAD *thread_ptr, UINT new_priority)
@@ -308,15 +312,15 @@ UINT            map_index;
 #if TX_MAX_PRIORITIES > 32
 
                             /* Calculate the index into the bit map array.  */
-                            map_index =  (next_execute_ptr -> tx_thread_priority)/ ((UINT) 32);
+                            map_index =  (thread_ptr -> tx_thread_priority)/ ((UINT) 32);
 
                             /* Set the active bit to remember that the preempt map has something set.  */
-                            TX_DIV32_BIT_SET(next_execute_ptr -> tx_thread_priority, priority_bit)
+                            TX_DIV32_BIT_SET(thread_ptr -> tx_thread_priority, priority_bit)
                             _tx_thread_preempted_map_active =  _tx_thread_preempted_map_active | priority_bit;
 #endif
 
                             /* Remember that this thread was preempted by a thread above the thread's threshold.  */
-                            TX_MOD32_BIT_SET(next_execute_ptr -> tx_thread_priority, priority_bit)
+                            TX_MOD32_BIT_SET(thread_ptr -> tx_thread_priority, priority_bit)
                             _tx_thread_preempted_maps[MAP_INDEX] =  _tx_thread_preempted_maps[MAP_INDEX] | priority_bit;
                         }
 #endif

common/src/tx_thread_create.c

@@ -36,7 +36,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_thread_create                                   PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.8        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -84,6 +84,10 @@
 /*                                            changed stack calculations  */
 /*                                            to use ALIGN_TYPE integers, */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021      William E. Lamie        Modified comment(s), and      */
+/*                                            supported TX_MISRA_ENABLE,  */
+/*  08-02-2021      Scott Larson            Removed unneeded cast,        */
+/*                                            resulting in version 6.1.8  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ULONG id), ULONG entry_input,
@@ -120,8 +124,12 @@ ALIGN_TYPE              updated_stack_start;
     stack_size =  ((stack_size/(sizeof(ULONG))) * (sizeof(ULONG))) - (sizeof(ULONG));
 
     /* Ensure the starting stack address is evenly aligned.  */
+#ifdef TX_MISRA_ENABLE
+    new_stack_start = TX_POINTER_TO_ULONG_CONVERT(stack_start);
+#else
     new_stack_start =  TX_POINTER_TO_ALIGN_TYPE_CONVERT(stack_start);
-    updated_stack_start =  ((((ULONG) new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
+#endif /* TX_MISRA_ENABLE */
+    updated_stack_start =  (((new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
 
     /* Determine if the starting stack address is different.  */
     if (new_stack_start != updated_stack_start)
@@ -132,7 +140,11 @@ ALIGN_TYPE              updated_stack_start;
     }
 
     /* Update the starting stack pointer.  */
+#ifdef TX_MISRA_ENABLE
+    stack_start = TX_ULONG_TO_POINTER_CONVERT(updated_stack_start);
+#else
     stack_start =  TX_ALIGN_TYPE_TO_POINTER_CONVERT(updated_stack_start);
+#endif /* TX_MISRA_ENABLE */
 #endif
 
     /* Prepare the thread control block prior to placing it on the created

common/src/tx_thread_initialize.c

@@ -175,7 +175,7 @@ VOID            (*_tx_thread_mutex_release)(TX_THREAD *thread_ptr);
 ULONG           _tx_build_options;
 
 
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 
 /* Define the global function pointer for stack error handling. If a stack error is 
    detected and the application has registered a stack error handler, it will be 
@@ -277,7 +277,7 @@ const CHAR _tx_thread_special_string[] =
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_thread_initialize                               PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -310,6 +310,12 @@ const CHAR _tx_thread_special_string[] =
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Yuxin Zhou               Modified comment(s), added    */
+/*                                            Execution Profile support,  */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Yuxin Zhou               Modified comment(s), improved */
+/*                                            stack check error handling, */
+/*                                            resulting in version 6.1.9  */   
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_thread_initialize(VOID)
@@ -439,7 +445,7 @@ VOID  _tx_thread_initialize(VOID)
 #ifdef TX_ENABLE_EVENT_TRACE
                             | (((ULONG) 1) << 8)
 #endif
-#ifdef TX_ENABLE_EXECUTION_CHANGE_NOTIFY
+#if defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE)
                             | (((ULONG) 1) << 7)
 #endif
 #if TX_PORT_SPECIFIC_BUILD_OPTIONS != 0

common/src/tx_thread_stack_error_handler.c

@@ -26,7 +26,7 @@
 /* Include necessary system files.  */
 
 #include "tx_api.h"
-#if defined(TX_MISRA_ENABLE) || defined(TX_ENABLE_STACK_CHECKING)
+#if defined(TX_MISRA_ENABLE) || defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 #include "tx_thread.h"
 
 
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_thread_stack_error_handler                      PORTABLE C      */
-/*                                                           6.1.1        */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -72,6 +72,14 @@
 /*  10-16-2020     William E. Lamie         Modified comment(s),          */
 /*                                            fixed link issue,           */
 /*                                            resulting in version 6.1.1  */
+/*  06-02-2021     William E. Lamie         Modified comment(s),          */
+/*                                            fixed link issue, added     */
+/*                                            conditional compilation     */
+/*                                            for ARMv8-M (Cortex M23/33) */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Yuxin Zhou               Modified comment(s), improved */
+/*                                            stack check error handling, */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_thread_stack_error_handler(TX_THREAD *thread_ptr)
@@ -79,7 +87,7 @@ VOID  _tx_thread_stack_error_handler(TX_THREAD *thread_ptr)
 
 TX_INTERRUPT_SAVE_AREA
 
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 
     /* Disable interrupts.  */
     TX_DISABLE
@@ -109,5 +117,4 @@ TX_INTERRUPT_SAVE_AREA
     }
 #endif
 }
-#endif /* TX_MISRA_ENABLE */
-
+#endif

common/src/tx_thread_stack_error_notify.c

@@ -27,7 +27,7 @@
 
 #include "tx_api.h"
 #include "tx_thread.h"
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 #include "tx_trace.h"
 #endif
 
@@ -37,7 +37,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_thread_stack_error_notify                       PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -74,12 +74,19 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  06-02-2021     Yuxin Zhou               Modified comment(s), added    */
+/*                                            conditional compilation     */
+/*                                            for ARMv8-M (Cortex M23/33) */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021     Yuxin Zhou               Modified comment(s), improved */
+/*                                            stack check error handling, */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_thread_stack_error_notify(VOID (*stack_error_handler)(TX_THREAD *thread_ptr))
 {
 
-#ifndef TX_ENABLE_STACK_CHECKING
+#if !defined(TX_ENABLE_STACK_CHECKING) && !defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
 
 UINT        status;
 
@@ -100,6 +107,7 @@ UINT        status;
 
     /* Return completion status.  */
     return(status);
+
 #else
 
 TX_INTERRUPT_SAVE_AREA
@@ -124,4 +132,3 @@ TX_INTERRUPT_SAVE_AREA
     return(TX_SUCCESS);
 #endif
 }
-

common/src/tx_thread_timeout.c

@@ -152,6 +152,7 @@ ULONG           suspension_sequence;
         /* Call any cleanup routines.  */
         if (suspend_cleanup != TX_NULL)
         {
+
             /* Yes, there is a function to call.  */
             (suspend_cleanup)(thread_ptr, suspension_sequence);
         }

common/src/tx_time_get.c

@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_time_get                                        PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.3        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -68,6 +68,8 @@
 /*  05-19-2020     William E. Lamie         Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  12-31-2020     Andres Mlinar            Modified comment(s),          */
+/*                                            resulting in version 6.1.3  */
 /*                                                                        */
 /**************************************************************************/
 ULONG  _tx_time_get(VOID)

common_modules/module_manager/inc/txm_module_manager_dispatch.h

@@ -68,6 +68,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[1], extra_parameters[2]))
             return(TXM_MODULE_INVALID_MEMORY);
     }
@@ -131,6 +134,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -179,6 +185,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -218,6 +227,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -311,6 +323,9 @@ ALIGN_TYPE return_value;
 
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(VOID *)))
             return(TXM_MODULE_INVALID_MEMORY);
+
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
     }
 
     return_value = (ALIGN_TYPE) _txe_byte_allocate(
@@ -342,6 +357,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], extra_parameters[1]))
             return(TXM_MODULE_INVALID_MEMORY);
     }
@@ -404,6 +422,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -455,6 +476,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[6])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -509,6 +533,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -668,6 +695,9 @@ ALIGN_TYPE return_value;
 
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[1], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
+
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
     }
 
     return_value = (ALIGN_TYPE) _txe_event_flags_get(
@@ -701,6 +731,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -745,6 +778,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -784,6 +820,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -886,6 +925,9 @@ ALIGN_TYPE return_value;
 
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
+
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
     }
 
     return_value = (ALIGN_TYPE) _txe_mutex_create(
@@ -967,6 +1009,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1017,6 +1062,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1066,6 +1114,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1151,6 +1202,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[1], extra_parameters[2]))
             return(TXM_MODULE_INVALID_MEMORY);
     }
@@ -1264,6 +1318,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1314,6 +1371,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[5])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1363,6 +1423,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1551,6 +1614,9 @@ ALIGN_TYPE return_value;
 
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
+
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
     }
 
     return_value = (ALIGN_TYPE) _txe_semaphore_create(
@@ -1631,6 +1697,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1675,6 +1744,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1714,6 +1786,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1840,6 +1915,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[9])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[2], extra_parameters[3]))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -1977,6 +2055,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[7])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(UINT)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2056,6 +2137,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[9])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2126,6 +2210,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[9])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2535,6 +2622,9 @@ VOID (*expiration_function)(ULONG);
 
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
+
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[6])))
+            return(TXM_MODULE_INVALID_MEMORY);
     }
 
     /* Is it a disable request?  */
@@ -2646,6 +2736,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(CHAR *)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(UINT)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2691,6 +2784,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[4])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2735,6 +2831,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, param_1, sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[0], sizeof(ULONG)))
             return(TXM_MODULE_INVALID_MEMORY);
 
@@ -2890,6 +2989,12 @@ static ALIGN_TYPE _txm_module_manager_tx_trace_user_event_insert_dispatch(TXM_MO
 
 ALIGN_TYPE return_value;
 
+    if (module_instance -> txm_module_instance_property_flags & TXM_MODULE_MEMORY_PROTECTION)
+    {
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[3])))
+            return(TXM_MODULE_INVALID_MEMORY);
+    }
+    
     return_value = (ALIGN_TYPE) _tx_trace_user_event_insert(
         (ULONG) param_0,
         (ULONG) param_1,
@@ -3015,6 +3120,9 @@ ALIGN_TYPE return_value;
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, param_1))
             return(TXM_MODULE_INVALID_MEMORY);
 
+        if (!TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, (ALIGN_TYPE)extra_parameters, sizeof(ALIGN_TYPE[2])))
+            return(TXM_MODULE_INVALID_MEMORY);
+
         if (!TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, extra_parameters[1], sizeof(VOID *)))
             return(TXM_MODULE_INVALID_MEMORY);
     }

common_modules/module_manager/inc/txm_module_manager_util.h

@@ -26,7 +26,7 @@
 /*  COMPONENT DEFINITION                                   RELEASE        */
 /*                                                                        */
 /*    txm_module_manager_util.h                           PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.6        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Scott Larson, Microsoft Corporation                                 */
@@ -41,6 +41,9 @@
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
 /*  09-30-2020      Scott Larson            Initial Version 6.1           */
+/*  04-02-2021      Scott Larson            Modified comment(s) and       */
+/*                                            optimized object checks,    */
+/*                                            resulting in version 6.1.6  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -53,15 +56,18 @@
     (!(TXM_MODULE_MANAGER_CHECK_INSIDE_DATA(module_instance, obj_ptr, obj_size)))
 
 #define TXM_MODULE_MANAGER_CHECK_INSIDE_CODE(module_instance, obj_ptr, obj_size) \
-    (((obj_ptr) >= (ALIGN_TYPE) module_instance -> txm_module_instance_code_start) && \
+    (((obj_ptr) < ((obj_ptr) + (obj_size))) && \
+     ((obj_ptr) >= (ALIGN_TYPE) module_instance -> txm_module_instance_code_start) && \
      (((obj_ptr) + (obj_size)) <= ((ALIGN_TYPE) module_instance -> txm_module_instance_code_end + 1)))
 
 #define TXM_MODULE_MANAGER_CHECK_OUTSIDE_CODE(module_instance, obj_ptr, obj_size) \
     (!(TXM_MODULE_MANAGER_CHECK_INSIDE_CODE(module_instance, obj_ptr, obj_size)))
 
+/* Add sizeof(TXM_MODULE_ALLOCATED_OBJECT) to pool start because the object can't exist before that. */
 #define TXM_MODULE_MANAGER_CHECK_INSIDE_OBJ_POOL(module_instance, obj_ptr, obj_size) \
     ((_txm_module_manager_object_pool_created == TX_TRUE) && \
-     (((obj_ptr) >= (ALIGN_TYPE) _txm_module_manager_object_pool.tx_byte_pool_start) && \
+     ((obj_ptr) < ((obj_ptr) + (obj_size))) && \
+     (((obj_ptr) >= ((ALIGN_TYPE) _txm_module_manager_object_pool.tx_byte_pool_start + sizeof(TXM_MODULE_ALLOCATED_OBJECT))) && \
       (((obj_ptr) + (obj_size)) <= (ALIGN_TYPE) (_txm_module_manager_object_pool.tx_byte_pool_start + _txm_module_manager_object_pool.tx_byte_pool_size))))
 
 /* Define macros for module.  */
@@ -84,29 +90,29 @@
 
 /* Buffers we read from can be in RW/RO/Shared areas.  */
 #define TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_READ(module_instance, buffer_ptr, buffer_size) \
-    (((void *) (buffer_ptr) == TX_NULL) || \
-     (TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE(module_instance, buffer_ptr, buffer_size)))
+    ((TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE(module_instance, buffer_ptr, buffer_size)) || \
+     ((void *) (buffer_ptr) == TX_NULL))
 
 /* Buffers we write to can only be in RW/Shared areas.  */
 #define TXM_MODULE_MANAGER_PARAM_CHECK_BUFFER_WRITE(module_instance, buffer_ptr, buffer_size) \
-    (((void *) (buffer_ptr) == TX_NULL) || \
-     (TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, buffer_ptr, buffer_size)))
+    ((TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE_DATA(module_instance, buffer_ptr, buffer_size)) || \
+     ((void *) (buffer_ptr) == TX_NULL))
 
 /* Kernel objects should be outside the module at the very least.  */
 #define TXM_MODULE_MANAGER_PARAM_CHECK_OBJECT_FOR_USE(module_instance, obj_ptr, obj_size) \
-    (((void *) (obj_ptr) == TX_NULL) || \
-     (TXM_MODULE_MANAGER_ENSURE_OUTSIDE_MODULE(module_instance, obj_ptr, obj_size)))
+    ((TXM_MODULE_MANAGER_ENSURE_OUTSIDE_MODULE(module_instance, obj_ptr, obj_size)) || \
+     ((void *) (obj_ptr) == TX_NULL))
 
 /* When creating an object, the object must be inside the object pool.  */
 #define TXM_MODULE_MANAGER_PARAM_CHECK_OBJECT_FOR_CREATION(module_instance, obj_ptr, obj_size) \
-    (((void *) (obj_ptr) == TX_NULL) || \
-     (TXM_MODULE_MANAGER_ENSURE_INSIDE_OBJ_POOL(module_instance, obj_ptr, obj_size) && \
-      (_txm_module_manager_object_size_check(obj_ptr, obj_size) == TX_SUCCESS)))
+    ((TXM_MODULE_MANAGER_ENSURE_INSIDE_OBJ_POOL(module_instance, obj_ptr, obj_size) && \
+      (_txm_module_manager_object_size_check(obj_ptr, obj_size) == TX_SUCCESS)) || \
+     ((void *) (obj_ptr) == TX_NULL))
 
 /* Strings we dereference can be in RW/RO/Shared areas.  */
 #define TXM_MODULE_MANAGER_PARAM_CHECK_DEREFERENCE_STRING(module_instance, string_ptr) \
-    (((void *) (string_ptr) == TX_NULL) || \
-     (TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE(module_instance, string_ptr, 1)))
+    ((TXM_MODULE_MANAGER_ENSURE_INSIDE_MODULE(module_instance, string_ptr, 1)) || \
+     ((void *) (string_ptr) == TX_NULL))
 
 #define TXM_MODULE_MANAGER_UTIL_MAX_VALUE_OF_TYPE_UNSIGNED(type) ((1ULL << (sizeof(type) * 8)) - 1)
 

common_modules/module_manager/src/txm_module_manager_kernel_dispatch.c

@@ -41,7 +41,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _txm_module_manager_kernel_dispatch                 PORTABLE C      */
-/*                                                           6.1.3        */
+/*                                                           6.1.6        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Scott Larson, Microsoft Corporation                                 */
@@ -50,6 +50,8 @@
 /*                                                                        */
 /*    This function dispatches the module's kernel request based upon the */
 /*    ID and parameters specified in the request.                         */
+/*    To disallow modules to use specific ThreadX services, define        */
+/*    TXM_***_CALL_NOT_USED (see #ifndefs surrounding each case).         */
 /*                                                                        */
 /*  INPUT                                                                 */
 /*                                                                        */
@@ -83,6 +85,10 @@
 /*  12-31-2020      Scott Larson            Modified comment(s), added    */
 /*                                            port-specific dispatch,     */
 /*                                            resulting in version 6.1.3  */
+/*  04-02-2021      Scott Larson            Modified comment(s),          */
+/*                                            added optional defines to   */
+/*                                            remove unneeded functions,  */
+/*                                            resulting in version 6.1.6  */
 /*                                                                        */
 /**************************************************************************/
 ALIGN_TYPE _txm_module_manager_kernel_dispatch(ULONG kernel_request, ALIGN_TYPE param_0, ALIGN_TYPE param_1, ALIGN_TYPE param_2)
@@ -104,581 +110,773 @@ TXM_MODULE_INSTANCE *module_instance;
 
     switch (kernel_request)
     {
+    #ifndef TXM_BLOCK_ALLOCATE_CALL_NOT_USED
     case TXM_BLOCK_ALLOCATE_CALL:
     {
         return_value = _txm_module_manager_tx_block_allocate_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_CREATE_CALL_NOT_USED
     case TXM_BLOCK_POOL_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_DELETE_CALL_NOT_USED
     case TXM_BLOCK_POOL_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_INFO_GET_CALL_NOT_USED
     case TXM_BLOCK_POOL_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_BLOCK_POOL_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_BLOCK_POOL_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_POOL_PRIORITIZE_CALL_NOT_USED
     case TXM_BLOCK_POOL_PRIORITIZE_CALL:
     {
         return_value = _txm_module_manager_tx_block_pool_prioritize_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_BLOCK_RELEASE_CALL_NOT_USED
     case TXM_BLOCK_RELEASE_CALL:
     {
         return_value = _txm_module_manager_tx_block_release_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_ALLOCATE_CALL_NOT_USED
     case TXM_BYTE_ALLOCATE_CALL:
     {
         return_value = _txm_module_manager_tx_byte_allocate_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_CREATE_CALL_NOT_USED
     case TXM_BYTE_POOL_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_DELETE_CALL_NOT_USED
     case TXM_BYTE_POOL_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_INFO_GET_CALL_NOT_USED
     case TXM_BYTE_POOL_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_BYTE_POOL_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_BYTE_POOL_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_POOL_PRIORITIZE_CALL_NOT_USED
     case TXM_BYTE_POOL_PRIORITIZE_CALL:
     {
         return_value = _txm_module_manager_tx_byte_pool_prioritize_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_BYTE_RELEASE_CALL_NOT_USED
     case TXM_BYTE_RELEASE_CALL:
     {
         return_value = _txm_module_manager_tx_byte_release_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_CREATE_CALL_NOT_USED
     case TXM_EVENT_FLAGS_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_create_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_DELETE_CALL_NOT_USED
     case TXM_EVENT_FLAGS_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_GET_CALL_NOT_USED
     case TXM_EVENT_FLAGS_GET_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_INFO_GET_CALL_NOT_USED
     case TXM_EVENT_FLAGS_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_EVENT_FLAGS_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_EVENT_FLAGS_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_SET_CALL_NOT_USED
     case TXM_EVENT_FLAGS_SET_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_set_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_EVENT_FLAGS_SET_NOTIFY_CALL_NOT_USED
     case TXM_EVENT_FLAGS_SET_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_event_flags_set_notify_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_CREATE_CALL_NOT_USED
     case TXM_MUTEX_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_DELETE_CALL_NOT_USED
     case TXM_MUTEX_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_GET_CALL_NOT_USED
     case TXM_MUTEX_GET_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_get_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_INFO_GET_CALL_NOT_USED
     case TXM_MUTEX_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_MUTEX_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_MUTEX_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_PRIORITIZE_CALL_NOT_USED
     case TXM_MUTEX_PRIORITIZE_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_prioritize_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_MUTEX_PUT_CALL_NOT_USED
     case TXM_MUTEX_PUT_CALL:
     {
         return_value = _txm_module_manager_tx_mutex_put_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_CREATE_CALL_NOT_USED
     case TXM_QUEUE_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_queue_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_DELETE_CALL_NOT_USED
     case TXM_QUEUE_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_queue_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_FLUSH_CALL_NOT_USED
     case TXM_QUEUE_FLUSH_CALL:
     {
         return_value = _txm_module_manager_tx_queue_flush_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_FRONT_SEND_CALL_NOT_USED
     case TXM_QUEUE_FRONT_SEND_CALL:
     {
         return_value = _txm_module_manager_tx_queue_front_send_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_INFO_GET_CALL_NOT_USED
     case TXM_QUEUE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_queue_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_QUEUE_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_queue_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_QUEUE_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_queue_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_PRIORITIZE_CALL_NOT_USED
     case TXM_QUEUE_PRIORITIZE_CALL:
     {
         return_value = _txm_module_manager_tx_queue_prioritize_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_RECEIVE_CALL_NOT_USED
     case TXM_QUEUE_RECEIVE_CALL:
     {
         return_value = _txm_module_manager_tx_queue_receive_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_SEND_CALL_NOT_USED
     case TXM_QUEUE_SEND_CALL:
     {
         return_value = _txm_module_manager_tx_queue_send_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_QUEUE_SEND_NOTIFY_CALL_NOT_USED
     case TXM_QUEUE_SEND_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_queue_send_notify_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_CEILING_PUT_CALL_NOT_USED
     case TXM_SEMAPHORE_CEILING_PUT_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_ceiling_put_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_CREATE_CALL_NOT_USED
     case TXM_SEMAPHORE_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_DELETE_CALL_NOT_USED
     case TXM_SEMAPHORE_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_GET_CALL_NOT_USED
     case TXM_SEMAPHORE_GET_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_get_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_INFO_GET_CALL_NOT_USED
     case TXM_SEMAPHORE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_SEMAPHORE_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_SEMAPHORE_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_PRIORITIZE_CALL_NOT_USED
     case TXM_SEMAPHORE_PRIORITIZE_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_prioritize_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_PUT_CALL_NOT_USED
     case TXM_SEMAPHORE_PUT_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_put_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_SEMAPHORE_PUT_NOTIFY_CALL_NOT_USED
     case TXM_SEMAPHORE_PUT_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_semaphore_put_notify_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_CREATE_CALL_NOT_USED
     case TXM_THREAD_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_DELETE_CALL_NOT_USED
     case TXM_THREAD_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_ENTRY_EXIT_NOTIFY_CALL_NOT_USED
     case TXM_THREAD_ENTRY_EXIT_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_thread_entry_exit_notify_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_IDENTIFY_CALL_NOT_USED
     case TXM_THREAD_IDENTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_thread_identify_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_INFO_GET_CALL_NOT_USED
     case TXM_THREAD_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_thread_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_INTERRUPT_CONTROL_CALL_NOT_USED
     case TXM_THREAD_INTERRUPT_CONTROL_CALL:
     {
         return_value = _txm_module_manager_tx_thread_interrupt_control_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_THREAD_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_thread_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_THREAD_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_thread_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_PREEMPTION_CHANGE_CALL_NOT_USED
     case TXM_THREAD_PREEMPTION_CHANGE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_preemption_change_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_PRIORITY_CHANGE_CALL_NOT_USED
     case TXM_THREAD_PRIORITY_CHANGE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_priority_change_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_RELINQUISH_CALL_NOT_USED
     case TXM_THREAD_RELINQUISH_CALL:
     {
         return_value = _txm_module_manager_tx_thread_relinquish_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_RESET_CALL_NOT_USED
     case TXM_THREAD_RESET_CALL:
     {
         return_value = _txm_module_manager_tx_thread_reset_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_RESUME_CALL_NOT_USED
     case TXM_THREAD_RESUME_CALL:
     {
         return_value = _txm_module_manager_tx_thread_resume_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_SLEEP_CALL_NOT_USED
     case TXM_THREAD_SLEEP_CALL:
     {
         return_value = _txm_module_manager_tx_thread_sleep_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_STACK_ERROR_NOTIFY_CALL_NOT_USED
     case TXM_THREAD_STACK_ERROR_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_thread_stack_error_notify_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_SUSPEND_CALL_NOT_USED
     case TXM_THREAD_SUSPEND_CALL:
     {
         return_value = _txm_module_manager_tx_thread_suspend_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_SYSTEM_SUSPEND_CALL_NOT_USED
     case TXM_THREAD_SYSTEM_SUSPEND_CALL:
     {
         return_value = _txm_module_manager_tx_thread_system_suspend_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_TERMINATE_CALL_NOT_USED
     case TXM_THREAD_TERMINATE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_terminate_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_TIME_SLICE_CHANGE_CALL_NOT_USED
     case TXM_THREAD_TIME_SLICE_CHANGE_CALL:
     {
         return_value = _txm_module_manager_tx_thread_time_slice_change_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_THREAD_WAIT_ABORT_CALL_NOT_USED
     case TXM_THREAD_WAIT_ABORT_CALL:
     {
         return_value = _txm_module_manager_tx_thread_wait_abort_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIME_GET_CALL_NOT_USED
     case TXM_TIME_GET_CALL:
     {
         return_value = _txm_module_manager_tx_time_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIME_SET_CALL_NOT_USED
     case TXM_TIME_SET_CALL:
     {
         return_value = _txm_module_manager_tx_time_set_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_ACTIVATE_CALL_NOT_USED
     case TXM_TIMER_ACTIVATE_CALL:
     {
         return_value = _txm_module_manager_tx_timer_activate_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_CHANGE_CALL_NOT_USED
     case TXM_TIMER_CHANGE_CALL:
     {
         return_value = _txm_module_manager_tx_timer_change_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_CREATE_CALL_NOT_USED
     case TXM_TIMER_CREATE_CALL:
     {
         return_value = _txm_module_manager_tx_timer_create_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_DEACTIVATE_CALL_NOT_USED
     case TXM_TIMER_DEACTIVATE_CALL:
     {
         return_value = _txm_module_manager_tx_timer_deactivate_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_DELETE_CALL_NOT_USED
     case TXM_TIMER_DELETE_CALL:
     {
         return_value = _txm_module_manager_tx_timer_delete_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_INFO_GET_CALL_NOT_USED
     case TXM_TIMER_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_timer_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_PERFORMANCE_INFO_GET_CALL_NOT_USED
     case TXM_TIMER_PERFORMANCE_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_timer_performance_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TIMER_PERFORMANCE_SYSTEM_INFO_GET_CALL_NOT_USED
     case TXM_TIMER_PERFORMANCE_SYSTEM_INFO_GET_CALL:
     {
         return_value = _txm_module_manager_tx_timer_performance_system_info_get_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_BUFFER_FULL_NOTIFY_CALL_NOT_USED
     case TXM_TRACE_BUFFER_FULL_NOTIFY_CALL:
     {
         return_value = _txm_module_manager_tx_trace_buffer_full_notify_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_DISABLE_CALL_NOT_USED
     case TXM_TRACE_DISABLE_CALL:
     {
         return_value = _txm_module_manager_tx_trace_disable_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_ENABLE_CALL_NOT_USED
     case TXM_TRACE_ENABLE_CALL:
     {
         return_value = _txm_module_manager_tx_trace_enable_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_EVENT_FILTER_CALL_NOT_USED
     case TXM_TRACE_EVENT_FILTER_CALL:
     {
         return_value = _txm_module_manager_tx_trace_event_filter_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_EVENT_UNFILTER_CALL_NOT_USED
     case TXM_TRACE_EVENT_UNFILTER_CALL:
     {
         return_value = _txm_module_manager_tx_trace_event_unfilter_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_INTERRUPT_CONTROL_CALL_NOT_USED
     case TXM_TRACE_INTERRUPT_CONTROL_CALL:
     {
         return_value = _txm_module_manager_tx_trace_interrupt_control_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_ISR_ENTER_INSERT_CALL_NOT_USED
     case TXM_TRACE_ISR_ENTER_INSERT_CALL:
     {
         return_value = _txm_module_manager_tx_trace_isr_enter_insert_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_ISR_EXIT_INSERT_CALL_NOT_USED
     case TXM_TRACE_ISR_EXIT_INSERT_CALL:
     {
         return_value = _txm_module_manager_tx_trace_isr_exit_insert_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_TRACE_USER_EVENT_INSERT_CALL_NOT_USED
     case TXM_TRACE_USER_EVENT_INSERT_CALL:
     {
         return_value = _txm_module_manager_tx_trace_user_event_insert_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MODULE_OBJECT_ALLOCATE_CALL_NOT_USED
     case TXM_MODULE_OBJECT_ALLOCATE_CALL:
     {
         return_value = _txm_module_manager_txm_module_object_allocate_dispatch(module_instance, param_0, param_1);
         break;
     }
+    #endif
 
+    #ifndef TXM_MODULE_OBJECT_DEALLOCATE_CALL_NOT_USED
     case TXM_MODULE_OBJECT_DEALLOCATE_CALL:
     {
         return_value = _txm_module_manager_txm_module_object_deallocate_dispatch(module_instance, param_0);
         break;
     }
+    #endif
 
+    #ifndef TXM_MODULE_OBJECT_POINTER_GET_CALL_NOT_USED
     case TXM_MODULE_OBJECT_POINTER_GET_CALL:
     {
         return_value = _txm_module_manager_txm_module_object_pointer_get_dispatch(module_instance, param_0, param_1, param_2);
         break;
     }
+    #endif
 
+    #ifndef TXM_MODULE_OBJECT_POINTER_GET_EXTENDED_CALL_NOT_USED
     case TXM_MODULE_OBJECT_POINTER_GET_EXTENDED_CALL:
     {
         return_value = _txm_module_manager_txm_module_object_pointer_get_extended_dispatch(module_instance, param_0, param_1, (ALIGN_TYPE *) param_2);
         break;
     }
+    #endif
 
     default:
     {

common_modules/module_manager/src/txm_module_manager_stop.c

@@ -60,7 +60,7 @@ extern UINT  _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _txm_module_manager_stop                            PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.5        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Scott Larson, Microsoft Corporation                                 */
@@ -109,6 +109,9 @@ extern UINT  _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
 /*  09-30-2020      Scott Larson            Initial Version 6.1           */
+/*  03-02-2021      Scott Larson            Modified comments, fix        */
+/*                                            object delete underflow,    */
+/*                                            resulting in version 6.1.5  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _txm_module_manager_stop(TXM_MODULE_INSTANCE *module_instance)
@@ -531,9 +534,8 @@ TXM_MODULE_ALLOCATED_OBJECT     *object_ptr;
 #endif
 
     /* Delete the allocated objects for this module.  */
-    while (module_instance -> txm_module_instance_object_list_count--)
+    while (module_instance -> txm_module_instance_object_list_count != 0)
     {
-
         /* Pickup the current object pointer.  */
         object_ptr =  module_instance -> txm_module_instance_object_list_head;
 
@@ -542,6 +544,9 @@ TXM_MODULE_ALLOCATED_OBJECT     *object_ptr;
 
         /* Release the object.  */
         _tx_byte_release((VOID *) object_ptr);
+
+        /* Decrement count.  */
+        module_instance -> txm_module_instance_object_list_count--;
     }
 
     /* Set the allocated list head pointer to NULL.  */

common_modules/module_manager/src/txm_module_manager_thread_create.c

@@ -108,10 +108,8 @@ UINT                    core_index;
 #endif
 TX_THREAD               *next_thread;
 TX_THREAD               *previous_thread;
-#ifndef TX_DISABLE_PREEMPTION_THRESHOLD
 TX_THREAD               *saved_thread_ptr;
 UINT                    saved_threshold =  ((UINT) 0);
-#endif
 UCHAR                   *temp_ptr;
 #ifdef TX_ENABLE_STACK_CHECKING
 ALIGN_TYPE              new_stack_start;

common_smp/inc/tx_api.h

@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    tx_api.h                                            PORTABLE SMP    */
-/*                                                           6.1.3        */
+/*                                                           6.1.9        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -50,6 +50,23 @@
 /*  12-31-2020      William E. Lamie        Modified comment(s), and      */
 /*                                            increased patch version,    */
 /*                                            resulting in version 6.1.3  */
+/*  03-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            order defines numerically,  */
+/*                                            add option to remove FileX  */
+/*                                            pointer, fix whitespace,    */
+/*                                            resulting in version 6.1.5  */
+/*  04-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.6  */
+/*  06-02-2021      Scott Larson            Added options for multiple    */
+/*                                            block pool search & delay,  */
+/*                                            resulting in version 6.1.7  */
+/*  08-02-2021      Scott Larson            Modified comment(s), and      */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.8  */
+/*  10-15-2021      Yuxin Zhou              Modified comment(s),          */
+/*                                            update patch number,        */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -80,6 +97,15 @@ extern   "C" {
 #endif
 
 
+/* Define default block pool search and delay values.  */
+#ifndef TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH
+#define TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH    20
+#endif
+#ifndef TX_BTYE_POOL_DELAY_VALUE
+#define TX_BYTE_POOL_DELAY_VALUE              3
+#endif
+
+
 /* Define basic constants for the ThreadX kernel.  */
 
 
@@ -89,7 +115,7 @@ extern   "C" {
 #define AZURE_RTOS_THREADX
 #define THREADX_MAJOR_VERSION           6
 #define THREADX_MINOR_VERSION           1
-#define THREADX_PATCH_VERSION           3
+#define THREADX_PATCH_VERSION           9
 
 /* Define the following symbol for backward compatibility */
 #define EL_PRODUCT_THREADX
@@ -150,7 +176,6 @@ extern   "C" {
 
 #define TX_SUCCESS                      ((UINT) 0x00)
 #define TX_DELETED                      ((UINT) 0x01)
-#define TX_NO_MEMORY                    ((UINT) 0x10)
 #define TX_POOL_ERROR                   ((UINT) 0x02)
 #define TX_PTR_ERROR                    ((UINT) 0x03)
 #define TX_WAIT_ERROR                   ((UINT) 0x04)
@@ -165,6 +190,7 @@ extern   "C" {
 #define TX_NO_INSTANCE                  ((UINT) 0x0D)
 #define TX_THREAD_ERROR                 ((UINT) 0x0E)
 #define TX_PRIORITY_ERROR               ((UINT) 0x0F)
+#define TX_NO_MEMORY                    ((UINT) 0x10)
 #define TX_START_ERROR                  ((UINT) 0x10)
 #define TX_DELETE_ERROR                 ((UINT) 0x11)
 #define TX_RESUME_ERROR                 ((UINT) 0x12)
@@ -449,7 +475,9 @@ typedef struct TX_THREAD_STRUCT
     /************* End of ThreadX SMP thread control block extensions.  *************/
 
     /* Define a pointer type for FileX extensions.  */
+#ifndef TX_NO_FILEX_POINTER
     VOID                *tx_thread_filex_ptr;
+#endif
 
     /* Define the priority inheritance variables. These will be used
        to manage priority inheritance changes applied to this thread
@@ -1184,7 +1212,6 @@ UINT    _tx_el_interrupt_control(UINT new_posture);
 
 #ifdef TX_ENABLE_MULTI_ERROR_CHECKING
 
-
 /* Services with MULTI runtime error checking ThreadX.  */
 
 #define tx_block_allocate                           _txr_block_allocate
@@ -1742,7 +1769,6 @@ UINT        _tx_trace_user_event_insert(ULONG event_id, ULONG info_field_1, ULON
 UINT        _tx_trace_interrupt_control(UINT new_posture);
 
 
-
 /* Add a default macro that can be re-defined in tx_port.h to add default processing when a thread starts. Common usage
    would be for enabling floating point for a thread by default, however, the additional processing could be anything
    defined in tx_port.h.  */

common_smp/inc/tx_block_pool.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_byte_pool.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_event_flags.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_initialize.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_mutex.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_queue.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_semaphore.h

@@ -41,7 +41,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 

common_smp/inc/tx_timer.h

@@ -201,8 +201,10 @@ TIMER_DECLARE  ULONG            _tx_timer_performance_expiration_count;
 
 TIMER_DECLARE  ULONG            _tx_timer_performance__expiration_adjust_count;
 
+
 #endif
 
+
 /* Define default post timer delete macro to whitespace, if it hasn't been defined previously (typically in tx_port.h).  */
 
 #ifndef TX_TIMER_DELETE_PORT_COMPLETION
@@ -211,4 +213,3 @@ TIMER_DECLARE  ULONG            _tx_timer_performance__expiration_adjust_count;
 
 
 #endif
-

common_smp/inc/tx_trace.h

@@ -40,7 +40,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 
@@ -524,6 +526,7 @@ VOID    _tx_trace_initialize(VOID);
 VOID    _tx_trace_object_register(UCHAR object_type, VOID *object_ptr, CHAR *object_name, ULONG parameter_1, ULONG parameter_2);
 VOID    _tx_trace_object_unregister(VOID *object_ptr);
 
+
 #ifdef TX_ENABLE_EVENT_TRACE
 
 /* Check for MISRA compliance requirements.  */
@@ -556,6 +559,5 @@ UCHAR                   *_tx_misra_entry_to_uchar_pointer_convert(TX_TRACE_BUFFE
 #endif
 #endif
 #endif
-
 #endif
 

common_smp/inc/tx_user_sample.h

@@ -26,7 +26,7 @@
 /*  PORT SPECIFIC C INFORMATION                            RELEASE        */
 /*                                                                        */
 /*    tx_user.h                                           PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.1.9        */
 /*                                                                        */
 /*  AUTHOR                                                                */
 /*                                                                        */
@@ -44,7 +44,20 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020      William E. Lamie        Initial Version 6.0           */
+/*  09-30-2020      Yuxin Zhou              Modified comment(s),          */
+/*                                            resulting in version 6.1    */
+/*  03-02-2021      Scott Larson            Modified comment(s),          */
+/*                                            added option to remove      */
+/*                                            FileX pointer,              */
+/*                                            resulting in version 6.1.5  */
+/*  06-02-2021      Scott Larson            Added options for multiple    */
+/*                                            block pool search & delay,  */
+/*                                            resulting in version 6.1.7  */
+/*  10-15-2021      Yuxin Zhou              Modified comment(s), added    */
+/*                                            user-configurable symbol    */
+/*                                            TX_TIMER_TICKS_PER_SECOND   */
+/*                                            resulting in version 6.1.9  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -74,6 +87,7 @@
         TX_DISABLE_PREEMPTION_THRESHOLD
         TX_DISABLE_REDUNDANT_CLEARING
         TX_DISABLE_NOTIFY_CALLBACKS
+        TX_NO_FILEX_POINTER
         TX_NOT_INTERRUPTABLE
         TX_TIMER_PROCESS_IN_ISR
 
@@ -96,6 +110,25 @@
 #define TX_TIMER_THREAD_PRIORITY                ????
 */
 
+/* Define the common timer tick reference for use by other middleware components. The default
+   value is 10ms (i.e. 100 ticks, defined in tx_api.h), but may be replaced by a port-specific
+   version in tx_port.h or here.
+   Note: the actual hardware timer value may need to be changed (usually in tx_initialize_low_level).  */
+
+/*
+#define TX_TIMER_TICKS_PER_SECOND       ((ULONG) 100)
+*/
+
+/* Determine if there is a FileX pointer in the thread control block.
+   By default, the pointer is there for legacy/backwards compatibility.
+   The pointer must also be there for applications using FileX.
+   Define this to save space in the thread control block.
+*/
+
+/*
+#define TX_NO_FILEX_POINTER
+*/
+
 /* Determine if timer expirations (application timers, timeouts, and tx_thread_sleep calls
    should be processed within the a system timer thread or directly in the timer ISR.
    By default, the timer thread is used. When the following is defined, the timer expiration
@@ -153,7 +186,7 @@
    processing when not needed. The user will also have to comment out the call to
    tx_timer_interrupt, which is typically made from assembly language in
    tx_initialize_low_level. Note: if TX_NO_TIMER is used, the define TX_TIMER_PROCESS_IN_ISR
-   must also be used.  */
+   must also be used and tx_timer_initialize must be removed from ThreadX library.  */
 
 /*
 #define TX_NO_TIMER
@@ -253,5 +286,17 @@
 #define TX_TIMER_ENABLE_PERFORMANCE_INFO
 */
 
+/*  Override options for byte pool searches of multiple blocks. */
+
+/*
+#define TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH    20
+*/
+
+/*  Override options for byte pool search delay to avoid thrashing. */
+
+/*
+#define TX_BYTE_POOL_DELAY_VALUE              3
+*/
+
 #endif
 

common_smp/src/tx_block_allocate.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_allocate(TX_BLOCK_POOL *pool_ptr, VOID **block_ptr, ULONG wait_option)

common_smp/src/tx_block_pool_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_block_pool_cleanup(TX_THREAD *thread_ptr, ULONG suspension_sequence)

common_smp/src/tx_block_pool_create.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_create(TX_BLOCK_POOL *pool_ptr, CHAR *name_ptr, ULONG block_size,

common_smp/src/tx_block_pool_delete.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_delete(TX_BLOCK_POOL *pool_ptr)

common_smp/src/tx_block_pool_info_get.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_info_get(TX_BLOCK_POOL *pool_ptr, CHAR **name, ULONG *available_blocks,

common_smp/src/tx_block_pool_initialize.c

@@ -102,7 +102,12 @@ ULONG            _tx_block_pool_performance_timeout_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_block_pool_initialize(VOID)

common_smp/src/tx_block_pool_performance_info_get.c

@@ -75,7 +75,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_performance_info_get(TX_BLOCK_POOL *pool_ptr, ULONG *allocates, ULONG *releases,

common_smp/src/tx_block_pool_performance_system_info_get.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_performance_system_info_get(ULONG *allocates, ULONG *releases, ULONG *suspensions, ULONG *timeouts)

common_smp/src/tx_block_pool_prioritize.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_pool_prioritize(TX_BLOCK_POOL *pool_ptr)

common_smp/src/tx_block_release.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_block_release(VOID *block_ptr)

common_smp/src/tx_byte_allocate.c

@@ -74,7 +74,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_allocate(TX_BYTE_POOL *pool_ptr, VOID **memory_ptr, ULONG memory_size,  ULONG wait_option)

common_smp/src/tx_byte_pool_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_byte_pool_cleanup(TX_THREAD *thread_ptr, ULONG suspension_sequence)

common_smp/src/tx_byte_pool_create.c

@@ -68,7 +68,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_create(TX_BYTE_POOL *pool_ptr, CHAR *name_ptr, VOID *pool_start, ULONG pool_size)

common_smp/src/tx_byte_pool_delete.c

@@ -73,7 +73,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_delete(TX_BYTE_POOL *pool_ptr)

common_smp/src/tx_byte_pool_info_get.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_info_get(TX_BYTE_POOL *pool_ptr, CHAR **name, ULONG *available_bytes,

common_smp/src/tx_byte_pool_initialize.c

@@ -117,7 +117,12 @@ ULONG            _tx_byte_pool_performance_timeout_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_byte_pool_initialize(VOID)

common_smp/src/tx_byte_pool_performance_info_get.c

@@ -83,7 +83,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_performance_info_get(TX_BYTE_POOL *pool_ptr, ULONG *allocates, ULONG *releases,

common_smp/src/tx_byte_pool_performance_system_info_get.c

@@ -80,7 +80,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_performance_system_info_get(ULONG *allocates, ULONG *releases,

common_smp/src/tx_byte_pool_prioritize.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_pool_prioritize(TX_BYTE_POOL *pool_ptr)

common_smp/src/tx_byte_pool_search.c

@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_byte_pool_search                               PORTABLE SMP     */
-/*                                                           6.1          */
+/*                                                           6.1.7        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -77,6 +77,10 @@
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
 /*  09-30-2020      William E. Lamie        Initial Version 6.1           */
+/*  06-02-2021      Scott Larson            Improve possible free bytes   */
+/*                                            calculation, and reduced    */
+/*                                            number of search resets,    */
+/*                                            resulting in version 6.1.7  */
 /*                                                                        */
 /**************************************************************************/
 UCHAR  *_tx_byte_pool_search(TX_BYTE_POOL *pool_ptr, ULONG memory_size)
@@ -94,7 +98,8 @@ UINT            first_free_block_found =  TX_FALSE;
 TX_THREAD       *thread_ptr;
 ALIGN_TYPE      *free_ptr;
 UCHAR           *work_ptr;
-
+volatile ULONG  delay_count;
+ULONG           total_theoretical_available;
 #ifdef TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH
 UINT            blocks_searched =  ((UINT) 0);
 #endif
@@ -104,7 +109,9 @@ UINT            blocks_searched =  ((UINT) 0);
     TX_DISABLE
 
     /* First, determine if there are enough bytes in the pool.  */
-    if (memory_size >= pool_ptr -> tx_byte_pool_available)
+    /* Theoretical bytes available = free bytes + ((fragments-2) * overhead of each block) */
+    total_theoretical_available = pool_ptr -> tx_byte_pool_available + ((pool_ptr -> tx_byte_pool_fragments - 2) * ((sizeof(UCHAR *)) + (sizeof(ALIGN_TYPE))));
+    if (memory_size >= total_theoretical_available)
     {
 
         /* Restore interrupts.  */
@@ -148,7 +155,6 @@ UINT            blocks_searched =  ((UINT) 0);
                 /* Determine if this is the first free block.  */
                 if (first_free_block_found == TX_FALSE)
                 {
-                
                     /* This is the first free block.  */
                     pool_ptr->tx_byte_pool_search =  current_ptr;
 
@@ -171,7 +177,6 @@ UINT            blocks_searched =  ((UINT) 0);
                    has been satisfied!  */
                 if (available_bytes >= memory_size)
                 {
-
                     /* Get out of the search loop!  */
                     break;
                 }
@@ -210,14 +215,12 @@ UINT            blocks_searched =  ((UINT) 0);
                         /* See if the search pointer is affected.  */
                         if (pool_ptr -> tx_byte_pool_search ==  next_ptr)
                         {
-                    
                             /* Yes, update the search pointer.   */
                             pool_ptr -> tx_byte_pool_search =  current_ptr;
                         }
                     }
                     else
                     {
-
                         /* Neighbor is not free so we can skip over it!  */
                         next_block_link_ptr =  TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(next_ptr);
                         current_ptr =  *next_block_link_ptr;
@@ -283,11 +286,22 @@ UINT            blocks_searched =  ((UINT) 0);
             /* Disable interrupts.  */
             TX_DISABLE
 #endif
-        
             /* Determine if anything has changed in terms of pool ownership.  */
             if (pool_ptr -> tx_byte_pool_owner != thread_ptr)
             {
+                /* Loop to delay changing the ownership back to avoid thrashing.  */
+                delay_count =  0;
+                do
+                {
+                    /* Restore interrupts temporarily.  */
+                    TX_RESTORE
 
+                    /* Increment the delay counter.  */
+                    delay_count++;
+
+                    /* Disable interrupts.  */
+                    TX_DISABLE
+                } while (delay_count < ((ULONG) TX_BYTE_POOL_DELAY_VALUE));
                 /* Pool changed ownership in the brief period interrupts were
                    enabled.  Reset the search.  */
                 current_ptr =      pool_ptr -> tx_byte_pool_search;

common_smp/src/tx_byte_release.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_byte_release(VOID *memory_ptr)

common_smp/src/tx_event_flags_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_event_flags_cleanup(TX_THREAD  *thread_ptr, ULONG suspension_sequence)

common_smp/src/tx_event_flags_create.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_create(TX_EVENT_FLAGS_GROUP *group_ptr, CHAR *name_ptr)

common_smp/src/tx_event_flags_delete.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_delete(TX_EVENT_FLAGS_GROUP *group_ptr)

common_smp/src/tx_event_flags_get.c

@@ -73,7 +73,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_get(TX_EVENT_FLAGS_GROUP *group_ptr, ULONG requested_flags,

common_smp/src/tx_event_flags_info_get.c

@@ -74,7 +74,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_info_get(TX_EVENT_FLAGS_GROUP *group_ptr, CHAR **name, ULONG *current_flags,

common_smp/src/tx_event_flags_initialize.c

@@ -103,7 +103,12 @@ ULONG                  _tx_event_flags_performance_timeout_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_event_flags_initialize(VOID)

common_smp/src/tx_event_flags_performance_info_get.c

@@ -76,7 +76,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_performance_info_get(TX_EVENT_FLAGS_GROUP *group_ptr, ULONG *sets, ULONG *gets,

common_smp/src/tx_event_flags_performance_system_info_get.c

@@ -73,7 +73,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_performance_system_info_get(ULONG *sets, ULONG *gets, ULONG *suspensions, ULONG *timeouts)

common_smp/src/tx_event_flags_set.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_set(TX_EVENT_FLAGS_GROUP *group_ptr, ULONG flags_to_set, UINT set_option)

common_smp/src/tx_event_flags_set_notify.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_event_flags_set_notify(TX_EVENT_FLAGS_GROUP *group_ptr, VOID (*events_set_notify)(TX_EVENT_FLAGS_GROUP *notify_group_ptr))

common_smp/src/tx_initialize_high_level.c

@@ -105,7 +105,9 @@ VOID     *_tx_initialize_unused_memory;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID    _tx_initialize_high_level(VOID)

common_smp/src/tx_mutex_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_mutex_cleanup(TX_THREAD  *thread_ptr, ULONG suspension_sequence)
@@ -249,7 +251,9 @@ TX_THREAD           *previous_thread;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_mutex_thread_release(TX_THREAD  *thread_ptr)

common_smp/src/tx_mutex_create.c

@@ -68,7 +68,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_create(TX_MUTEX *mutex_ptr, CHAR *name_ptr, UINT inherit)

common_smp/src/tx_mutex_delete.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_delete(TX_MUTEX *mutex_ptr)

common_smp/src/tx_mutex_get.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_get(TX_MUTEX *mutex_ptr, ULONG wait_option)

common_smp/src/tx_mutex_info_get.c

@@ -73,7 +73,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_info_get(TX_MUTEX *mutex_ptr, CHAR **name, ULONG *count, TX_THREAD **owner,

common_smp/src/tx_mutex_initialize.c

@@ -112,7 +112,12 @@ ULONG        _tx_mutex_performance__priority_inheritance_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_mutex_initialize(VOID)

common_smp/src/tx_mutex_performance_info_get.c

@@ -78,7 +78,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_performance_info_get(TX_MUTEX *mutex_ptr, ULONG *puts, ULONG *gets,

common_smp/src/tx_mutex_performance_system_info_get.c

@@ -77,7 +77,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_performance_system_info_get(ULONG *puts, ULONG *gets, ULONG *suspensions,

common_smp/src/tx_mutex_prioritize.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_prioritize(TX_MUTEX *mutex_ptr)

common_smp/src/tx_mutex_put.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_mutex_put(TX_MUTEX *mutex_ptr)

common_smp/src/tx_queue_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_queue_cleanup(TX_THREAD  *thread_ptr, ULONG suspension_sequence)

common_smp/src/tx_queue_create.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_create(TX_QUEUE *queue_ptr, CHAR *name_ptr, UINT message_size,

common_smp/src/tx_queue_delete.c

@@ -68,7 +68,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_delete(TX_QUEUE *queue_ptr)

common_smp/src/tx_queue_flush.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_flush(TX_QUEUE *queue_ptr)

common_smp/src/tx_queue_front_send.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_front_send(TX_QUEUE *queue_ptr, VOID *source_ptr, ULONG wait_option)

common_smp/src/tx_queue_info_get.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_info_get(TX_QUEUE *queue_ptr, CHAR **name, ULONG *enqueued, ULONG *available_storage,

common_smp/src/tx_queue_initialize.c

@@ -110,7 +110,12 @@ ULONG        _tx_queue_performance_timeout_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_queue_initialize(VOID)

common_smp/src/tx_queue_performance_info_get.c

@@ -77,7 +77,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_performance_info_get(TX_QUEUE *queue_ptr, ULONG *messages_sent, ULONG *messages_received,

common_smp/src/tx_queue_performance_system_info_get.c

@@ -77,7 +77,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_performance_system_info_get(ULONG *messages_sent, ULONG *messages_received,

common_smp/src/tx_queue_prioritize.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_prioritize(TX_QUEUE *queue_ptr)

common_smp/src/tx_queue_receive.c

@@ -74,7 +74,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_receive(TX_QUEUE *queue_ptr, VOID *destination_ptr, ULONG wait_option)

common_smp/src/tx_queue_send.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_send(TX_QUEUE *queue_ptr, VOID *source_ptr, ULONG wait_option)

common_smp/src/tx_queue_send_notify.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_queue_send_notify(TX_QUEUE *queue_ptr, VOID (*queue_send_notify)(TX_QUEUE *notify_queue_ptr))

common_smp/src/tx_semaphore_ceiling_put.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_ceiling_put(TX_SEMAPHORE *semaphore_ptr, ULONG ceiling)

common_smp/src/tx_semaphore_cleanup.c

@@ -70,7 +70,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_semaphore_cleanup(TX_THREAD *thread_ptr, ULONG suspension_sequence)

common_smp/src/tx_semaphore_create.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_create(TX_SEMAPHORE *semaphore_ptr, CHAR *name_ptr, ULONG initial_count)

common_smp/src/tx_semaphore_delete.c

@@ -69,7 +69,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_delete(TX_SEMAPHORE *semaphore_ptr)

common_smp/src/tx_semaphore_get.c

@@ -68,7 +68,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_get(TX_SEMAPHORE *semaphore_ptr, ULONG wait_option)

common_smp/src/tx_semaphore_info_get.c

@@ -72,7 +72,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_info_get(TX_SEMAPHORE *semaphore_ptr, CHAR **name, ULONG *current_value,

common_smp/src/tx_semaphore_initialize.c

@@ -102,7 +102,12 @@ ULONG            _tx_semaphore_performance_timeout_count;
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            opt out of function when    */
+/*                                            TX_INLINE_INITIALIZATION is */
+/*                                            defined,                    */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 VOID  _tx_semaphore_initialize(VOID)

common_smp/src/tx_semaphore_performance_info_get.c

@@ -75,7 +75,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_performance_info_get(TX_SEMAPHORE *semaphore_ptr, ULONG *puts, ULONG *gets,

common_smp/src/tx_semaphore_performance_system_info_get.c

@@ -73,7 +73,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_performance_system_info_get(ULONG *puts, ULONG *gets, ULONG *suspensions, ULONG *timeouts)

common_smp/src/tx_semaphore_prioritize.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_prioritize(TX_SEMAPHORE *semaphore_ptr)

common_smp/src/tx_semaphore_put.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_put(TX_SEMAPHORE *semaphore_ptr)

common_smp/src/tx_semaphore_put_notify.c

@@ -67,7 +67,9 @@
 /*                                                                        */
 /*    DATE              NAME                      DESCRIPTION             */
 /*                                                                        */
-/*  09-30-2020     William E. Lamie         Initial Version 6.1           */
+/*  05-19-2020     William E. Lamie         Initial Version 6.0           */
+/*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
+/*                                            resulting in version 6.1    */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_semaphore_put_notify(TX_SEMAPHORE *semaphore_ptr, VOID (*semaphore_put_notify)(TX_SEMAPHORE *notify_semaphore_ptr))

common_smp/src/tx_thread_create.c

@@ -37,7 +37,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _tx_thread_create                                  PORTABLE SMP     */
-/*                                                           6.1.3        */
+/*                                                           6.1.8        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    William E. Lamie, Microsoft Corporation                             */
@@ -83,6 +83,8 @@
 /*  09-30-2020      William E. Lamie        Initial Version 6.1           */
 /*  12-31-2020      Andres Mlinar           Modified comment(s),          */
 /*                                            resulting in version 6.1.3  */
+/*  08-02-2021      Scott Larson            Removed unneeded cast,        */
+/*                                            resulting in version 6.1.8  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
@@ -120,7 +122,7 @@ ALIGN_TYPE              updated_stack_start;
 
     /* Ensure the starting stack address is evenly aligned.  */
     new_stack_start =  TX_POINTER_TO_ALIGN_TYPE_CONVERT(stack_start);
-    updated_stack_start =  ((((ULONG) new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
+    updated_stack_start =  (((new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
 
     /* Determine if the starting stack address is different.  */
     if (new_stack_start != updated_stack_start)