diff options
| author | Scott Larson <[email protected]> | 2020-10-16 11:57:42 -0700 |
|---|---|---|
| committer | Scott Larson <[email protected]> | 2020-10-16 11:57:42 -0700 |
| commit | 6773d468ae877ce36feda1c86842510fb33501a3 (patch) | |
| tree | f151f40723c3f794adc97f302f3df54a74c081b8 /common | |
| parent | c2df92c885c06b85a3800617b46f291342ea184e (diff) | |
6.1.1 patch: add stack sealing to armv8-m, fix misra warning, fix stack check link errorv6.1.1_rel
Diffstat (limited to 'common')
| -rw-r--r-- | common/inc/tx_api.h | 7 | ||||
| -rw-r--r-- | common/src/tx_thread_stack_error_handler.c | 7 | ||||
| -rw-r--r-- | common/src/tx_thread_suspend.c | 10 |
3 files changed, 17 insertions, 7 deletions
diff --git a/common/inc/tx_api.h b/common/inc/tx_api.h index 2397552d..80f36f95 100644 --- a/common/inc/tx_api.h +++ b/common/inc/tx_api.h @@ -26,7 +26,7 @@ /* APPLICATION INTERFACE DEFINITION RELEASE */ /* */ /* tx_api.h PORTABLE C */ -/* 6.1 */ +/* 6.1.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -51,6 +51,9 @@ /* added macros for casting */ /* pointers to ALIGN_TYPE, */ /* resulting in version 6.1 */ +/* 10-16-2020 William E. Lamie Modified comment(s), and */ +/* increased patch version, */ +/* resulting in version 6.1.1 */ /* */ /**************************************************************************/ @@ -83,7 +86,7 @@ extern "C" { #define AZURE_RTOS_THREADX #define THREADX_MAJOR_VERSION 6 #define THREADX_MINOR_VERSION 1 -#define THREADX_PATCH_VERSION 0 +#define THREADX_PATCH_VERSION 1 /* Define the following symbol for backward compatibility */ #define EL_PRODUCT_THREADX diff --git a/common/src/tx_thread_stack_error_handler.c b/common/src/tx_thread_stack_error_handler.c index 9c90b1a7..6d62c3f3 100644 --- a/common/src/tx_thread_stack_error_handler.c +++ b/common/src/tx_thread_stack_error_handler.c @@ -26,7 +26,7 @@ /* Include necessary system files. */ #include "tx_api.h" -#ifdef TX_MISRA_ENABLE +#if defined(TX_MISRA_ENABLE) || defined(TX_ENABLE_STACK_CHECKING) #include "tx_thread.h" @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _tx_thread_stack_error_handler PORTABLE C */ -/* 6.1 */ +/* 6.1.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,9 @@ /* 09-30-2020 Yuxin Zhou Modified comment(s), */ /* update misra support, */ /* resulting in version 6.1 */ +/* 10-16-2020 William E. Lamie Modified comment(s), */ +/* fixed link issue, */ +/* resulting in version 6.1.1 */ /* */ /**************************************************************************/ VOID _tx_thread_stack_error_handler(TX_THREAD *thread_ptr) diff --git a/common/src/tx_thread_suspend.c b/common/src/tx_thread_suspend.c index 764158b7..dc4fc076 100644 --- a/common/src/tx_thread_suspend.c +++ b/common/src/tx_thread_suspend.c @@ -35,7 +35,7 @@ /* FUNCTION RELEASE */ /* */ /* _tx_thread_suspend PORTABLE C */ -/* 6.1 */ +/* 6.1.1 */ /* AUTHOR */ /* */ /* William E. Lamie, Microsoft Corporation */ @@ -70,6 +70,10 @@ /* 05-19-2020 William E. Lamie Initial Version 6.0 */ /* 09-30-2020 Yuxin Zhou Modified comment(s), */ /* resulting in version 6.1 */ +/* 10-16-2020 Yuxin Zhou Modified comment(s), and */ +/* added type cast to address */ +/* a MISRA compliance issue, */ +/* resulting in version 6.1.1 */ /* */ /**************************************************************************/ UINT _tx_thread_suspend(TX_THREAD *thread_ptr) @@ -103,7 +107,7 @@ UINT status; status = TX_SUCCESS; /* Determine if we are in a thread context. */ - if (TX_THREAD_GET_SYSTEM_STATE() == 0) + if (TX_THREAD_GET_SYSTEM_STATE() == ((ULONG) 0)) { /* Yes, we are in a thread context. */ @@ -264,7 +268,7 @@ ULONG time_stamp = ((ULONG) 0); status = TX_SUCCESS; /* Determine if we are in a thread context. */ - if (TX_THREAD_GET_SYSTEM_STATE() == 0) + if (TX_THREAD_GET_SYSTEM_STATE() == ((ULONG) 0)) { /* Yes, we are in a thread context. */ |