Skip to content

Commit d864013

Browse files
wickstewickste
authored
Merge branch 'master' into wickste-patch-6
2 parents f8d677c + 07eac30 commit d864013

File tree

1,036 files changed

+8978
-8212
lines changed

Some content is hidden

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

1,036 files changed

+8978
-8212
lines changed

‎common/inc/tx_api.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/* APPLICATION INTERFACE DEFINITION RELEASE */
2626
/* */
2727
/* tx_api.h PORTABLE C */
28-
/* 6.4.0 */
28+
/* 6.4.1 */
2929
/* AUTHOR */
3030
/* */
3131
/* William E. Lamie, Microsoft Corporation */
@@ -103,6 +103,9 @@
103103
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
104104
/* update version number, */
105105
/* resulting in version 6.4.0 */
106+
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
107+
/* update version number, */
108+
/* resulting in version 6.4.1 */
106109
/* */
107110
/**************************************************************************/
108111

@@ -142,7 +145,7 @@ extern "C" {
142145
#define AZURE_RTOS_THREADX
143146
#define THREADX_MAJOR_VERSION 6
144147
#define THREADX_MINOR_VERSION 4
145-
#define THREADX_PATCH_VERSION 0
148+
#define THREADX_PATCH_VERSION 1
146149

147150
/* Define the following symbol for backward compatibility */
148151
#define EL_PRODUCT_THREADX

‎common_smp/inc/tx_api.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/* APPLICATION INTERFACE DEFINITION RELEASE */
2626
/* */
2727
/* tx_api.h PORTABLE SMP */
28-
/* 6.4.0 */
28+
/* 6.4.1 */
2929
/* AUTHOR */
3030
/* */
3131
/* William E. Lamie, Microsoft Corporation */
@@ -91,6 +91,9 @@
9191
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
9292
/* update version number, */
9393
/* resulting in version 6.4.0 */
94+
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
95+
/* update version number, */
96+
/* resulting in version 6.4.1 */
9497
/* */
9598
/**************************************************************************/
9699

@@ -143,7 +146,7 @@ extern "C" {
143146
#define AZURE_RTOS_THREADX
144147
#define THREADX_MAJOR_VERSION 6
145148
#define THREADX_MINOR_VERSION 4
146-
#define THREADX_PATCH_VERSION 0
149+
#define THREADX_PATCH_VERSION 1
147150

148151
/* Define the following symbol for backward compatibility */
149152
#define EL_PRODUCT_THREADX

‎docs/revision_history.txt‎

Lines changed: 1553 additions & 0 deletions
Large diffs are not rendered by default.

‎ports/arc_em/metaware/example_build/sample_threadx/tx_initialize_low_level.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

‎ports/arc_em/metaware/inc/tx_port.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ void _tx_initialize_start_interrupts(void);
321321

322322
#ifdef TX_THREAD_INIT
323323
CHAR _tx_version_id[] =
324-
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARCv2_EM/MetaWare Version 6.4.0 *";
324+
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARCv2_EM/MetaWare Version 6.4.1 *";
325325
#else
326326
#ifdef TX_MISRA_ENABLE
327327
extern CHAR _tx_version_id[100];

‎ports/arc_em/metaware/src/tx_thread_context_restore.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

‎ports/arc_em/metaware/src/tx_thread_context_save.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

‎ports/arc_em/metaware/src/tx_thread_interrupt_control.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

‎ports/arc_em/metaware/src/tx_thread_schedule.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

‎ports/arc_em/metaware/src/tx_thread_stack_build.s‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
;/**************************************************************************/
2-
;/* */
3-
;/* Copyright (c) 2024 Microsoft Corporation. */
4-
;/* */
5-
;/* This software is licensed under the Microsoft Software License */
6-
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
7-
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
8-
;/* and in the root directory of this software. */
9-
;/* */
10-
;/**************************************************************************/
1+
;/***************************************************************************
2+
; * Copyright (c) 2024 Microsoft Corporation
3+
; *
4+
; * This program and the accompanying materials are made available under the
5+
; * terms of the MIT License which is available at
6+
; * https://opensource.org/licenses/MIT.
7+
; *
8+
; * SPDX-License-Identifier: MIT
9+
; **************************************************************************/
1110

1211
;/**************************************************************************/
1312
;/**************************************************************************/

0 commit comments

Comments
 (0)