Skip to content

Commit d0dab58

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.8
1 parent 244365f commit d0dab58

File tree

651 files changed

+11659
-10719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

651 files changed

+11659
-10719
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ add_library("azrtos::${PROJECT_NAME}" ALIAS ${PROJECT_NAME})
2121
set(CUSTOM_INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/custom_inc)
2222

2323
# Pick up the port specific variables and apply them
24-
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
24+
if(DEFINED THREADX_CUSTOM_PORT)
25+
add_subdirectory(${THREADX_CUSTOM_PORT} threadx_port)
26+
else()
27+
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/ports/${THREADX_ARCH}/${THREADX_TOOLCHAIN})
28+
endif()
2529

2630
# Pick up the common stuff
2731
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/common)

‎cmake/arm-none-eabi.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
1717

1818
set(CMAKE_C_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} ${SPEC_FLAGS} -fdata-sections -ffunction-sections -mlong-calls" CACHE INTERNAL "c compiler flags")
1919
set(CMAKE_CXX_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -fdata-sections -ffunction-sections -fno-rtti -fno-exceptions -mlong-calls" CACHE INTERNAL "cxx compiler flags")
20-
set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
20+
set(CMAKE_ASM_FLAGS "${MCPU_FLAGS} ${VFP_FLAGS} -x assembler-with-cpp" CACHE INTERNAL "asm compiler flags")
2121
set(CMAKE_EXE_LINKER_FLAGS "${MCPU_FLAGS} ${LD_FLAGS} -Wl,--gc-sections" CACHE INTERNAL "exe link flags")
2222

2323
SET(CMAKE_C_FLAGS_DEBUG "-Og -g -ggdb3" CACHE INTERNAL "c debug compiler flags")

‎common/inc/tx_api.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* tx_api.h PORTABLE C */
29-
/* 6.1.7 */
29+
/* 6.1.8 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -72,6 +72,9 @@
7272
/* 06-02-2021 Yuxin Zhou Modified comment(s), added */
7373
/* Execution Profile support, */
7474
/* resulting in version 6.1.7 */
75+
/* 08-02-2021 Scott Larson Modified comment(s), and */
76+
/* update patch number, */
77+
/* resulting in version 6.1.8 */
7578
/* */
7679
/**************************************************************************/
7780

@@ -104,7 +107,7 @@ extern "C" {
104107
#define AZURE_RTOS_THREADX
105108
#define THREADX_MAJOR_VERSION 6
106109
#define THREADX_MINOR_VERSION 1
107-
#define THREADX_PATCH_VERSION 7
110+
#define THREADX_PATCH_VERSION 8
108111

109112
/* Define the following symbol for backward compatibility */
110113
#define EL_PRODUCT_THREADX

‎common/src/tx_thread_create.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/* FUNCTION RELEASE */
3737
/* */
3838
/* _tx_thread_create PORTABLE C */
39-
/* 6.1.7 */
39+
/* 6.1.8 */
4040
/* AUTHOR */
4141
/* */
4242
/* William E. Lamie, Microsoft Corporation */
@@ -79,14 +79,15 @@
7979
/* */
8080
/* DATE NAME DESCRIPTION */
8181
/* */
82-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
83-
/* 09-30-2020 William E. Lamie Modified comment(s), and */
82+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
83+
/* 09-30-2020 William E. Lamie Modified comment(s), and */
8484
/* changed stack calculations */
8585
/* to use ALIGN_TYPE integers, */
8686
/* resulting in version 6.1 */
87-
/* 06-02-2021 William E. Lamie Modified comment(s), and */
87+
/* 06-02-2021 William E. Lamie Modified comment(s), and */
8888
/* supported TX_MISRA_ENABLE, */
89-
/* resulting in version 6.1.7 */
89+
/* 08-02-2021 Scott Larson Removed unneeded cast, */
90+
/* resulting in version 6.1.8 */
9091
/* */
9192
/**************************************************************************/
9293
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ULONG id), ULONG entry_input,
@@ -128,7 +129,7 @@ ALIGN_TYPE updated_stack_start;
128129
#else
129130
new_stack_start = TX_POINTER_TO_ALIGN_TYPE_CONVERT(stack_start);
130131
#endif /* TX_MISRA_ENABLE */
131-
updated_stack_start = ((((ULONG) new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
132+
updated_stack_start = (((new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
132133

133134
/* Determine if the starting stack address is different. */
134135
if (new_stack_start != updated_stack_start)

‎common_modules/inc/txm_module_user.h‎ renamed to ‎common_modules/inc/txm_module_user_sample.h‎

File renamed without changes.

‎common_smp/inc/tx_api.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* tx_api.h PORTABLE SMP */
29-
/* 6.1.7 */
29+
/* 6.1.8 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +61,9 @@
6161
/* 06-02-2021 Scott Larson Added options for multiple */
6262
/* block pool search & delay, */
6363
/* resulting in version 6.1.7 */
64+
/* 08-02-2021 Scott Larson Modified comment(s), and */
65+
/* update patch number, */
66+
/* resulting in version 6.1.8 */
6467
/* */
6568
/**************************************************************************/
6669

@@ -109,7 +112,7 @@ extern "C" {
109112
#define AZURE_RTOS_THREADX
110113
#define THREADX_MAJOR_VERSION 6
111114
#define THREADX_MINOR_VERSION 1
112-
#define THREADX_PATCH_VERSION 7
115+
#define THREADX_PATCH_VERSION 8
113116

114117
/* Define the following symbol for backward compatibility */
115118
#define EL_PRODUCT_THREADX

‎common_smp/src/tx_thread_create.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* FUNCTION RELEASE */
3838
/* */
3939
/* _tx_thread_create PORTABLE SMP */
40-
/* 6.1.3 */
40+
/* 6.1.8 */
4141
/* AUTHOR */
4242
/* */
4343
/* William E. Lamie, Microsoft Corporation */
@@ -80,9 +80,11 @@
8080
/* */
8181
/* DATE NAME DESCRIPTION */
8282
/* */
83-
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
84-
/* 12-31-2020 Andres Mlinar Modified comment(s), */
83+
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
84+
/* 12-31-2020 Andres Mlinar Modified comment(s), */
8585
/* resulting in version 6.1.3 */
86+
/* 08-02-2021 Scott Larson Removed unneeded cast, */
87+
/* resulting in version 6.1.8 */
8688
/* */
8789
/**************************************************************************/
8890
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
@@ -120,7 +122,7 @@ ALIGN_TYPE updated_stack_start;
120122

121123
/* Ensure the starting stack address is evenly aligned. */
122124
new_stack_start = TX_POINTER_TO_ALIGN_TYPE_CONVERT(stack_start);
123-
updated_stack_start = ((((ULONG) new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
125+
updated_stack_start = (((new_stack_start) + ((sizeof(ULONG)) - ((ULONG) 1)) ) & (~((sizeof(ULONG)) - ((ULONG) 1))));
124126

125127
/* Determine if the starting stack address is different. */
126128
if (new_stack_start != updated_stack_start)

‎docs/support-policy-example.png‎

-18.9 KB
Binary file not shown.

‎ports/cortex_m0/ac5/example_build/tx_initialize_low_level.s‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,14 @@ __tx_IntHandler
236236
; VOID InterruptHandler (VOID)
237237
; {
238238
PUSH {r0, lr}
239-
239+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
240+
BL _tx_execution_isr_enter // Call the ISR enter function
241+
#endif
240242
; /* Do interrupt handler work here */
241243
; /* .... */
242-
244+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
245+
BL _tx_execution_isr_exit // Call the ISR exit function
246+
#endif
243247
POP {r0, r1}
244248
MOV lr, r1
245249
BX lr
@@ -253,7 +257,13 @@ SysTick_Handler
253257
; {
254258
;
255259
PUSH {r0, lr}
260+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
261+
BL _tx_execution_isr_enter // Call the ISR enter function
262+
#endif
256263
BL _tx_timer_interrupt
264+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
265+
BL _tx_execution_isr_exit // Call the ISR exit function
266+
#endif
257267
POP {r0, r1}
258268
MOV lr, r1
259269
BX lr

‎ports/cortex_m0/ac6/example_build/sample_threadx/tx_initialize_low_level.S‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ SysTick_Handler:
159159
@ {
160160
@
161161
PUSH {r0, lr}
162-
#ifdef TX_ENABLE_EXECUTION_CHANGE_NOTIFY
163-
BL _tx_execution_isr_enter @ Call the ISR enter function
162+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
163+
BL _tx_execution_isr_enter // Call the ISR enter function
164164
#endif
165165
BL _tx_timer_interrupt
166-
#ifdef TX_ENABLE_EXECUTION_CHANGE_NOTIFY
167-
BL _tx_execution_isr_exit @ Call the ISR exit function
166+
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
167+
BL _tx_execution_isr_exit // Call the ISR exit function
168168
#endif
169169
POP {r0, r1}
170170
MOV lr, r1

0 commit comments

Comments
 (0)