Skip to content

Commit 515c9a4

Browse files
fdesbiensfdesbiens
authored
Merge pull request #242 from eclipse-threadx/dev
Merging changes ahead of hotfix release 202504a
2 parents 03eccbd + 0c18f1e commit 515c9a4

19 files changed

Lines changed: 390 additions & 331 deletions

File tree

‎common/core/inc/ux_api.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ typedef signed char SCHAR;
350350
#define USBX_MINOR_VERSION 4
351351
#define USBX_PATCH_VERSION 5
352352
#define USBX_BUILD_VERSION 202504
353-
#define USBX_HOTFIX_VERSION ' '
353+
#define USBX_HOTFIX_VERSION 'a'
354354

355355
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
356356

‎ports/arm9/gnu/inc/ux_port.h‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

1111

1212
/**************************************************************************/
1313
/**************************************************************************/
14-
/** */
15-
/** USBX Component */
14+
/** */
15+
/** USBX Component */
1616
/** */
1717
/** Port Specific */
1818
/** */
1919
/**************************************************************************/
2020
/**************************************************************************/
2121

2222

23-
/**************************************************************************/
24-
/* */
25-
/* PORT SPECIFIC C INFORMATION RELEASE */
26-
/* */
27-
/* ux_port.h ARM9/GNU */
23+
/**************************************************************************/
24+
/* */
25+
/* PORT SPECIFIC C INFORMATION RELEASE */
26+
/* */
27+
/* ux_port.h ARM9/GNU */
2828
/* 6.3.0 */
2929
/* */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
3333
/* */
3434
/* DESCRIPTION */
35-
/* */
36-
/* This file contains data type definitions that make USBX function */
37-
/* identically on a variety of different processor architectures. */
38-
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
35+
/* */
36+
/* This file contains data type definitions that make USBX function */
37+
/* identically on a variety of different processor architectures. */
38+
/* */
39+
/* RELEASE HISTORY */
40+
/* */
41+
/* DATE NAME DESCRIPTION */
42+
/* */
4343
/* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */
4444
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
4545
/* moved tx_api.h include and */
@@ -61,7 +61,7 @@
6161
#ifdef UX_INCLUDE_USER_DEFINE_FILE
6262

6363

64-
/* Yes, include the user defines in ux_user.h. The defines in this file may
64+
/* Yes, include the user defines in ux_user.h. The defines in this file may
6565
alternately be defined on the command line. */
6666

6767
#include "ux_user.h"
@@ -210,6 +210,10 @@ typedef LONG SLONG;
210210
#define UX_SLAVE_REQUEST_DATA_MAX_LENGTH 4096
211211
#endif
212212

213+
#ifndef UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT
214+
#define UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT 8
215+
#endif
216+
213217
#ifndef UX_USE_IO_INSTRUCTIONS
214218

215219
/* Don't use IO instructions if this define is not set. Default to memory mapped. */
@@ -251,7 +255,7 @@ VOID outpl(ULONG,ULONG);
251255
/* Define the version ID of USBX. This may be utilized by the application. */
252256

253257
#ifdef UX_SYSTEM_INIT
254-
CHAR _ux_version_id[] =
258+
CHAR _ux_version_id[] =
255259
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/GNU Version 6.4.1 *";
256260
#else
257261
extern CHAR _ux_version_id[];

‎ports/cortex_a15/gnu/inc/ux_port.h‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

1111

1212
/**************************************************************************/
1313
/**************************************************************************/
14-
/** */
15-
/** USBX Component */
14+
/** */
15+
/** USBX Component */
1616
/** */
1717
/** Port Specific */
1818
/** */
1919
/**************************************************************************/
2020
/**************************************************************************/
2121

2222

23-
/**************************************************************************/
24-
/* */
25-
/* PORT SPECIFIC C INFORMATION RELEASE */
26-
/* */
27-
/* ux_port.h Cortex-A15/GNU */
23+
/**************************************************************************/
24+
/* */
25+
/* PORT SPECIFIC C INFORMATION RELEASE */
26+
/* */
27+
/* ux_port.h Cortex-A15/GNU */
2828
/* 6.3.0 */
2929
/* */
3030
/* AUTHOR */
3131
/* */
3232
/* Chaoqiong Xiao, Microsoft Corporation */
3333
/* */
3434
/* DESCRIPTION */
35-
/* */
36-
/* This file contains data type definitions that make USBX function */
37-
/* identically on a variety of different processor architectures. */
38-
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
35+
/* */
36+
/* This file contains data type definitions that make USBX function */
37+
/* identically on a variety of different processor architectures. */
38+
/* */
39+
/* RELEASE HISTORY */
40+
/* */
41+
/* DATE NAME DESCRIPTION */
42+
/* */
4343
/* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */
4444
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
4545
/* moved tx_api.h include and */
@@ -61,7 +61,7 @@
6161
#ifdef UX_INCLUDE_USER_DEFINE_FILE
6262

6363

64-
/* Yes, include the user defines in ux_user.h. The defines in this file may
64+
/* Yes, include the user defines in ux_user.h. The defines in this file may
6565
alternately be defined on the command line. */
6666

