summaryrefslogtreecommitdiff
path: root/ports/cortex_a8
diff options
context:
space:
mode:
Diffstat (limited to 'ports/cortex_a8')
-rw-r--r--ports/cortex_a8/ac5/inc/tx_port.h2
-rw-r--r--ports/cortex_a8/ac5/src/tx_thread_context_restore.s2
-rw-r--r--ports/cortex_a8/ac5/src/tx_thread_fiq_context_restore.s2
-rw-r--r--ports/cortex_a8/ac6/inc/tx_port.h2
-rw-r--r--ports/cortex_a8/ghs/inc/tx_port.h2
-rw-r--r--ports/cortex_a8/gnu/inc/tx_port.h2
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_context_restore.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_context_save.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_fiq_context_restore.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_fiq_context_save.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_end.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_start.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_interrupt_control.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_interrupt_disable.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_interrupt_restore.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_irq_nesting_end.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_irq_nesting_start.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_schedule.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_stack_build.S7
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_system_return.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_thread_vectored_context_save.S6
-rw-r--r--ports/cortex_a8/gnu/src/tx_timer_interrupt.S6
-rw-r--r--ports/cortex_a8/iar/inc/tx_port.h2
-rw-r--r--ports/cortex_a8/iar/src/tx_thread_context_restore.s2
-rw-r--r--ports/cortex_a8/iar/src/tx_thread_fiq_context_restore.s2
25 files changed, 106 insertions, 9 deletions
diff --git a/ports/cortex_a8/ac5/inc/tx_port.h b/ports/cortex_a8/ac5/inc/tx_port.h
index ac629c35..cb6b514d 100644
--- a/ports/cortex_a8/ac5/inc/tx_port.h
+++ b/ports/cortex_a8/ac5/inc/tx_port.h
@@ -327,7 +327,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-A8/AC5 Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-A8/AC5 Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_a8/ac5/src/tx_thread_context_restore.s b/ports/cortex_a8/ac5/src/tx_thread_context_restore.s
index c4ad07ba..0ea092b1 100644
--- a/ports/cortex_a8/ac5/src/tx_thread_context_restore.s
+++ b/ports/cortex_a8/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_a8/ac5/src/tx_thread_fiq_context_restore.s b/ports/cortex_a8/ac5/src/tx_thread_fiq_context_restore.s
index 9efb6142..4ce439a0 100644
--- a/ports/cortex_a8/ac5/src/tx_thread_fiq_context_restore.s
+++ b/ports/cortex_a8/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_a8/ac6/inc/tx_port.h b/ports/cortex_a8/ac6/inc/tx_port.h
index 2155a2f6..6d5ee608 100644
--- a/ports/cortex_a8/ac6/inc/tx_port.h
+++ b/ports/cortex_a8/ac6/inc/tx_port.h
@@ -321,7 +321,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARMv7-A Version 6.1.11 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARMv7-A Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_a8/ghs/inc/tx_port.h b/ports/cortex_a8/ghs/inc/tx_port.h
index 133cc208..951558b1 100644
--- a/ports/cortex_a8/ghs/inc/tx_port.h
+++ b/ports/cortex_a8/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-A8/Green Hills Version 6.1.10 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-A8/Green Hills Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_a8/gnu/inc/tx_port.h b/ports/cortex_a8/gnu/inc/tx_port.h
index 2155a2f6..6d5ee608 100644
--- a/ports/cortex_a8/gnu/inc/tx_port.h
+++ b/ports/cortex_a8/gnu/inc/tx_port.h
@@ -321,7 +321,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARMv7-A Version 6.1.11 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX ARMv7-A Version 6.2.1 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/cortex_a8/gnu/src/tx_thread_context_restore.S b/ports/cortex_a8/gnu/src/tx_thread_context_restore.S
index fae7e72d..2d6e1566 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_context_restore.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_context_restore.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.arm
@@ -88,6 +91,9 @@ IRQ_MODE = 0x92 // Disable IRQ, IRQ mode
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_context_restore
diff --git a/ports/cortex_a8/gnu/src/tx_thread_context_save.S b/ports/cortex_a8/gnu/src/tx_thread_context_save.S
index 7ac48c2e..7f88280f 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_context_save.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_context_save.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.global _tx_thread_system_state
.global _tx_thread_current_ptr
@@ -73,6 +76,9 @@
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_context_save
diff --git a/ports/cortex_a8/gnu/src/tx_thread_fiq_context_restore.S b/ports/cortex_a8/gnu/src/tx_thread_fiq_context_restore.S
index 006be973..17ad02bf 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_fiq_context_restore.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_fiq_context_restore.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
SVC_MODE = 0xD3 // SVC mode
FIQ_MODE = 0xD1 // FIQ mode
@@ -86,6 +89,9 @@ IRQ_MODE_BITS = 0x12 // IRQ mode bits
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_fiq_context_restore
diff --git a/ports/cortex_a8/gnu/src/tx_thread_fiq_context_save.S b/ports/cortex_a8/gnu/src/tx_thread_fiq_context_save.S
index 7db6a4c2..7ab2ee94 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_fiq_context_save.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_fiq_context_save.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.global _tx_thread_system_state
.global _tx_thread_current_ptr
@@ -74,6 +77,9 @@
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_fiq_context_save
diff --git a/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_end.S b/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_end.S
index b34d881e..52282fc9 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_end.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_end.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
#ifdef TX_ENABLE_FIQ_SUPPORT
DISABLE_INTS = 0xC0 // Disable IRQ/FIQ interrupts
@@ -82,6 +85,9 @@ FIQ_MODE_BITS = 0x11 // FIQ mode bits
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_fiq_nesting_end
diff --git a/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_start.S b/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_start.S
index c9cd5a06..3fd8c001 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_start.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_fiq_nesting_start.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
FIQ_DISABLE = 0x40 // FIQ disable bit
MODE_MASK = 0x1F // Mode mask
@@ -75,6 +78,9 @@ SYS_MODE_BITS = 0x1F // System mode bits
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_fiq_nesting_start
diff --git a/ports/cortex_a8/gnu/src/tx_thread_interrupt_control.S b/ports/cortex_a8/gnu/src/tx_thread_interrupt_control.S
index 63b1609a..092e9a31 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_interrupt_control.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_interrupt_control.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
INT_MASK = 0x03F
@@ -80,6 +83,9 @@ $_tx_thread_interrupt_control:
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_interrupt_control
diff --git a/ports/cortex_a8/gnu/src/tx_thread_interrupt_disable.S b/ports/cortex_a8/gnu/src/tx_thread_interrupt_disable.S
index 13258808..f6ff7824 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_interrupt_disable.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_interrupt_disable.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#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. */
@@ -76,6 +79,9 @@ $_tx_thread_interrupt_disable:
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_interrupt_disable
diff --git a/ports/cortex_a8/gnu/src/tx_thread_interrupt_restore.S b/ports/cortex_a8/gnu/src/tx_thread_interrupt_restore.S
index 2d582511..6543798e 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_interrupt_restore.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_interrupt_restore.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#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. */
@@ -77,6 +80,9 @@ $_tx_thread_interrupt_restore:
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_interrupt_restore
diff --git a/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_end.S b/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_end.S
index ec7e63c6..759421e8 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_end.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_end.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
#ifdef TX_ENABLE_FIQ_SUPPORT
DISABLE_INTS = 0xC0 // Disable IRQ/FIQ interrupts
@@ -82,6 +85,9 @@ IRQ_MODE_BITS = 0x12 // IRQ mode bits
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_irq_nesting_end
diff --git a/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_start.S b/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_start.S
index c69976ed..a02846e6 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_start.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_irq_nesting_start.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
IRQ_DISABLE = 0x80 // IRQ disable bit
MODE_MASK = 0x1F // Mode mask
@@ -75,6 +78,9 @@ SYS_MODE_BITS = 0x1F // System mode bits
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_irq_nesting_start
diff --git a/ports/cortex_a8/gnu/src/tx_thread_schedule.S b/ports/cortex_a8/gnu/src/tx_thread_schedule.S
index 8330e9df..e36e01ed 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_schedule.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_schedule.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.global _tx_thread_execute_ptr
.global _tx_thread_current_ptr
@@ -89,6 +92,9 @@ $_tx_thread_schedule:
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_schedule
diff --git a/ports/cortex_a8/gnu/src/tx_thread_stack_build.S b/ports/cortex_a8/gnu/src/tx_thread_stack_build.S
index f413e673..624670b4 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_stack_build.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_stack_build.S
@@ -19,6 +19,10 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
+
.arm
SVC_MODE = 0x13 // SVC mode
@@ -89,6 +93,9 @@ $_tx_thread_stack_build:
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_stack_build
diff --git a/ports/cortex_a8/gnu/src/tx_thread_system_return.S b/ports/cortex_a8/gnu/src/tx_thread_system_return.S
index cb7d62ce..13475407 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_system_return.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_system_return.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.arm
@@ -92,6 +95,9 @@ $_tx_thread_system_return:
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_system_return
diff --git a/ports/cortex_a8/gnu/src/tx_thread_vectored_context_save.S b/ports/cortex_a8/gnu/src/tx_thread_vectored_context_save.S
index d846223f..f9ba7889 100644
--- a/ports/cortex_a8/gnu/src/tx_thread_vectored_context_save.S
+++ b/ports/cortex_a8/gnu/src/tx_thread_vectored_context_save.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.global _tx_thread_system_state
.global _tx_thread_current_ptr
@@ -74,6 +77,9 @@
/* resulting in version 6.1.9 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_thread_vectored_context_save
diff --git a/ports/cortex_a8/gnu/src/tx_timer_interrupt.S b/ports/cortex_a8/gnu/src/tx_timer_interrupt.S
index 7337ed0c..717d2620 100644
--- a/ports/cortex_a8/gnu/src/tx_timer_interrupt.S
+++ b/ports/cortex_a8/gnu/src/tx_timer_interrupt.S
@@ -19,6 +19,9 @@
/** */
/**************************************************************************/
/**************************************************************************/
+#ifdef TX_INCLUDE_USER_DEFINE_FILE
+#include "tx_user.h"
+#endif
.arm
@@ -98,6 +101,9 @@ $_tx_timer_interrupt:
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
/* 04-25-2022 Zhen Kong Updated comments, */
/* resulting in version 6.1.11 */
+/* 03-08-2023 Cindy Deng Modified comment(s), added */
+/* #include tx_user.h, */
+/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
.global _tx_timer_interrupt
diff --git a/ports/cortex_a8/iar/inc/tx_port.h b/ports/cortex_a8/iar/inc/tx_port.h
index e8060631..f03ea9ea 100644
--- a/ports/cortex_a8/iar/inc/tx_port.h
+++ b/ports/cortex_a8/iar/inc/tx_port.h
@@ -384,7 +384,7 @@ void tx_thread_vfp_disable(void);
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-A8/IAR Version 6.1.9 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX Cortex-A8/IAR Version 6.2.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
diff --git a/ports/cortex_a8/iar/src/tx_thread_context_restore.s b/ports/cortex_a8/iar/src/tx_thread_context_restore.s
index e200cc72..2c188a39 100644
--- a/ports/cortex_a8/iar/src/tx_thread_context_restore.s
+++ b/ports/cortex_a8/iar/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_a8/iar/src/tx_thread_fiq_context_restore.s b/ports/cortex_a8/iar/src/tx_thread_fiq_context_restore.s
index 5bf3454b..40bf61a6 100644
--- a/ports/cortex_a8/iar/src/tx_thread_fiq_context_restore.s
+++ b/ports/cortex_a8/iar/src/tx_thread_fiq_context_restore.s
@@ -141,7 +141,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))
; {
;