Skip to content

Commit

Permalink
Merge branch 'master' into wickste-patch-6
Browse files Browse the repository at this point in the history
  • Loading branch information
wickste authored Feb 28, 2024
2 parents f8d677c + 07eac30 commit d864013
Show file tree
Hide file tree
Showing 1,036 changed files with 8,978 additions and 8,212 deletions.
7 changes: 5 additions & 2 deletions common/inc/tx_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE C */
/* 6.4.0 */
/* 6.4.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -103,6 +103,9 @@
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.0 */
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -142,7 +145,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 4
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
7 changes: 5 additions & 2 deletions common_smp/inc/tx_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* tx_api.h PORTABLE SMP */
/* 6.4.0 */
/* 6.4.1 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
Expand Down Expand Up @@ -91,6 +91,9 @@
/* 12-31-2023 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.0 */
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
/* update version number, */
/* resulting in version 6.4.1 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -143,7 +146,7 @@ extern "C" {
#define AZURE_RTOS_THREADX
#define THREADX_MAJOR_VERSION 6
#define THREADX_MINOR_VERSION 4
#define THREADX_PATCH_VERSION 0
#define THREADX_PATCH_VERSION 1

/* Define the following symbol for backward compatibility */
#define EL_PRODUCT_THREADX
Expand Down
1,553 changes: 1,553 additions & 0 deletions docs/revision_history.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion ports/arc_em/metaware/inc/tx_port.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ void _tx_initialize_start_interrupts(void);

#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARCv2_EM/MetaWare Version 6.4.0 *";
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARCv2_EM/MetaWare Version 6.4.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_context_restore.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_context_save.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_interrupt_control.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_schedule.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_stack_build.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_thread_system_return.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_em/metaware/src/tx_timer_interrupt.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/

;/**************************************************************************/
;/**************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion ports/arc_hs/metaware/inc/tx_port.h
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ VOID tx_thread_register_bank_assign(VOID *thread_ptr, UINT register_bank);

#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARC_HS/MetaWare Version 6.4.0 *";
"Copyright (c) 2024 Microsoft Corporation. * ThreadX ARC_HS/MetaWare Version 6.4.1 *";
#else
#ifdef TX_MISRA_ENABLE
extern CHAR _tx_version_id[100];
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_hs/metaware/src/tx_initialize_fast_interrupt_setup.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/
;
;
;/**************************************************************************/
Expand Down
19 changes: 9 additions & 10 deletions ports/arc_hs/metaware/src/tx_thread_context_fast_restore.s
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
;/**************************************************************************/
;/* */
;/* Copyright (c) 2024 Microsoft Corporation. */
;/* */
;/* This software is licensed under the Microsoft Software License */
;/* Terms for Microsoft Azure RTOS. Full text of the license can be */
;/* found in the LICENSE file at https://aka.ms/AzureRTOS_EULA */
;/* and in the root directory of this software. */
;/* */
;/**************************************************************************/
;/***************************************************************************
; * Copyright (c) 2024 Microsoft Corporation
; *
; * This program and the accompanying materials are made available under the
; * terms of the MIT License which is available at
; * https://opensource.org/licenses/MIT.
; *
; * SPDX-License-Identifier: MIT
; **************************************************************************/
;
;
;/**************************************************************************/
Expand Down
Loading

0 comments on commit d864013

Please sign in to comment.