Skip to content

Commit 2aa19f3

Browse files
TiejunZhou-CNTiejunZhou-CN
committed
Release 6.2.1 on 08 Mar 2023. Expand to see details.
cee19603d Include tx_user.h conditionally. e40e08007 Update owners d69641273 Update release date and version 394aee52f Add tx_user.h to GNU port assembly files 5cca2ddd0 RISC-V 64 bit port for Microchip e0f2c373c Link Winmm.lib that required by the high-resolution timer. 6af472a68 Update Win32 port with high resolution timer. aea7b556a Add DMB ISH barrier inst in ARMv8-A SMP scheduler 19091a262 Add .section .preamble to m3 m4 m7 module ports ced60e1b7 Add missing parenthesis in ports assembly file 309dc77ca Modules Cortex-A7 IAR new port c752a4063 Modules Cortex-A7 GNU new port dc224b90f Fix race condition in tx_thread_wait_abort and update regression test 6e261f5b7 create threadx cmsis-pack
1 parent 745395d commit 2aa19f3

File tree

1,026 files changed

+53462
-5957
lines changed

Some content is hidden

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

1,026 files changed

+53462
-5957
lines changed

‎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.2.0 */
29+
/* 6.2.1 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -94,6 +94,9 @@
9494
/* update EPK typedef, */
9595
/* update version numbers, */
9696
/* resulting in version 6.2.0 */
97+
/* 03-08-2023 Tiejun Zhou Modified comment(s), */
98+
/* update patch number, */
99+
/* resulting in version 6.2.1 */
97100
/* */
98101
/**************************************************************************/
99102

@@ -133,7 +136,7 @@ extern "C" {
133136
#define AZURE_RTOS_THREADX
134137
#define THREADX_MAJOR_VERSION 6
135138
#define THREADX_MINOR_VERSION 2
136-
#define THREADX_PATCH_VERSION 0
139+
#define THREADX_PATCH_VERSION 1
137140

138141
/* Define the following symbol for backward compatibility */
139142
#define EL_PRODUCT_THREADX

‎common/src/tx_thread_wait_abort.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _tx_thread_wait_abort PORTABLE C */
38-
/* 6.1 */
38+
/* 6.2.1 */
3939
/* AUTHOR */
4040
/* */
4141
/* William E. Lamie, Microsoft Corporation */
@@ -68,9 +68,12 @@
6868
/* */
6969
/* DATE NAME DESCRIPTION */
7070
/* */
71-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
72-
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
71+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
72+
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
7373
/* resulting in version 6.1 */
74+
/* 03-08-2023 Scott Larson Check if thread is coming out */
75+
/* of suspension elsewhere, */
76+
/* resulting in version 6.2.1 */
7477
/* */
7578
/**************************************************************************/
7679
UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr)
@@ -131,6 +134,18 @@ ULONG suspension_sequence;
131134
/* Restore interrupts. */
132135
TX_RESTORE
133136
#endif
137+
}
138+
else if(thread_ptr -> tx_thread_suspend_cleanup == TX_NULL)
139+
{
140+
/* Thread is coming out of suspension elsewhere. */
141+
142+
#ifndef TX_NOT_INTERRUPTABLE
143+
/* Increment the disable preemption flag. */
144+
_tx_thread_preempt_disable++;
145+
146+
/* Restore interrupts. */
147+
TX_RESTORE
148+
#endif
134149
}
135150
else
136151
{
@@ -167,13 +182,8 @@ ULONG suspension_sequence;
167182
TX_RESTORE
168183
#endif
169184

170-
/* Call any cleanup routines. */
171-
if (suspend_cleanup != TX_NULL)
172-
{
173-
174-
/* Yes, there is a function to call. */
175-
(suspend_cleanup)(thread_ptr, suspension_sequence);
176-
}
185+
/* Call cleanup routine. */
186+
(suspend_cleanup)(thread_ptr, suspension_sequence);
177187
}
178188

179189
/* If the abort of the thread wait was successful, if so resume the thread. */

