diff options
| author | Tiejun Zhou <[email protected]> | 2023-03-08 08:26:22 +0000 |
|---|---|---|
| committer | Tiejun Zhou <[email protected]> | 2023-03-08 08:26:22 +0000 |
| commit | 2aa19f3de0b6cf09bb9dca78c8a53fe337b8f0f7 (patch) | |
| tree | 8ec91a64e0831e3100a6ad9a5dec41d9fd7fc74f /ports/arm11/gnu/src | |
| parent | 745395d6a2f931c85c4428425db21eb7d03b4324 (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/arm11/gnu/src')
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_context_restore.S | 22 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_context_save.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_fiq_context_restore.S | 23 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_fiq_context_save.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_fiq_nesting_end.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_fiq_nesting_start.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_interrupt_control.S | 18 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_interrupt_disable.S | 19 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_interrupt_restore.S | 19 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_irq_nesting_end.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_irq_nesting_start.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_schedule.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_stack_build.S | 19 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_system_return.S | 19 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_thread_vectored_context_save.S | 20 | ||||
| -rw-r--r-- | ports/arm11/gnu/src/tx_timer_interrupt.S | 20 |
16 files changed, 130 insertions, 189 deletions
diff --git a/ports/arm11/gnu/src/tx_thread_context_restore.S b/ports/arm11/gnu/src/tx_thread_context_restore.S index 307bbee8..ee41226f 100644 --- a/ports/arm11/gnu/src/tx_thread_context_restore.S +++ b/ports/arm11/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 @@ -60,7 +53,7 @@ IRQ_MODE = 0x92 @ Disable IRQ, IRQ mode @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_context_restore ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -93,6 +86,9 @@ IRQ_MODE = 0x92 @ Disable IRQ, IRQ mode @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_context_restore(VOID) @@ -138,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/arm11/gnu/src/tx_thread_context_save.S b/ports/arm11/gnu/src/tx_thread_context_save.S index 29da6606..906bd013 100644 --- a/ports/arm11/gnu/src/tx_thread_context_save.S +++ b/ports/arm11/gnu/src/tx_thread_context_save.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 + #ifdef TX_ENABLE_FIQ_SUPPORT DISABLE_INTS = 0xC0 @ IRQ & FIQ interrupts disabled #else @@ -53,7 +46,7 @@ DISABLE_INTS = 0x80 @ IRQ interrupts disabled @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_context_save ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -85,6 +78,9 @@ DISABLE_INTS = 0x80 @ IRQ interrupts disabled @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_context_save(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_fiq_context_restore.S b/ports/arm11/gnu/src/tx_thread_fiq_context_restore.S index 6db8a024..ab0560e0 100644 --- a/ports/arm11/gnu/src/tx_thread_fiq_context_restore.S +++ b/ports/arm11/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 DISABLE_INTS = 0xC0 @ Disable IRQ/FIQ interrupts @@ -61,7 +53,7 @@ SVC_MODE_BITS = 0x13 @ SVC mode value @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_fiq_context_restore ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -94,6 +86,9 @@ SVC_MODE_BITS = 0x13 @ SVC mode value @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_fiq_context_restore(VOID) @@ -140,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/arm11/gnu/src/tx_thread_fiq_context_save.S b/ports/arm11/gnu/src/tx_thread_fiq_context_save.S index a2b1ee3d..035460cc 100644 --- a/ports/arm11/gnu/src/tx_thread_fiq_context_save.S +++ b/ports/arm11/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 @@ -47,7 +40,7 @@ @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_fiq_context_save ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -79,6 +72,9 @@ @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @ VOID _tx_thread_fiq_context_save(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_fiq_nesting_end.S b/ports/arm11/gnu/src/tx_thread_fiq_nesting_end.S index 8fb04d73..82a66724 100644 --- a/ports/arm11/gnu/src/tx_thread_fiq_nesting_end.S +++ b/ports/arm11/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 @@ -50,7 +43,7 @@ FIQ_MODE_BITS = 0x11 @ FIQ mode bits @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_fiq_nesting_end ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -90,6 +83,9 @@ FIQ_MODE_BITS = 0x11 @ FIQ mode bits @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_fiq_nesting_end(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_fiq_nesting_start.S b/ports/arm11/gnu/src/tx_thread_fiq_nesting_start.S index 9cc647b6..95493ca1 100644 --- a/ports/arm11/gnu/src/tx_thread_fiq_nesting_start.S +++ b/ports/arm11/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 @@ -46,7 +39,7 @@ SYS_MODE_BITS = 0x1F @ System mode bits @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_fiq_nesting_start ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -83,6 +76,9 @@ SYS_MODE_BITS = 0x1F @ System mode bits @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_fiq_nesting_start(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_interrupt_control.S b/ports/arm11/gnu/src/tx_thread_interrupt_control.S index fa19f085..b84fabeb 100644 --- a/ports/arm11/gnu/src/tx_thread_interrupt_control.S +++ b/ports/arm11/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 @@ -56,7 +51,7 @@ $_tx_thread_interrupt_control: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_interrupt_control ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -87,6 +82,9 @@ $_tx_thread_interrupt_control: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @UINT _tx_thread_interrupt_control(UINT new_posture) diff --git a/ports/arm11/gnu/src/tx_thread_interrupt_disable.S b/ports/arm11/gnu/src/tx_thread_interrupt_disable.S index 471eb459..72d1c230 100644 --- a/ports/arm11/gnu/src/tx_thread_interrupt_disable.S +++ b/ports/arm11/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 + #ifdef TX_ENABLE_FIQ_SUPPORT DISABLE_INTS = 0xC0 @ IRQ & FIQ interrupts disabled #else @@ -60,7 +54,7 @@ $_tx_thread_interrupt_disable: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_interrupt_disable ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -90,6 +84,9 @@ $_tx_thread_interrupt_disable: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @UINT _tx_thread_interrupt_disable(void) diff --git a/ports/arm11/gnu/src/tx_thread_interrupt_restore.S b/ports/arm11/gnu/src/tx_thread_interrupt_restore.S index d3b01c55..c6ef2705 100644 --- a/ports/arm11/gnu/src/tx_thread_interrupt_restore.S +++ b/ports/arm11/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. */ @ @@ -53,7 +47,7 @@ $_tx_thread_interrupt_restore: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_interrupt_restore ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -84,6 +78,9 @@ $_tx_thread_interrupt_restore: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @UINT _tx_thread_interrupt_restore(UINT old_posture) diff --git a/ports/arm11/gnu/src/tx_thread_irq_nesting_end.S b/ports/arm11/gnu/src/tx_thread_irq_nesting_end.S index 397be0ed..cc757616 100644 --- a/ports/arm11/gnu/src/tx_thread_irq_nesting_end.S +++ b/ports/arm11/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 @@ -50,7 +43,7 @@ IRQ_MODE_BITS = 0x12 @ IRQ mode bits @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_irq_nesting_end ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -90,6 +83,9 @@ IRQ_MODE_BITS = 0x12 @ IRQ mode bits @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_irq_nesting_end(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_irq_nesting_start.S b/ports/arm11/gnu/src/tx_thread_irq_nesting_start.S index 0d04422f..4443f181 100644 --- a/ports/arm11/gnu/src/tx_thread_irq_nesting_start.S +++ b/ports/arm11/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 @@ -46,7 +39,7 @@ SYS_MODE_BITS = 0x1F @ System mode bits @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_irq_nesting_start ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -83,6 +76,9 @@ SYS_MODE_BITS = 0x1F @ System mode bits @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_irq_nesting_start(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_schedule.S b/ports/arm11/gnu/src/tx_thread_schedule.S index 2f386b0d..20f95d9c 100644 --- a/ports/arm11/gnu/src/tx_thread_schedule.S +++ b/ports/arm11/gnu/src/tx_thread_schedule.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 + #ifdef TX_ENABLE_FIQ_SUPPORT ENABLE_INTS = 0xC0 @ IRQ & FIQ Interrupts enabled mask #else @@ -68,7 +61,7 @@ $_tx_thread_schedule: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_schedule ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -102,6 +95,9 @@ $_tx_thread_schedule: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_schedule(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_stack_build.S b/ports/arm11/gnu/src/tx_thread_stack_build.S index 9117d22e..d471ae98 100644 --- a/ports/arm11/gnu/src/tx_thread_stack_build.S +++ b/ports/arm11/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 @@ -64,7 +58,7 @@ $_tx_thread_stack_build: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_stack_build ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -97,6 +91,9 @@ $_tx_thread_stack_build: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID)) diff --git a/ports/arm11/gnu/src/tx_thread_system_return.S b/ports/arm11/gnu/src/tx_thread_system_return.S index 05024c46..5f021f87 100644 --- a/ports/arm11/gnu/src/tx_thread_system_return.S +++ b/ports/arm11/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 #ifdef TX_ENABLE_FIQ_SUPPORT @@ -70,7 +64,7 @@ $_tx_thread_system_return: @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_system_return ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -103,6 +97,9 @@ $_tx_thread_system_return: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_system_return(VOID) diff --git a/ports/arm11/gnu/src/tx_thread_vectored_context_save.S b/ports/arm11/gnu/src/tx_thread_vectored_context_save.S index 515bd9ca..c92dd20a 100644 --- a/ports/arm11/gnu/src/tx_thread_vectored_context_save.S +++ b/ports/arm11/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 + #ifdef TX_ENABLE_FIQ_SUPPORT DISABLE_INTS = 0xC0 @ IRQ & FIQ interrupts disabled #else @@ -54,7 +47,7 @@ DISABLE_INTS = 0x80 @ IRQ interrupts disabled @/* FUNCTION RELEASE */ @/* */ @/* _tx_thread_vectored_context_save ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -86,6 +79,9 @@ DISABLE_INTS = 0x80 @ IRQ interrupts disabled @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_thread_vectored_context_save(VOID) diff --git a/ports/arm11/gnu/src/tx_timer_interrupt.S b/ports/arm11/gnu/src/tx_timer_interrupt.S index 66705b94..7754ffa4 100644 --- a/ports/arm11/gnu/src/tx_timer_interrupt.S +++ b/ports/arm11/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 @ @@ -71,7 +64,7 @@ $_tx_timer_interrupt: @/* FUNCTION RELEASE */ @/* */ @/* _tx_timer_interrupt ARM11/GNU */ -@/* 6.1 */ +@/* 6.2.1 */ @/* AUTHOR */ @/* */ @/* William E. Lamie, Microsoft Corporation */ @@ -106,6 +99,9 @@ $_tx_timer_interrupt: @/* DATE NAME DESCRIPTION */ @/* */ @/* 09-30-2020 William E. Lamie Initial Version 6.1 */ +@/* 03-08-2023 Cindy Deng Modified comment(s), added */ +@/* #include tx_user.h, */ +@/* resulting in version 6.2.1 */ @/* */ @/**************************************************************************/ @VOID _tx_timer_interrupt(VOID) |
