Skip to content

Commit bb6e295

Browse files
fdesbiensfdesbiens
authored
Merge pull request #87 from eclipse-threadx/dev
Merge changes ahead of the v6.5.0.202601 release
2 parents 454d0fe + 3ce5359 commit bb6e295

File tree

375 files changed

+14966
-16655
lines changed

Some content is hidden

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

375 files changed

+14966
-16655
lines changed

‎common/inc/fx_api.h‎

Lines changed: 7 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -37,59 +38,6 @@
3738
/* All service prototypes and data structure definitions are defined */
3839
/* in this file. */
3940
/* */
40-
/* RELEASE HISTORY */
41-
/* */
42-
/* DATE NAME DESCRIPTION */
43-
/* */
44-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
45-
/* 09-30-2020 William E. Lamie Modified comment(s), and */
46-
/* updated product constants, */
47-
/* and added conditionals to */
48-
/* disable few declarations */
49-
/* for code size reduction, */
50-
/* resulting in version 6.1 */
51-
/* 11-09-2020 William E. Lamie Modified comment(s), */
52-
/* resulting in version 6.1.2 */
53-
/* 12-31-2020 William E. Lamie Modified comment(s), and */
54-
/* updated product constants, */
55-
/* resulting in version 6.1.3 */
56-
/* 03-02-2021 William E. Lamie Modified comment(s), and */
57-
/* added standalone support, */
58-
/* resulting in version 6.1.5 */
59-
/* 04-02-2021 William E. Lamie Modified comment(s), and */
60-
/* updated product constants, */
61-
/* resulting in version 6.1.6 */
62-
/* 06-02-2021 William E. Lamie Modified comment(s), and */
63-
/* updated product constants, */
64-
/* resulting in version 6.1.7 */
65-
/* 08-02-2021 William E. Lamie Modified comment(s), and */
66-
/* updated product constants, */
67-
/* resulting in version 6.1.8 */
68-
/* 01-31-2022 Bhupendra Naphade Modified comment(s), fixed */
69-
/* errors without cache, */
70-
/* resulting in version 6.1.10 */
71-
/* 04-25-2022 William E. Lamie Modified comment(s), and */
72-
/* updated product constants, */
73-
/* resulting in version 6.1.11 */
74-
/* 07-29-2022 William E. Lamie Modified comment(s), and */
75-
/* updated product constants, */
76-
/* resulting in version 6.1.12 */
77-
/* 10-31-2022 Xiuwen Cai Modified comment(s), and */
78-
/* updated product constants, */
79-
/* resulting in version 6.2.0 */
80-
/* 03-08-2023 Xiuwen Cai Modified comment(s), and */
81-
/* updated product constants, */
82-
/* resulting in version 6.2.1 */
83-
/* 10-31-2023 Xiuwen Cai Modified comment(s), and */
84-
/* updated product constants, */
85-
/* resulting in version 6.3.0 */
86-
/* 12-31-2023 Xiuwen Cai Modified comment(s), and */
87-
/* updated product constants, */
88-
/* resulting in version 6.4.0 */
89-
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
90-
/* update version number, */
91-
/* resulting in version 6.4.1 */
92-
/* */
9341
/**************************************************************************/
9442

9543
#ifndef FX_API_H
@@ -137,9 +85,9 @@ extern "C" {
13785

13886
#define AZURE_RTOS_FILEX
13987
#define FILEX_MAJOR_VERSION 6
140-
#define FILEX_MINOR_VERSION 4
141-
#define FILEX_PATCH_VERSION 5
142-
#define FILEX_BUILD_VERSION 202504
88+
#define FILEX_MINOR_VERSION 5
89+
#define FILEX_PATCH_VERSION 0
90+
#define FILEX_BUILD_VERSION 202601
14391
#define FILEX_HOTFIX_VERSION ' '
14492

14593
/* Define the following symbols for backward compatibility */

‎common/inc/fx_directory.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* definitions, and external references. It is assumed that fx_api.h */
3738
/* (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef FX_DIRECTORY_H

‎common/inc/fx_fault_tolerant.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* data definitions, and external references. It is assumed that */
3738
/* fx_api.h (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef _FX_FAULT_TOLERANT_H_

‎common/inc/fx_file.h‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,16 +37,6 @@
3637
/* definitions, and external references. It is assumed that fx_api.h */
3738
/* (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), and */
45-
/* added conditional to */
46-
/* disable one line function, */
47-
/* resulting in version 6.1 */
48-
/* */
4940
/**************************************************************************/
5041

5142
#ifndef FX_FILE_H

‎common/inc/fx_media.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* definitions, and external references. It is assumed that fx_api.h */
3738
/* (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef FX_MEDIA_H

‎common/inc/fx_system.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* definitions, including external references. It is assumed that */
3738
/* fx_api.h (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef FX_SYSTEM_H

‎common/inc/fx_unicode.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* definitions, and external references. It is assumed that fx_api.h */
3738
/* (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef FX_UNICODE_H

‎common/inc/fx_user_sample.h‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -39,20 +40,6 @@
3940
/* Note that all the defines in this file may also be made on the */
4041
/* command line when building FileX library and application objects. */
4142
/* */
42-
/* RELEASE HISTORY */
43-
/* */
44-
/* DATE NAME DESCRIPTION */
45-
/* */
46-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
47-
/* 09-30-2020 William E. Lamie Modified comment(s), and */
48-
/* added product constants */
49-
/* to enable code */
50-
/* size optimization, */
51-
/* resulting in version 6.1 */
52-
/* 03-02-2021 William E. Lamie Modified comment(s), and */
53-
/* added standalone support, */
54-
/* resulting in version 6.1.5 */
55-
/* */
5643
/**************************************************************************/
5744

5845
#ifndef FX_USER_H

‎common/inc/fx_utility.h‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -36,14 +37,6 @@
3637
/* definitions, and external references. It is assumed that fx_api.h */
3738
/* (and fx_port.h) have already been included. */
3839
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
43-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
44-
/* 09-30-2020 William E. Lamie Modified comment(s), */
45-
/* resulting in version 6.1 */
46-
/* */
4740
/**************************************************************************/
4841

4942
#ifndef FX_UTILITY_H

‎common/src/fx_directory_attributes_read.c‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
* Copyright (c) 2026-present Eclipse ThreadX contributors
4+
*
45
* This program and the accompanying materials are made available under the
56
* terms of the MIT License which is available at
67
* https://opensource.org/licenses/MIT.
7-
*
8+
*
89
* SPDX-License-Identifier: MIT
910
**************************************************************************/
1011

@@ -68,14 +69,6 @@
6869
/* */
6970
/* Application Code */
7071
/* */
71-
/* RELEASE HISTORY */
72-
/* */
73-
/* DATE NAME DESCRIPTION */
74-
/* */
75-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
76-
/* 09-30-2020 William E. Lamie Modified comment(s), */
77-
/* resulting in version 6.1 */
78-
/* */
7972
/**************************************************************************/
8073
UINT _fx_directory_attributes_read(FX_MEDIA *media_ptr, CHAR *directory_name, UINT *attributes_ptr)
8174
{

0 commit comments

Comments
 (0)