summaryrefslogtreecommitdiff
path: root/ports/cortex_r5
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/cortex_r5
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/cortex_r5')
-rw-r--r--ports/cortex_r5/ac5/inc/tx_port.h2
-rw-r--r--ports/cortex_r5/ac5/src/tx_thread_context_restore.s2
-rw-r--r--ports/cortex_r5/ac5/src/tx_thread_fiq_context_restore.s2
-rw-r--r--ports/cortex_r5/ac6/inc/tx_port.h2
-rw-r--r--ports/cortex_r5/ac6/src/tx_thread_context_restore.S2
-rw-r--r--ports/cortex_r5/ac6/src/tx_thread_fiq_context_restore.S2
-rw-r--r--ports/cortex_r5/ghs/inc/tx_port.h2
-rw-r--r--ports/cortex_r5/gnu/inc/tx_port.h2
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_context_restore.S17
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_context_save.S16
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_fiq_context_restore.S18
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_fiq_context_save.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_end.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_start.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_interrupt_control.S13
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_interrupt_disable.S14
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_interrupt_restore.S14
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_irq_nesting_end.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_irq_nesting_start.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_schedule.S16
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_stack_build.S14
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_system_return.S14
-rw-r--r--ports/cortex_r5/gnu/src/tx_thread_vectored_context_save.S15
-rw-r--r--ports/cortex_r5/gnu/src/tx_timer_interrupt.S15
-rw-r--r--ports/cortex_r5/iar/inc/tx_port.h2
-rw-r--r--ports/cortex_r5/iar/src/tx_thread_context_restore.s2
26 files changed, 76 insertions, 185 deletions
diff --git a/ports/cortex_r5/ac5/inc/tx_port.h b/ports/cortex_r5/ac5/inc/tx_port.h
index 21c1b82d..f09108d6 100644
--- a/ports/cortex_r5/ac5/inc/tx_port.h
+++ b/ports/cortex_r5/ac5/inc/tx_port.h
@@ -320,7 +320,7 @@ unsigned int _tx_thread_interrupt_restore(UINT old_posture);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/AC5 Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/AC5 Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_r5/ac5/src/tx_thread_context_restore.s b/ports/cortex_r5/ac5/src/tx_thread_context_restore.s
index d4114be6..d30a2d7d 100644
--- a/ports/cortex_r5/ac5/src/tx_thread_context_restore.s
+++ b/ports/cortex_r5/ac5/src/tx_thread_context_restore.s
@@ -140,7 +140,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))
; {
;
diff --git a/ports/cortex_r5/ac5/src/tx_thread_fiq_context_restore.s b/ports/cortex_r5/ac5/src/tx_thread_fiq_context_restore.s
index e5e9b8d7..c78d3383 100644
--- a/ports/cortex_r5/ac5/src/tx_thread_fiq_context_restore.s
+++ b/ports/cortex_r5/ac5/src/tx_thread_fiq_context_restore.s
@@ -132,7 +132,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/cortex_r5/ac6/inc/tx_port.h b/ports/cortex_r5/ac6/inc/tx_port.h
index 7eccfe75..97c9969f 100644
--- a/ports/cortex_r5/ac6/inc/tx_port.h
+++ b/ports/cortex_r5/ac6/inc/tx_port.h
@@ -312,7 +312,7 @@ unsigned int _tx_thread_interrupt_restore(UINT old_posture);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/AC6 Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/AC6 Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_r5/ac6/src/tx_thread_context_restore.S b/ports/cortex_r5/ac6/src/tx_thread_context_restore.S
index ca89d5b0..5a2ac00d 100644
--- a/ports/cortex_r5/ac6/src/tx_thread_context_restore.S
+++ b/ports/cortex_r5/ac6/src/tx_thread_context_restore.S
@@ -140,7 +140,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))
@ {
@
diff --git a/ports/cortex_r5/ac6/src/tx_thread_fiq_context_restore.S b/ports/cortex_r5/ac6/src/tx_thread_fiq_context_restore.S
index 54a33e29..8c99c348 100644
--- a/ports/cortex_r5/ac6/src/tx_thread_fiq_context_restore.S
+++ b/ports/cortex_r5/ac6/src/tx_thread_fiq_context_restore.S
@@ -135,7 +135,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/cortex_r5/ghs/inc/tx_port.h b/ports/cortex_r5/ghs/inc/tx_port.h
index 4ffe1455..3805d89a 100644
--- a/ports/cortex_r5/ghs/inc/tx_port.h
+++ b/ports/cortex_r5/ghs/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-R5/Green Hills Version 6.1.10 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/Green Hills Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_r5/gnu/inc/tx_port.h b/ports/cortex_r5/gnu/inc/tx_port.h
index d477c188..49249fd1 100644
--- a/ports/cortex_r5/gnu/inc/tx_port.h
+++ b/ports/cortex_r5/gnu/inc/tx_port.h
@@ -312,7 +312,7 @@ unsigned int _tx_thread_interrupt_restore(UINT old_posture);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/GNU Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/GNU Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_r5/gnu/src/tx_thread_context_restore.S b/ports/cortex_r5/gnu/src/tx_thread_context_restore.S
index 9b6409ec..f4fe4fcd 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_context_restore.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_context_restore.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@#include "tx_timer.h"
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.arm
#ifdef TX_ENABLE_FIQ_SUPPORT
@@ -141,7 +134,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))
@ {
@
diff --git a/ports/cortex_r5/gnu/src/tx_thread_context_save.S b/ports/cortex_r5/gnu/src/tx_thread_context_save.S
index 4b392465..97856d7a 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_context_save.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_context_save.S
@@ -19,18 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@#include "tx_timer.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.global _tx_thread_system_state
.global _tx_thread_current_ptr
.global _tx_irq_processing_return
diff --git a/ports/cortex_r5/gnu/src/tx_thread_fiq_context_restore.S b/ports/cortex_r5/gnu/src/tx_thread_fiq_context_restore.S
index 021144db..4d0625ad 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_fiq_context_restore.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_fiq_context_restore.S
@@ -19,18 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@#include "tx_timer.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
SVC_MODE = 0xD3 @ SVC mode
FIQ_MODE = 0xD1 @ FIQ mode
MODE_MASK = 0x1F @ Mode mask
@@ -136,7 +128,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/cortex_r5/gnu/src/tx_thread_fiq_context_save.S b/ports/cortex_r5/gnu/src/tx_thread_fiq_context_save.S
index e3a94fe8..806699ff 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_fiq_context_save.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_fiq_context_save.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.global _tx_thread_system_state
.global _tx_thread_current_ptr
.global __tx_fiq_processing_return
diff --git a/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_end.S b/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_end.S
index c7e326d4..cd8e4d50 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_end.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_end.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
#ifdef TX_ENABLE_FIQ_SUPPORT
DISABLE_INTS = 0xC0 @ Disable IRQ/FIQ interrupts
#else
diff --git a/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_start.S b/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_start.S
index 8a53e6dd..4e5d06d1 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_start.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_fiq_nesting_start.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
FIQ_DISABLE = 0x40 @ FIQ disable bit
MODE_MASK = 0x1F @ Mode mask
SYS_MODE_BITS = 0x1F @ System mode bits
diff --git a/ports/cortex_r5/gnu/src/tx_thread_interrupt_control.S b/ports/cortex_r5/gnu/src/tx_thread_interrupt_control.S
index fae99ffe..a8506c70 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_interrupt_control.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_interrupt_control.S
@@ -19,15 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h" */
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
INT_MASK = 0x03F
diff --git a/ports/cortex_r5/gnu/src/tx_thread_interrupt_disable.S b/ports/cortex_r5/gnu/src/tx_thread_interrupt_disable.S
index 4fa3d25e..e60fc343 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_interrupt_disable.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_interrupt_disable.S
@@ -19,16 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
@/* Define the 16-bit Thumb mode veneer for _tx_thread_interrupt_disable for
@ applications calling this function from to 16-bit Thumb mode. */
@
diff --git a/ports/cortex_r5/gnu/src/tx_thread_interrupt_restore.S b/ports/cortex_r5/gnu/src/tx_thread_interrupt_restore.S
index 5cd41268..2bf80c3c 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_interrupt_restore.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_interrupt_restore.S
@@ -19,16 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
@/* Define the 16-bit Thumb mode veneer for _tx_thread_interrupt_restore for
@ applications calling this function from to 16-bit Thumb mode. */
@
diff --git a/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_end.S b/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_end.S
index 16a6ce01..f40716b6 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_end.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_end.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
#ifdef TX_ENABLE_FIQ_SUPPORT
DISABLE_INTS = 0xC0 @ Disable IRQ/FIQ interrupts
#else
diff --git a/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_start.S b/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_start.S
index 36cdcd44..86ba2bf9 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_start.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_irq_nesting_start.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
IRQ_DISABLE = 0x80 @ IRQ disable bit
MODE_MASK = 0x1F @ Mode mask
SYS_MODE_BITS = 0x1F @ System mode bits
diff --git a/ports/cortex_r5/gnu/src/tx_thread_schedule.S b/ports/cortex_r5/gnu/src/tx_thread_schedule.S
index d7b6ebce..446f15a9 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_schedule.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_schedule.S
@@ -19,18 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@#include "tx_timer.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.global _tx_thread_execute_ptr
.global _tx_thread_current_ptr
.global _tx_timer_time_slice
diff --git a/ports/cortex_r5/gnu/src/tx_thread_stack_build.S b/ports/cortex_r5/gnu/src/tx_thread_stack_build.S
index 2e7a01da..229ddda8 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_stack_build.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_stack_build.S
@@ -19,16 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.arm
SVC_MODE = 0x13 @ SVC mode
diff --git a/ports/cortex_r5/gnu/src/tx_thread_system_return.S b/ports/cortex_r5/gnu/src/tx_thread_system_return.S
index 438a2298..a975b823 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_system_return.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_system_return.S
@@ -19,16 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@#include "tx_timer.h"
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.arm
@
@
diff --git a/ports/cortex_r5/gnu/src/tx_thread_vectored_context_save.S b/ports/cortex_r5/gnu/src/tx_thread_vectored_context_save.S
index d9e6c0ae..dd7c54c7 100644
--- a/ports/cortex_r5/gnu/src/tx_thread_vectored_context_save.S
+++ b/ports/cortex_r5/gnu/src/tx_thread_vectored_context_save.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.global _tx_thread_system_state
.global _tx_thread_current_ptr
.global _tx_execution_isr_enter
diff --git a/ports/cortex_r5/gnu/src/tx_timer_interrupt.S b/ports/cortex_r5/gnu/src/tx_timer_interrupt.S
index a69a4b81..8262ba82 100644
--- a/ports/cortex_r5/gnu/src/tx_timer_interrupt.S
+++ b/ports/cortex_r5/gnu/src/tx_timer_interrupt.S
@@ -19,17 +19,10 @@
@/** */
@/**************************************************************************/
@/**************************************************************************/
-@
-@#define TX_SOURCE_CODE
-@
-@
-@/* Include necessary system files. */
-@
-@#include "tx_api.h"
-@#include "tx_timer.h"
-@#include "tx_thread.h"
-@
-@
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.arm
@
diff --git a/ports/cortex_r5/iar/inc/tx_port.h b/ports/cortex_r5/iar/inc/tx_port.h
index ddccbcab..81d19954 100644
--- a/ports/cortex_r5/iar/inc/tx_port.h
+++ b/ports/cortex_r5/iar/inc/tx_port.h
@@ -367,7 +367,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/IAR Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-R5/IAR Version 6.2.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
diff --git a/ports/cortex_r5/iar/src/tx_thread_context_restore.s b/ports/cortex_r5/iar/src/tx_thread_context_restore.s
index deb16b8e..24e7eefb 100644
--- a/ports/cortex_r5/iar/src/tx_thread_context_restore.s
+++ b/ports/cortex_r5/iar/src/tx_thread_context_restore.s
@@ -131,7 +131,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))
; {
;