Skip to content

Commit e2a8334

Browse files
TiejunZhou-CNTiejunZhou-CN
authored
Include tx_user.h in cortex_m3/4/7 IAR and AC5 port (#255)
* Include tx_user.h in ARMv7-M IAR port * Include tx_user.h in ARMv7-M AC5 port * Include tx_user.h in cortex_m3/4/7 IAR and AC5 port
1 parent 7a3bb83 commit e2a8334

File tree

126 files changed

+873
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+873
-124
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@ install_manifest.txt
1313
compile_commands.json
1414
CTestTestfile.cmake
1515
*.dep
16+
*.o
17+
*.axf
18+
*.map
19+
*.a
20+
*.htm
1621

‎ports/cortex_m3/ac5/src/tx_thread_context_restore.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
2428
IMPORT _tx_execution_isr_exit
2529
#endif
@@ -31,7 +35,7 @@
3135
/* FUNCTION RELEASE */
3236
/* */
3337
/* _tx_thread_context_restore Cortex-M3/AC5 */
34-
/* 6.1.7 */
38+
/* 6.x */
3539
/* AUTHOR */
3640
/* */
3741
/* Scott Larson, Microsoft Corporation */
@@ -62,6 +66,8 @@
6266
/* DATE NAME DESCRIPTION */
6367
/* */
6468
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
69+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
70+
/* resulting in version 6.x */
6571
/* */
6672
/**************************************************************************/
6773
// VOID _tx_thread_context_restore(VOID)

‎ports/cortex_m3/ac5/src/tx_thread_context_save.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
#if (defined(TX_ENABLE_EXECUTION_CHANGE_NOTIFY) || defined(TX_EXECUTION_PROFILE_ENABLE))
2428
IMPORT _tx_execution_isr_enter
2529
#endif
@@ -31,7 +35,7 @@
3135
/* FUNCTION RELEASE */
3236
/* */
3337
/* _tx_thread_context_save Cortex-M3/AC5 */
34-
/* 6.1.7 */
38+
/* 6.x */
3539
/* AUTHOR */
3640
/* */
3741
/* Scott Larson, Microsoft Corporation */
@@ -62,6 +66,8 @@
6266
/* DATE NAME DESCRIPTION */
6367
/* */
6468
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
69+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
70+
/* resulting in version 6.x */
6571
/* */
6672
/**************************************************************************/
6773
// VOID _tx_thread_context_save(VOID)

‎ports/cortex_m3/ac5/src/tx_thread_interrupt_control.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
AREA ||.text||, CODE, READONLY
2428
/**************************************************************************/
2529
/* */
2630
/* FUNCTION RELEASE */
2731
/* */
2832
/* _tx_thread_interrupt_control Cortex-M3/AC5 */
29-
/* 6.1.7 */
33+
/* 6.x */
3034
/* AUTHOR */
3135
/* */
3236
/* Scott Larson, Microsoft Corporation */
@@ -57,6 +61,8 @@
5761
/* DATE NAME DESCRIPTION */
5862
/* */
5963
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
64+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
65+
/* resulting in version 6.x */
6066
/* */
6167
/**************************************************************************/
6268
// UINT _tx_thread_interrupt_control(UINT new_posture)

‎ports/cortex_m3/ac5/src/tx_thread_interrupt_disable.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
AREA ||.text||, CODE, READONLY
2428
/**************************************************************************/
2529
/* */
2630
/* FUNCTION RELEASE */
2731
/* */
2832
/* _tx_thread_interrupt_disable Cortex-M3/AC5 */
29-
/* 6.1.7 */
33+
/* 6.x */
3034
/* AUTHOR */
3135
/* */
3236
/* Scott Larson, Microsoft Corporation */
@@ -57,6 +61,8 @@
5761
/* DATE NAME DESCRIPTION */
5862
/* */
5963
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
64+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
65+
/* resulting in version 6.x */
6066
/* */
6167
/**************************************************************************/
6268
// UINT _tx_thread_interrupt_disable(VOID)

‎ports/cortex_m3/ac5/src/tx_thread_interrupt_restore.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
AREA ||.text||, CODE, READONLY
2428
/**************************************************************************/
2529
/* */
2630
/* FUNCTION RELEASE */
2731
/* */
2832
/* _tx_thread_interrupt_restore Cortex-M3/AC5 */
29-
/* 6.1.7 */
33+
/* 6.x */
3034
/* AUTHOR */
3135
/* */
3236
/* Scott Larson, Microsoft Corporation */
@@ -57,6 +61,8 @@
5761
/* DATE NAME DESCRIPTION */
5862
/* */
5963
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
64+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
65+
/* resulting in version 6.x */
6066
/* */
6167
/**************************************************************************/
6268
// VOID _tx_thread_interrupt_restore(UINT previous_posture)

‎ports/cortex_m3/ac5/src/tx_thread_schedule.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
IMPORT _tx_thread_current_ptr
2428
IMPORT _tx_thread_execute_ptr
2529
IMPORT _tx_timer_time_slice
@@ -37,7 +41,7 @@
3741
/* FUNCTION RELEASE */
3842
/* */
3943
/* _tx_thread_schedule Cortex-M3/AC5 */
40-
/* 6.1.11 */
44+
/* 6.x */
4145
/* AUTHOR */
4246
/* */
4347
/* Scott Larson, Microsoft Corporation */
@@ -72,6 +76,8 @@
7276
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
7377
/* 04-25-2022 Scott Larson Added BASEPRI support, */
7478
/* resulting in version 6.1.11 */
79+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
80+
/* resulting in version 6.x */
7581
/* */
7682
/**************************************************************************/
7783
// VOID _tx_thread_schedule(VOID)

‎ports/cortex_m3/ac5/src/tx_thread_stack_build.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
AREA ||.text||, CODE, READONLY
2428
/**************************************************************************/
2529
/* */
2630
/* FUNCTION RELEASE */
2731
/* */
2832
/* _tx_thread_stack_build Cortex-M3/AC5 */
29-
/* 6.1.7 */
33+
/* 6.x */
3034
/* AUTHOR */
3135
/* */
3236
/* Scott Larson, Microsoft Corporation */
@@ -59,6 +63,8 @@
5963
/* DATE NAME DESCRIPTION */
6064
/* */
6165
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
66+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
67+
/* resulting in version 6.x */
6268
/* */
6369
/**************************************************************************/
6470
// VOID _tx_thread_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID))

‎ports/cortex_m3/ac5/src/tx_thread_system_return.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
AREA ||.text||, CODE, READONLY
2428
/**************************************************************************/
2529
/* */
2630
/* FUNCTION RELEASE */
2731
/* */
2832
/* _tx_thread_system_return Cortex-M3/AC5 */
29-
/* 6.1.7 */
33+
/* 6.x */
3034
/* AUTHOR */
3135
/* */
3236
/* Scott Larson, Microsoft Corporation */
@@ -59,6 +63,8 @@
5963
/* DATE NAME DESCRIPTION */
6064
/* */
6165
/* 06-02-2021 Scott Larson Initial Version 6.1.7 */
66+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
67+
/* resulting in version 6.x */
6268
/* */
6369
/**************************************************************************/
6470
// VOID _tx_thread_system_return(VOID)

‎ports/cortex_m3/ac5/src/tx_timer_interrupt.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
/**************************************************************************/
2121
/**************************************************************************/
2222

23+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
24+
#include "tx_user.h"
25+
#endif
26+
2327
IMPORT _tx_timer_time_slice
2428
IMPORT _tx_timer_system_clock
2529
IMPORT _tx_timer_current_ptr
@@ -40,7 +44,7 @@
4044
/* FUNCTION RELEASE */
4145
/* */
4246
/* _tx_timer_interrupt Cortex-M3/AC5 */
43-
/* 6.1.10 */
47+
/* 6.x */
4448
/* AUTHOR */
4549
/* */
4650
/* Scott Larson, Microsoft Corporation */
@@ -77,6 +81,8 @@
7781
/* 01-31-2022 Scott Larson Modified comment(s), added */
7882
/* TX_NO_TIMER support, */
7983
/* resulting in version 6.1.10 */
84+
/* xx-xx-xxxx Tiejun Zhou Included tx_user.h, */
85+
/* resulting in version 6.x */
8086
/* */
8187
/**************************************************************************/
8288
// VOID _tx_timer_interrupt(VOID)

0 commit comments

Comments
 (0)