6767
#include "ux_user.h"
@@ -210,6 +210,10 @@ typedef LONG SLONG;
210210
#define UX_SLAVE_REQUEST_DATA_MAX_LENGTH 4096
211211
#endif
212212

213+
#ifndef UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT
214+
#define UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT 8
215+
#endif
216+
213217
#ifndef UX_USE_IO_INSTRUCTIONS
214218

215219
/* Don't use IO instructions if this define is not set. Default to memory mapped. */
@@ -247,7 +251,7 @@ VOID outpl(ULONG,ULONG);
247251
/* Define the version ID of USBX. This may be utilized by the application. */
248252

249253
#ifdef UX_SYSTEM_INIT
250-
CHAR _ux_version_id[] =
254+
CHAR _ux_version_id[] =
251255
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A15/GNU Version 6.4.1 *";
252256
#else
253257
extern CHAR _ux_version_id[];

‎ports/cortex_a5x/ac6/inc/ux_port.h‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
/***************************************************************************
2-
* Copyright (c) 2024 Microsoft Corporation
3-
*
2+
* Copyright (c) 2024 Microsoft Corporation
3+
*
44
* This program and the accompanying materials are made available under the
55
* terms of the MIT License which is available at
66
* https://opensource.org/licenses/MIT.
7-
*
7+
*
88
* SPDX-License-Identifier: MIT
99
**************************************************************************/
1010

1111

1212
/**************************************************************************/
1313
/**************************************************************************/
14-
/** */
15-
/** USBX Component */
14+
/** */
15+
/** USBX Component */
1616
/** */
1717
/** Port Specific */
1818
/** */
1919
/**************************************************************************/
2020
/**************************************************************************/
2121

2222

23-
/**************************************************************************/
24-
/* */
25-
/* PORT SPECIFIC C INFORMATION RELEASE */
26-
/* */
27-
/* ux_port.h Cortex-A5x/AC6 */
28-
/* 6.3.0 */
23+
/**************************************************************************/
24+
/* */
25+
/* PORT SPECIFIC C INFORMATION RELEASE */
26+
/* */
27+
/* ux_port.h Cortex-A5x/AC6 */
28+
/* 6.3.0 */
29+
/* */
30+
/* AUTHOR */
31+
/* */
32+
/* TCRG, Express Logic, Inc. */
33+
/* */
34+
/* DESCRIPTION */
35+
/* */
36+
/* This file contains data type definitions that make USBX function */
37+
/* identically on a variety of different processor architectures. */
38+
/* */
39+
/* RELEASE HISTORY */
40+
/* */
41+
/* DATE NAME DESCRIPTION */
2942
/* */
30-
/* AUTHOR */
31-
/* */
32-
/* TCRG, Express Logic, Inc. */
33-
/* */
34-
/* DESCRIPTION */
35-
/* */
36-
/* This file contains data type definitions that make USBX function */
37-
/* identically on a variety of different processor architectures. */
38-
/* */
39-
/* RELEASE HISTORY */
40-
/* */
41-
/* DATE NAME DESCRIPTION */
42-
/* */
4343
/* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */
4444
/* 01-31-2022 Chaoqiong Xiao Modified comment(s), */
4545
/* moved tx_api.h include and */
@@ -49,8 +49,8 @@
4949
/* added basic types guards, */
5050
/* improved SLONG typedef, */
5151
/* resulting in version 6.3.0 */
52-
/* */
53-
/**************************************************************************/
52+
/* */
53+
/**************************************************************************/
5454

5555
#ifndef UX_PORT_H
5656
#define UX_PORT_H
@@ -61,7 +61,7 @@
6161
#ifdef UX_INCLUDE_USER_DEFINE_FILE
6262

6363

64-
/* Yes, include the user defines in ux_user.h. The defines in this file may
64+
/* Yes, include the user defines in ux_user.h. The defines in this file may
6565
alternately be defined on the command line. */
6666

6767
#include "ux_user.h"
@@ -206,6 +206,10 @@ typedef LONG SLONG;
206206
#define UX_SLAVE_REQUEST_DATA_MAX_LENGTH 4096
207207
#endif
208208

209+
#ifndef UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT
210+
#define UX_HOST_CLASS_STORAGE_MAX_PARTITIONS_COUNT 8
211+
#endif
212+
209213
/* Define the extension to hold the control block for 64-bit mode. */
210214
#define UX_THREAD_EXTENSION_PTR_SET(a, b) { \
211215
TX_THREAD *thread_ptr; \
@@ -271,7 +275,7 @@ VOID outpl(ULONG,ULONG);
271275
/* Define the version ID of USBX. This may be utilized by the application. */
272276

273277
#ifdef UX_SYSTEM_INIT
274-
CHAR _ux_version_id[] =
278+
CHAR _ux_version_id[] =
275279
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5x/AC6 Version 6.4.1 *";
276280
#else
277281
extern CHAR _ux_version_id[];

0 commit comments

Comments
 (0)