‎common_modules/module_manager/src/txm_module_manager_stop.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
6464
/* FUNCTION RELEASE */
6565
/* */
6666
/* _txm_module_manager_stop PORTABLE C */
67-
/* 6.x */
67+
/* 6.2.1 */
6868
/* AUTHOR */
6969
/* */
7070
/* Scott Larson, Microsoft Corporation */
@@ -116,8 +116,8 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
116116
/* 03-02-2021 Scott Larson Modified comments, fix */
117117
/* object delete underflow, */
118118
/* resulting in version 6.1.5 */
119-
/* xx-xx-xxxx Scott Larson Added tx_trace.h include, */
120-
/* resulting in version 6.x */
119+
/* 03-08-2023 Scott Larson Added tx_trace.h include, */
120+
/* resulting in version 6.2.1 */
121121
/* */
122122
/**************************************************************************/
123123
UINT _txm_module_manager_stop(TXM_MODULE_INSTANCE *module_instance)

‎common_modules/module_manager/src/txm_module_manager_thread_create.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/* FUNCTION RELEASE */
4040
/* */
4141
/* _txm_module_manager_thread_create PORTABLE C */
42-
/* 6.x */
42+
/* 6.2.1 */
4343
/* AUTHOR */
4444
/* */
4545
/* Scott Larson, Microsoft Corporation */
@@ -91,9 +91,9 @@
9191
/* added 64-bit support, */
9292
/* added SMP support, */
9393
/* resulting in version 6.1.3 */
94-
/* xx-xx-xxxx Scott Larson Check module stack for */
94+
/* 03-08-2023 Scott Larson Check module stack for */
9595
/* overlap, */
96-
/* resulting in version 6.x */
96+
/* resulting in version 6.2.1 */
9797
/* */
9898
/**************************************************************************/
9999
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,

‎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.2.0 */
29+
/* 6.2.1 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -82,6 +82,9 @@
8282
/* add extension macros, */
8383
/* update version numbers, */
8484
/* resulting in version 6.2.0 */
85+
/* 03-08-2023 Tiejun Zhou Modified comment(s), */
86+
/* update patch number, */
87+
/* resulting in version 6.2.1 */
8588
/* */
8689
/**************************************************************************/
8790

@@ -134,7 +137,7 @@ extern "C" {
134137
#define AZURE_RTOS_THREADX
135138
#define THREADX_MAJOR_VERSION 6
136139
#define THREADX_MINOR_VERSION 2
137-
#define THREADX_PATCH_VERSION 0
140+
#define THREADX_PATCH_VERSION 1
138141

139142
/* Define the following symbol for backward compatibility */
140143
#define EL_PRODUCT_THREADX

‎common_smp/src/tx_thread_wait_abort.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _tx_thread_wait_abort PORTABLE C */
38-
/* 6.1 */
38+
/* 6.2.1 */
3939
/* AUTHOR */
4040
/* */
4141
/* William E. Lamie, Microsoft Corporation */
@@ -68,9 +68,12 @@
6868
/* */
6969
/* DATE NAME DESCRIPTION */
7070
/* */
71-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
72-
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
71+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
72+
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
7373
/* resulting in version 6.1 */
74+
/* 03-08-2023 Scott Larson Check if thread is coming out */
75+
/* of suspension elsewhere, */
76+
/* resulting in version 6.2.1 */
7477
/* */
7578
/**************************************************************************/
7679
UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr)
@@ -131,6 +134,18 @@ ULONG suspension_sequence;
131134
/* Restore interrupts. */
132135
TX_RESTORE
133136
#endif
137+
}
138+
else if(thread_ptr -> tx_thread_suspend_cleanup == TX_NULL)
139+
{
140+
/* Thread is coming out of suspension elsewhere. */
141+
142+
#ifndef TX_NOT_INTERRUPTABLE
143+
/* Increment the disable preemption flag. */
144+
_tx_thread_preempt_disable++;
145+
146+
/* Restore interrupts. */
147+
TX_RESTORE
148+
#endif
134149
}
135150
else
136151
{
@@ -167,13 +182,8 @@ ULONG suspension_sequence;
167182
TX_RESTORE
168183
#endif
169184

170-
/* Call any cleanup routines. */
171-
if (suspend_cleanup != TX_NULL)
172-
{
173-
174-
/* Yes, there is a function to call. */
175-
(suspend_cleanup)(thread_ptr, suspension_sequence);
176-
}
185+
/* Call cleanup routine. */
186+
(suspend_cleanup)(thread_ptr, suspension_sequence);
177187
}
178188

