Skip to content

Commit

Permalink
patch release 6.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Larson committed Nov 10, 2020
1 parent 6773d46 commit 9b050d0
Show file tree
Hide file tree
Showing 535 changed files with 9,615 additions and 338,325 deletions.
15 changes: 13 additions & 2 deletions common/inc/tx_api.h
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.1.1 */
/* 6.1.2 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -54,6 +54,10 @@
/* 10-16-2020 William E. Lamie Modified comment(s), and */
/* increased patch version, */
/* resulting in version 6.1.1 */
/* 11-09-2020 Yuxin Zhou Modified comment(s), and */
/* moved TX_THREAD_GET_SYSTEM_ */
/* STATE to tx_api.h, */
/* resulting in version 6.1.2 */
/* */
/**************************************************************************/

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

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down Expand Up @@ -2213,6 +2217,13 @@ void __ghs_rnerr(char *errMsg, int stackLevels, int stackTraceDisplay, void *hex

#endif

/* Define the get system state macro. By default, it simply maps to the variable _tx_thread_system_state. */
/* Note that prior to Azure RTOS 6.1, this symbol was defined in tx_thread.h. */
#ifndef TX_THREAD_GET_SYSTEM_STATE
#define TX_THREAD_GET_SYSTEM_STATE() _tx_thread_system_state
#endif




/* Determine if a C++ compiler is being used. If so, complete the standard
Expand Down
10 changes: 7 additions & 3 deletions common/inc/tx_thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* COMPONENT DEFINITION RELEASE */
/* */
/* tx_thread.h PORTABLE C */
/* 6.1 */
/* 6.1.2 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand All @@ -44,6 +44,10 @@
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
/* resulting in version 6.1 */
/* 11-09-2020 Yuxin Zhou Modified comment(s), and */
/* moved TX_THREAD_GET_SYSTEM_ */
/* STATE to tx_api.h, */
/* resulting in version 6.1.2 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -111,11 +115,11 @@


/* 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
#define TX_THREAD_GET_SYSTEM_STATE() _tx_thread_system_state
#endif

*/

/* Define the check for whether or not to call the _tx_thread_system_return function. A non-zero value
indicates that _tx_thread_system_return should not be called. */
Expand Down
257 changes: 0 additions & 257 deletions common_smp/inc/tx_user.h

This file was deleted.

Loading

0 comments on commit 9b050d0

Please sign in to comment.