summaryrefslogtreecommitdiff
path: root/ports_module/cortex_r4
diff options
context:
space:
mode:
authorTiejun Zhou <[email protected]>2023-03-08 08:26:22 +0000
committerTiejun Zhou <[email protected]>2023-03-08 08:26:22 +0000
commit2aa19f3de0b6cf09bb9dca78c8a53fe337b8f0f7 (patch)
tree8ec91a64e0831e3100a6ad9a5dec41d9fd7fc74f /ports_module/cortex_r4
parent745395d6a2f931c85c4428425db21eb7d03b4324 (diff)
Release 6.2.1 on 08 Mar 2023. Expand to see details.v6.2.1_rel
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
Diffstat (limited to 'ports_module/cortex_r4')
-rw-r--r--ports_module/cortex_r4/ac6/inc/tx_port.h2
-rw-r--r--ports_module/cortex_r4/ac6/inc/txm_module_port.h2
-rw-r--r--ports_module/cortex_r4/ac6/module_manager/src/tx_thread_fiq_context_restore.S2
-rw-r--r--ports_module/cortex_r4/iar/inc/tx_port.h2
-rw-r--r--ports_module/cortex_r4/iar/inc/txm_module_port.h2
-rw-r--r--ports_module/cortex_r4/iar/module_manager/src/tx_thread_context_restore.s2
6 files changed, 6 insertions, 6 deletions
diff --git a/ports_module/cortex_r4/ac6/inc/tx_port.h b/ports_module/cortex_r4/ac6/inc/tx_port.h
index 3fba0f78..5b244681 100644
--- a/ports_module/cortex_r4/ac6/inc/tx_port.h
+++ b/ports_module/cortex_r4/ac6/inc/tx_port.h
@@ -346,7 +346,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R4/AC6 Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R4/AC6 Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports_module/cortex_r4/ac6/inc/txm_module_port.h b/ports_module/cortex_r4/ac6/inc/txm_module_port.h
index 3f64b4f0..d4aea6fd 100644
--- a/ports_module/cortex_r4/ac6/inc/txm_module_port.h
+++ b/ports_module/cortex_r4/ac6/inc/txm_module_port.h
@@ -360,7 +360,7 @@ UINT _txm_module_manager_inside_data_check(TXM_MODULE_INSTANCE *module_instance
#define TXM_MODULE_MANAGER_VERSION_ID \
CHAR _txm_module_manager_version_id[] = \
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Module Cortex-R4/MPU/ARM Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Module Cortex-R4/MPU/ARM Version 6.2.1 *";
#endif
diff --git a/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_fiq_context_restore.S b/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_fiq_context_restore.S
index c480e844..5d21f062 100644
--- a/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_fiq_context_restore.S
+++ b/ports_module/cortex_r4/ac6/module_manager/src/tx_thread_fiq_context_restore.S
@@ -139,7 +139,7 @@ _tx_thread_fiq_context_restore:
__tx_thread_fiq_not_nested_restore:
/* Determine if a thread was interrupted and no preemption is required. */
- /* else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr) */
+ /* else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr))*/
/* (_tx_thread_preempt_disable)) */
/* { */
diff --git a/ports_module/cortex_r4/iar/inc/tx_port.h b/ports_module/cortex_r4/iar/inc/tx_port.h
index dc72590a..f2c0a271 100644
--- a/ports_module/cortex_r4/iar/inc/tx_port.h
+++ b/ports_module/cortex_r4/iar/inc/tx_port.h
@@ -395,7 +395,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R4/IAR Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R4/IAR Version 6.2.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
diff --git a/ports_module/cortex_r4/iar/inc/txm_module_port.h b/ports_module/cortex_r4/iar/inc/txm_module_port.h
index 10a00ed7..d5ebb0da 100644
--- a/ports_module/cortex_r4/iar/inc/txm_module_port.h
+++ b/ports_module/cortex_r4/iar/inc/txm_module_port.h
@@ -341,7 +341,7 @@ UINT _txm_module_manager_inside_data_check(TXM_MODULE_INSTANCE *module_instance
#define TXM_MODULE_MANAGER_VERSION_ID \
CHAR _txm_module_manager_version_id[] = \
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Module Cortex-R4/MPU/IAR Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Module Cortex-R4/MPU/IAR Version 6.2.1 *";
#endif
diff --git a/ports_module/cortex_r4/iar/module_manager/src/tx_thread_context_restore.s b/ports_module/cortex_r4/iar/module_manager/src/tx_thread_context_restore.s
index 69e9c979..84592785 100644
--- a/ports_module/cortex_r4/iar/module_manager/src/tx_thread_context_restore.s
+++ b/ports_module/cortex_r4/iar/module_manager/src/tx_thread_context_restore.s
@@ -122,7 +122,7 @@ _tx_thread_context_restore
__tx_thread_not_nested_restore
;
; /* Determine if a thread was interrupted and no preemption is required. */
-; else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr)
+; else if (((_tx_thread_current_ptr) && (_tx_thread_current_ptr == _tx_thread_execute_ptr))
; || (_tx_thread_preempt_disable))
; {
;