179189
/* If the abort of the thread wait was successful, if so resume the thread. */

‎ports/arc_em/metaware/inc/tx_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ void _tx_initialize_start_interrupts(void);
322322

323323
#ifdef TX_THREAD_INIT
324324
CHAR _tx_version_id[] =
325-
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARCv2_EM/MetaWare Version 6.1.10 *";
325+
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARCv2_EM/MetaWare Version 6.2.1 *";
326326
#else
327327
#ifdef TX_MISRA_ENABLE
328328
extern CHAR _tx_version_id[100];

‎ports/arc_em/metaware/src/tx_thread_context_restore.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
;/** */
1919
;/**************************************************************************/
2020
;/**************************************************************************/
21+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
22+
#include "tx_user.h"
23+
#endif
2124

2225
.equ BTA, 0x412
2326
.equ KSTACK_TOP, 0x264
@@ -29,7 +32,7 @@
2932
;/* FUNCTION RELEASE */
3033
;/* */
3134
;/* _tx_thread_context_restore ARCv2_EM/MetaWare */
32-
;/* 6.1.9 */
35+
;/* 6.2.1 */
3336
;/* AUTHOR */
3437
;/* */
3538
;/* William E. Lamie, Microsoft Corporation */
@@ -69,6 +72,9 @@
6972
;/* support for disabling the */
7073
;/* loop control feature, */
7174
;/* resulting in version 6.1.9 */
75+
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
76+
;/* #include tx_user.h, */
77+
;/* resulting in version 6.2.1 */
7278
;/* */
7379
;/**************************************************************************/
7480
;VOID _tx_thread_context_restore(VOID)

‎ports/arc_em/metaware/src/tx_thread_context_save.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
;/** */
1919
;/**************************************************************************/
2020
;/**************************************************************************/
21+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
22+
#include "tx_user.h"
23+
#endif
2124

2225
.equ BTA, 0x412
2326
.equ KSTACK_TOP, 0x264
@@ -29,7 +32,7 @@
2932
;/* FUNCTION RELEASE */
3033
;/* */
3134
;/* _tx_thread_context_save ARCv2_EM/MetaWare */
32-
;/* 6.1.6 */
35+
;/* 6.2.1 */
3336
;/* AUTHOR */
3437
;/* */
3538
;/* William E. Lamie, Microsoft Corporation */
@@ -64,6 +67,9 @@
6467
;/* 04-02-2021 Andres Mlinar Modified comment(s), and */
6568
;/* r25/r30 are caller saved, */
6669
;/* resulting in version 6.1.6 */
70+
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
71+
;/* #include tx_user.h, */
72+
;/* resulting in version 6.2.1 */
6773
;/* */
6874
;/**************************************************************************/
6975
;VOID _tx_thread_context_save(VOID)

‎ports/arc_em/metaware/src/tx_thread_interrupt_control.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@
1818
;/** */
1919
;/**************************************************************************/
2020
;/**************************************************************************/
21+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
22+
#include "tx_user.h"
23+
#endif
2124

2225
;/**************************************************************************/
2326
;/* */
2427
;/* FUNCTION RELEASE */
2528
;/* */
2629
;/* _tx_thread_interrupt_control ARCv2_EM/MetaWare */
27-
;/* 6.1.6 */
30+
;/* 6.2.1 */
2831
;/* AUTHOR */
2932
;/* */
3033
;/* William E. Lamie, Microsoft Corporation */
@@ -57,6 +60,9 @@
5760
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
5861
;/* 04-02-2021 Andres Mlinar Modified comments, */
5962
;/* resulting in version 6.1.6 */
63+
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
64+
;/* #include tx_user.h, */
65+
;/* resulting in version 6.2.1 */
6066
;/* */
6167
;/**************************************************************************/
6268
;UINT _tx_thread_interrupt_control(UINT new_posture)

0 commit comments

Comments
 (0)