Skip to content

Commit a9b31c3

Browse files
authored
Merge pull request #495 from eclipse-threadx/dev
Merge changes ahead of the v6.4.5.202504 release
2 parents c4ad279 + 5c58767 commit a9b31c3

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

common/inc/tx_api.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ extern "C" {
148148
#define AZURE_RTOS_THREADX
149149
#define THREADX_MAJOR_VERSION 6
150150
#define THREADX_MINOR_VERSION 4
151-
#define THREADX_PATCH_VERSION 3
152-
#define THREADX_BUILD_VERSION 202503
153-
#define THREADX_HOTFIX_VERSION ''
151+
#define THREADX_PATCH_VERSION 5
152+
#define THREADX_BUILD_VERSION 202504
153+
#define THREADX_HOTFIX_VERSION ' '
154154

155155
/* Define the following symbol for backward compatibility */
156156
#define EL_PRODUCT_THREADX

common_smp/inc/tx_api.h

Lines changed: 10 additions & 9 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

@@ -135,9 +135,10 @@ extern "C" {
135135
#ifndef TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH
136136
#define TX_BYTE_POOL_MULTIPLE_BLOCK_SEARCH 20
137137
#endif
138-
#ifndef TX_BTYE_POOL_DELAY_VALUE
138+
139+
#ifndef TX_BYTE_POOL_DELAY_VALUE
139140
#define TX_BYTE_POOL_DELAY_VALUE 3
140-
#endif
141+
#endif /* TX_BYTE_POOL_DELAY_VALUE */
141142

142143

143144
/* Define basic constants for the ThreadX kernel. */
@@ -149,9 +150,9 @@ extern "C" {
149150
#define AZURE_RTOS_THREADX
150151
#define THREADX_MAJOR_VERSION 6
151152
#define THREADX_MINOR_VERSION 4
152-
#define THREADX_PATCH_VERSION 3
153-
#define THREADX_BUILD_VERSION 202503
154-
#define THREADX_HOTFIX_VERSION ''
153+
#define THREADX_PATCH_VERSION 5
154+
#define THREADX_BUILD_VERSION 202504
155+
#define THREADX_HOTFIX_VERSION ' '
155156

156157

157158
/* Define the following symbol for backward compatibility */
@@ -659,7 +660,7 @@ typedef struct TX_THREAD_STRUCT
659660
ULONG tx_thread_suspension_sequence;
660661

661662
#if defined(TX_ENABLE_RANDOM_NUMBER_STACK_FILLING) && defined(TX_ENABLE_STACK_CHECKING)
662-
663+
663664
/* Define the random stack fill number. This can be used to detect stack overflow. */
664665
ULONG tx_thread_stack_fill_value;
665666
#endif

0 commit comments

Comments
 (0)