Skip to content

Commit 098ad14

Browse files
wickstewickste
authored
Merge branch 'master' into ayedm-update
2 parents d2e4ec6 + 7f21ebf commit 098ad14

File tree

28 files changed

+2669
-28
lines changed

28 files changed

+2669
-28
lines changed

‎common/core/inc/ux_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
/* ux_api.h PORTABLE C */
28-
/* 6.4.0 */
28+
/* 6.4.1 */
2929
/* AUTHOR */
3030
/* */
3131
/* Chaoqiong Xiao, Microsoft Corporation */
@@ -141,6 +141,9 @@
141141
/* resulting in version 6.3.0 */
142142
/* 12-31-2023 Chaoqiong Xiao Modified comment(s), */
143143
/* resulting in version 6.4.0 */
144+
/* 03-01-2024 Tiejun Zhou Modified comment(s), */
145+
/* update version number, */
146+
/* resulting in version 6.4.1 */
144147
/* */
145148
/**************************************************************************/
146149

@@ -342,7 +345,7 @@ typedef signed char SCHAR;
342345
#define AZURE_RTOS_USBX
343346
#define USBX_MAJOR_VERSION 6
344347
#define USBX_MINOR_VERSION 4
345-
#define USBX_PATCH_VERSION 0
348+
#define USBX_PATCH_VERSION 1
346349

347350
/* Macros for concatenating tokens, where UX_CONCATn concatenates n tokens. */
348351

‎docs/revision_history.txt

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ VOID outpl(ULONG,ULONG);
252252

253253
#ifdef UX_SYSTEM_INIT
254254
CHAR _ux_version_id[] =
255-
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/GNU Version 6.4.0 *";
255+
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/GNU Version 6.4.1 *";
256256
#else
257257
extern CHAR _ux_version_id[];
258258
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ VOID outpl(ULONG,ULONG);
259259

260260
#ifdef UX_SYSTEM_INIT
261261
CHAR _ux_version_id[] =
262-
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/IAR Version 6.4.0 *";
262+
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/IAR Version 6.4.1 *";
263263
#else
264264
extern CHAR _ux_version_id[];
265265
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ VOID outpl(ULONG,ULONG);
248248

249249
#ifdef UX_SYSTEM_INIT
250250
CHAR _ux_version_id[] =
251-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A15/GNU Version 6.4.0 *";
251+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A15/GNU Version 6.4.1 *";
252252
#else
253253
extern CHAR _ux_version_id[];
254254
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5/GNU Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5/GNU Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

‎ports/cortex_a5/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ VOID outpl(ULONG,ULONG);
272272

273273
#ifdef UX_SYSTEM_INIT
274274
CHAR _ux_version_id[] =
275-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5x/AC6 Version 6.4.0 *";
275+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A5x/AC6 Version 6.4.1 *";
276276
#else
277277
extern CHAR _ux_version_id[];
278278
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ VOID outpl(ULONG,ULONG);
259259

260260
#ifdef UX_SYSTEM_INIT
261261
CHAR _ux_version_id[] =
262-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A7/GNU Version 6.4.0 *";
262+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A7/GNU Version 6.4.1 *";
263263
#else
264264
extern CHAR _ux_version_id[];
265265
#endif

‎ports/cortex_a7/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ VOID outpl(ULONG,ULONG);
259259

260260
#ifdef UX_SYSTEM_INIT
261261
CHAR _ux_version_id[] =
262-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A7/IAR Version 6.4.0 *";
262+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A7/IAR Version 6.4.1 *";
263263
#else
264264
extern CHAR _ux_version_id[];
265265
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A8/GNU Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A8/GNU Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

‎ports/cortex_a8/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A8/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-A8/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/GNU Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/GNU Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

‎ports/cortex_a9/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX ARM9/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ VOID outpl(ULONG,ULONG);
253253

254254
#ifdef UX_SYSTEM_INIT
255255
CHAR _ux_version_id[] =
256-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M0/GNU Version 6.4.0 *";
256+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M0/GNU Version 6.4.1 *";
257257
#else
258258
extern CHAR _ux_version_id[];
259259
#endif

‎ports/cortex_m0/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M0/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M0/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ VOID outpl(ULONG,ULONG);
253253

254254
#ifdef UX_SYSTEM_INIT
255255
CHAR _ux_version_id[] =
256-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M3/GNU Version 6.4.0 *";
256+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M3/GNU Version 6.4.1 *";
257257
#else
258258
extern CHAR _ux_version_id[];
259259
#endif

‎ports/cortex_m3/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M3/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M3/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ VOID outpl(ULONG,ULONG);
253253

254254
#ifdef UX_SYSTEM_INIT
255255
CHAR _ux_version_id[] =
256-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M4/GNU Version 6.4.0 *";
256+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M4/GNU Version 6.4.1 *";
257257
#else
258258
extern CHAR _ux_version_id[];
259259
#endif

‎ports/cortex_m4/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M4/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M4/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ VOID outpl(ULONG,ULONG);
253253

254254
#ifdef UX_SYSTEM_INIT
255255
CHAR _ux_version_id[] =
256-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M7/GNU Version 6.4.0 *";
256+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M7/GNU Version 6.4.1 *";
257257
#else
258258
extern CHAR _ux_version_id[];
259259
#endif

‎ports/cortex_m7/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M7/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-M7/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ VOID outpl(ULONG,ULONG);
251251

252252
#ifdef UX_SYSTEM_INIT
253253
CHAR _ux_version_id[] =
254-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R4/GNU Version 6.4.0 *";
254+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R4/GNU Version 6.4.1 *";
255255
#else
256256
extern CHAR _ux_version_id[];
257257
#endif

‎ports/cortex_r4/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R4/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R4/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R5/GNU Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R5/GNU Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

‎ports/cortex_r5/iar/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ VOID outpl(ULONG,ULONG);
255255

256256
#ifdef UX_SYSTEM_INIT
257257
CHAR _ux_version_id[] =
258-
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R5/IAR Version 6.4.0 *";
258+
"Copyright (c) 2024 Microsoft Corporation. * USBX Cortex-R5/IAR Version 6.4.1 *";
259259
#else
260260
extern CHAR _ux_version_id[];
261261
#endif

‎ports/generic/inc/ux_port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ VOID outpl(ULONG,ULONG);
256256

257257
#ifdef UX_SYSTEM_INIT
258258
CHAR _ux_version_id[] =
259-
"Copyright (c) 2024 Microsoft Corporation. * USBX Generic Version 6.4.0 *";
259+
"Copyright (c) 2024 Microsoft Corporation. * USBX Generic Version 6.4.1 *";
260260
#else
261261
extern CHAR _ux_version_id[];
262262
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ ULONG outpl(ULONG,ULONG);
257257

258258
#ifdef UX_SYSTEM_INIT
259259
CHAR _ux_version_id[] =
260-
"Copyright (c) 2024 Microsoft Corporation. * USBX Linux/GNU Version 6.4.0 *";
260+
"Copyright (c) 2024 Microsoft Corporation. * USBX Linux/GNU Version 6.4.1 *";
261261
#else
262262
extern CHAR _ux_version_id[];
263263
#endif

0 commit comments

Comments
 (0)