Skip to content

Commit

Permalink
Release 6.2.1 on 08 Mar 2023. Expand to see details.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@TiejunMS
TiejunMS committed Mar 8, 2023
1 parent 745395d commit 2aa19f3
Show file tree
Hide file tree
Showing 1,026 changed files with 53,462 additions and 5,957 deletions.
7 changes: 5 additions & 2 deletions common/inc/tx_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE C */
/* 6.2.0 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -94,6 +94,9 @@
/* update EPK typedef, */
/* update version numbers, */
/* resulting in version 6.2.0 */
/* 03-08-2023 Tiejun Zhou Modified comment(s), */
/* update patch number, */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -133,7 +136,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 2
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
30 changes: 20 additions & 10 deletions common/src/tx_thread_wait_abort.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _tx_thread_wait_abort PORTABLE C */
/* 6.1 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -68,9 +68,12 @@
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
/* resulting in version 6.1 */
/* 03-08-2023 Scott Larson Check if thread is coming out */
/* of suspension elsewhere, */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr)
Expand Down Expand Up @@ -131,6 +134,18 @@ ULONG suspension_sequence;
/* Restore interrupts. */
TX_RESTORE
#endif
}
else if(thread_ptr -> tx_thread_suspend_cleanup == TX_NULL)
{
/* Thread is coming out of suspension elsewhere. */

#ifndef TX_NOT_INTERRUPTABLE
/* Increment the disable preemption flag. */
_tx_thread_preempt_disable++;

/* Restore interrupts. */
TX_RESTORE
#endif
}
else
{
Expand Down Expand Up @@ -167,13 +182,8 @@ ULONG suspension_sequence;
TX_RESTORE
#endif

/* Call any cleanup routines. */
if (suspend_cleanup != TX_NULL)
{

/* Yes, there is a function to call. */
(suspend_cleanup)(thread_ptr, suspension_sequence);
}
/* Call cleanup routine. */
(suspend_cleanup)(thread_ptr, suspension_sequence);
}

/* If the abort of the thread wait was successful, if so resume the thread. */
Expand Down
6 changes: 3 additions & 3 deletions common_modules/module_manager/src/txm_module_manager_stop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
/* FUNCTION RELEASE */
/* */
/* _txm_module_manager_stop PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Scott Larson, Microsoft Corporation */
Expand Down Expand Up @@ -116,8 +116,8 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
/* 03-02-2021 Scott Larson Modified comments, fix */
/* object delete underflow, */
/* resulting in version 6.1.5 */
/* xx-xx-xxxx Scott Larson Added tx_trace.h include, */
/* resulting in version 6.x */
/* 03-08-2023 Scott Larson Added tx_trace.h include, */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _txm_module_manager_stop(TXM_MODULE_INSTANCE *module_instance)
Expand Down
6 changes: 3 additions & 3 deletions common_modules/module_manager/src/txm_module_manager_thread_create.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/* FUNCTION RELEASE */
/* */
/* _txm_module_manager_thread_create PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Scott Larson, Microsoft Corporation */
Expand Down Expand Up @@ -91,9 +91,9 @@
/* added 64-bit support, */
/* added SMP support, */
/* resulting in version 6.1.3 */
/* xx-xx-xxxx Scott Larson Check module stack for */
/* 03-08-2023 Scott Larson Check module stack for */
/* overlap, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
Expand Down
7 changes: 5 additions & 2 deletions common_smp/inc/tx_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE SMP */
/* 6.2.0 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -82,6 +82,9 @@
/* add extension macros, */
/* update version numbers, */
/* resulting in version 6.2.0 */
/* 03-08-2023 Tiejun Zhou Modified comment(s), */
/* update patch number, */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -134,7 +137,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 2
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
30 changes: 20 additions & 10 deletions common_smp/src/tx_thread_wait_abort.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _tx_thread_wait_abort PORTABLE C */
/* 6.1 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -68,9 +68,12 @@
/* */
/* DATE NAME DESCRIPTION */
/* */
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
/* resulting in version 6.1 */
/* 03-08-2023 Scott Larson Check if thread is coming out */
/* of suspension elsewhere, */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr)
Expand Down Expand Up @@ -131,6 +134,18 @@ ULONG suspension_sequence;
/* Restore interrupts. */
TX_RESTORE
#endif
}
else if(thread_ptr -> tx_thread_suspend_cleanup == TX_NULL)
{
/* Thread is coming out of suspension elsewhere. */

#ifndef TX_NOT_INTERRUPTABLE
/* Increment the disable preemption flag. */
_tx_thread_preempt_disable++;

/* Restore interrupts. */
TX_RESTORE
#endif
}
else
{
Expand Down Expand Up @@ -167,13 +182,8 @@ ULONG suspension_sequence;
TX_RESTORE
#endif

/* Call any cleanup routines. */
if (suspend_cleanup != TX_NULL)
{

/* Yes, there is a function to call. */
(suspend_cleanup)(thread_ptr, suspension_sequence);
}
/* Call cleanup routine. */
(suspend_cleanup)(thread_ptr, suspension_sequence);
}

