Skip to content

Commit 4e578be

Browse files
fdesbiensfdesbiens
authored
Merge pull request #186 from ayedm1/use-ux-prefix-to-refer-to-tx-symbols
use UX prefix to refer to TX symbols
2 parents 2d4a4ae + 3295563 commit 4e578be

File tree

3 files changed

+87
-77
lines changed

3 files changed

+87
-77
lines changed

‎common/core/inc/ux_utility.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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

@@ -20,11 +20,11 @@
2020
/**************************************************************************/
2121

2222

23-
/**************************************************************************/
24-
/* */
25-
/* COMPONENT DEFINITION RELEASE */
26-
/* */
27-
/* ux_utility.h PORTABLE C */
23+
/**************************************************************************/
24+
/* */
25+
/* COMPONENT DEFINITION RELEASE */
26+
/* */
27+
/* ux_utility.h PORTABLE C */
2828
/* 6.3.0 */
2929
/* AUTHOR */
3030
/* */

‎common/core/src/ux_utility_timer_create.c

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
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
/** Utility */
1818
/** */
@@ -28,51 +28,56 @@
2828

2929

3030
#if !defined(UX_STANDALONE)
31-
/**************************************************************************/
32-
/* */
33-
/* FUNCTION RELEASE */
34-
/* */
35-
/* _ux_utility_timer_create PORTABLE C */
31+
/**************************************************************************/
32+
/* */
33+
/* FUNCTION RELEASE */
34+
/* */
35+
/* _ux_utility_timer_create PORTABLE C */
3636
/* 6.1.11 */
3737
/* AUTHOR */
3838
/* */
3939
/* Chaoqiong Xiao, Microsoft Corporation */
4040
/* */
4141
/* DESCRIPTION */
42-
/* */
43-
/* This function creates a timer. */
44-
/* */
45-
/* INPUT */
46-
/* */
47-
/* timer Pointer to timer */
48-
/* timer_name Name of timer */
49-
/* */
50-
/* OUTPUT */
51-
/* */
52-
/* Completion Status */
53-
/* */
54-
/* CALLS */
55-
/* */
42+
/* */
43+
/* This function creates a timer. */
44+
/* */
45+
/* INPUT */
46+
/* */
47+
/* timer Pointer to timer */
48+
/* timer_name Name of timer */
49+
/* */
50+
/* OUTPUT */
51+
/* */
52+
/* Completion Status */
53+
/* */
54+
/* CALLS */
55+
/* */
5656
/* tx_timer_create ThreadX timer create */
57-
/* */
58-
/* CALLED BY */
59-
/* */
60-
/* USBX Components */
61-
/* */
62-
/* RELEASE HISTORY */
63-
/* */
64-
/* DATE NAME DESCRIPTION */
65-
/* */
57+
/* */
58+
/* CALLED BY */
59+
/* */
60+
/* USBX Components */
61+
/* */
62+
/* RELEASE HISTORY */
63+
/* */
64+
/* DATE NAME DESCRIPTION */
65+
/* */
6666
/* 05-19-2020 Chaoqiong Xiao Initial Version 6.0 */
6767
/* 09-30-2020 Chaoqiong Xiao Modified comment(s), */
6868
/* resulting in version 6.1 */
6969
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
7070
/* off in standalone build, */
7171
/* resulting in version 6.1.11 */
72+
/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
73+
/* used UX prefix to refer to */
74+
/* TX symbols instead of using */
75+
/* them directly, */
76+
/* resulting in version 6.x */
7277
/* */
7378
/**************************************************************************/
74-
UINT _ux_utility_timer_create(TX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
75-
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
79+
UINT _ux_utility_timer_create(UX_TIMER *timer, CHAR *timer_name, VOID (*expiration_function) (ULONG),
80+
ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks,
7681
UINT activation_flag)
7782
{
7883

‎common/core/src/ux_utility_timer_delete.c

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
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
/** Utility */
1818
/** */
@@ -28,47 +28,52 @@
2828

2929

3030
#if !defined(UX_STANDALONE)
31-
/**************************************************************************/
32-
/* */
33-
/* FUNCTION RELEASE */
34-
/* */
35-
/* _ux_utility_timer_delete PORTABLE C */
36-
/* 6.1.11 */
31+
/**************************************************************************/
32+
/* */
33+
/* FUNCTION RELEASE */
34+
/* */
35+
/* _ux_utility_timer_delete PORTABLE C */
36+
/* 6.x */
3737
/* AUTHOR */
3838
/* */
3939
/* Chaoqiong Xiao, Microsoft Corporation */
4040
/* */
4141
/* DESCRIPTION */
42-
/* */
43-
/* This function deletes a timer. */
44-
/* */
45-
/* INPUT */
46-
/* */
47-
/* timer Pointer to timer */
48-
/* */
49-
/* OUTPUT */
50-
/* */
51-
/* Completion Status */
52-
/* */
53-
/* CALLS */
54-
/* */
42+
/* */
43+
/* This function deletes a timer. */
44+
/* */
45+
/* INPUT */
46+
/* */
47+
/* timer Pointer to timer */
48+
/* */
49+
/* OUTPUT */
50+
/* */
51+
/* Completion Status */
52+
/* */
53+
/* CALLS */
54+
/* */
5555
/* tx_timer_delete ThreadX timer delete */
56-
/* */
57-
/* CALLED BY */
58-
/* */
59-
/* USBX Components */
60-
/* */
61-
/* RELEASE HISTORY */
62-
/* */
63-
/* DATE NAME DESCRIPTION */
64-
/* */
56+
/* */
57+
/* CALLED BY */
58+
/* */
59+
/* USBX Components */
60+
/* */
61+
/* RELEASE HISTORY */
62+
/* */
63+
/* DATE NAME DESCRIPTION */
64+
/* */
6565
/* 09-30-2020 Chaoqiong Xiao Initial Version 6.1 */
6666
/* 04-25-2022 Chaoqiong Xiao Modified comment(s), */
6767
/* off in standalone build, */
6868
/* resulting in version 6.1.11 */
69+
/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), */
70+
/* used UX prefix to refer to */
71+
/* TX symbols instead of using */
72+
/* them directly, */
73+
/* resulting in version 6.x */
6974
/* */
7075
/**************************************************************************/
71-
UINT _ux_utility_timer_delete(TX_TIMER *timer)
76+
UINT _ux_utility_timer_delete(UX_TIMER *timer)
7277
{
7378

7479
UINT status;

0 commit comments

Comments
 (0)