/* If the abort of the thread wait was successful, if so resume the thread. */
Expand Down
2 changes: 1 addition & 1 deletion ports/arc_em/metaware/inc/tx_port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ void _tx_initialize_start_interrupts(void);

#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARCv2_EM/MetaWare Version 6.1.10 *";
"Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARCv2_EM/MetaWare Version 6.2.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
Expand Down
8 changes: 7 additions & 1 deletion ports/arc_em/metaware/src/tx_thread_context_restore.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
#ifdef TX_INCLUDE_USER_DEFINE_FILE
#include "tx_user.h"
#endif

.equ BTA, 0x412
.equ KSTACK_TOP, 0x264
Expand All @@ -29,7 +32,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_restore ARCv2_EM/MetaWare */
;/* 6.1.9 */
;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -69,6 +72,9 @@
;/* support for disabling the */
;/* loop control feature, */
;/* resulting in version 6.1.9 */
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
;/* #include tx_user.h, */
;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_restore(VOID)
Expand Down
8 changes: 7 additions & 1 deletion ports/arc_em/metaware/src/tx_thread_context_save.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
#ifdef TX_INCLUDE_USER_DEFINE_FILE
#include "tx_user.h"
#endif

.equ BTA, 0x412
.equ KSTACK_TOP, 0x264
Expand All @@ -29,7 +32,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_save ARCv2_EM/MetaWare */
;/* 6.1.6 */
;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -64,6 +67,9 @@
;/* 04-02-2021 Andres Mlinar Modified comment(s), and */
;/* r25/r30 are caller saved, */
;/* resulting in version 6.1.6 */
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
;/* #include tx_user.h, */
;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_context_save(VOID)
Expand Down
8 changes: 7 additions & 1 deletion ports/arc_em/metaware/src/tx_thread_interrupt_control.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
#ifdef TX_INCLUDE_USER_DEFINE_FILE
#include "tx_user.h"
#endif

;/**************************************************************************/
;/* */
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_interrupt_control ARCv2_EM/MetaWare */
;/* 6.1.6 */
;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -57,6 +60,9 @@
;/* 09-30-2020 William E. Lamie Initial Version 6.1 */
;/* 04-02-2021 Andres Mlinar Modified comments, */
;/* resulting in version 6.1.6 */
;/* 03-08-2023 Cindy Deng Modified comment(s), added */
;/* #include tx_user.h, */
;/* resulting in version 6.2.1 */
;/* */
;/**************************************************************************/
;UINT _tx_thread_interrupt_control(UINT new_posture)
Expand Down
5 changes: 4 additions & 1 deletion ports/arc_em/metaware/src/tx_thread_schedule.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
;/** */
;/**************************************************************************/
;/**************************************************************************/
#ifdef TX_INCLUDE_USER_DEFINE_FILE
#include "tx_user.h"
#endif

.equ BTA, 0x412
.equ KSTACK_TOP, 0x264
Expand All @@ -29,7 +32,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_schedule ARCv2_EM/MetaWare */
;/* 6.1.9 */
;/* 6.2.1 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
Expand Down
Loading

0 comments on commit 2aa19f3

Please sign in to comment.