Skip to content

Commit 10a7932

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.5
1 parent 32e3b3b commit 10a7932

File tree

184 files changed

+15569
-1858
lines changed

Some content is hidden

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

184 files changed

+15569
-1858
lines changed

‎common/inc/tx_api.h‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* tx_api.h PORTABLE C */
29-
/* 6.1.3 */
29+
/* 6.1.5 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -43,24 +43,29 @@
4343
/* */
4444
/* DATE NAME DESCRIPTION */
4545
/* */
46-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
47-
/* 09-30-2020 William E. Lamie Modified comment(s), and */
46+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
47+
/* 09-30-2020 William E. Lamie Modified comment(s), and */
4848
/* updated product constants, */
4949
/* added new thread execution */
5050
/* state TX_PRIORITY_CHANGE, */
5151
/* added macros for casting */
5252
/* pointers to ALIGN_TYPE, */
5353
/* resulting in version 6.1 */
54-
/* 10-16-2020 William E. Lamie Modified comment(s), and */
54+
/* 10-16-2020 William E. Lamie Modified comment(s), and */
5555
/* increased patch version, */
5656
/* resulting in version 6.1.1 */
57-
/* 11-09-2020 Yuxin Zhou Modified comment(s), and */
57+
/* 11-09-2020 Yuxin Zhou Modified comment(s), and */
5858
/* moved TX_THREAD_GET_SYSTEM_ */
5959
/* STATE to tx_api.h, */
6060
/* resulting in version 6.1.2 */
61-
/* 12-31-2020 William E. Lamie Modified comment(s), and */
61+
/* 12-31-2020 William E. Lamie Modified comment(s), and */
6262
/* increased patch version, */
6363
/* resulting in version 6.1.3 */
64+
/* 03-02-2021 Scott Larson Modified comment(s), and */
65+
/* order defines numerically, */
66+
/* add option to remove FileX */
67+
/* pointer, */
68+
/* resulting in version 6.1.5 */
6469
/* */
6570
/**************************************************************************/
6671

@@ -93,7 +98,7 @@ extern "C" {
9398
#define AZURE_RTOS_THREADX
9499
#define THREADX_MAJOR_VERSION 6
95100
#define THREADX_MINOR_VERSION 1
96-
#define THREADX_PATCH_VERSION 3
101+
#define THREADX_PATCH_VERSION 5
97102

98103
/* Define the following symbol for backward compatibility */
99104
#define EL_PRODUCT_THREADX
@@ -154,7 +159,6 @@ extern "C" {
154159

155160
#define TX_SUCCESS ((UINT) 0x00)
156161
#define TX_DELETED ((UINT) 0x01)
157-
#define TX_NO_MEMORY ((UINT) 0x10)
158162
#define TX_POOL_ERROR ((UINT) 0x02)
159163
#define TX_PTR_ERROR ((UINT) 0x03)
160164
#define TX_WAIT_ERROR ((UINT) 0x04)
@@ -169,6 +173,7 @@ extern "C" {
169173
#define TX_NO_INSTANCE ((UINT) 0x0D)
170174
#define TX_THREAD_ERROR ((UINT) 0x0E)
171175
#define TX_PRIORITY_ERROR ((UINT) 0x0F)
176+
#define TX_NO_MEMORY ((UINT) 0x10)
172177
#define TX_START_ERROR ((UINT) 0x10)
173178
#define TX_DELETE_ERROR ((UINT) 0x11)
174179
#define TX_RESUME_ERROR ((UINT) 0x12)
@@ -422,8 +427,10 @@ typedef struct TX_THREAD_STRUCT
422427
TX_THREAD_EXTENSION_2
423428

424429
/* Define a pointer type for FileX extensions. */
430+
#ifndef TX_NO_FILEX_POINTER
425431
VOID *tx_thread_filex_ptr;
426-
432+
#endif
433+
427434
/* Define the priority inheritance variables. These will be used
428435
to manage priority inheritance changes applied to this thread
429436
as a result of mutex get operations. */
@@ -1092,7 +1099,6 @@ UINT _tx_trace_interrupt_control(UINT new_posture);
10921099

10931100
#ifdef TX_ENABLE_MULTI_ERROR_CHECKING
10941101

1095-
10961102
/* Services with MULTI runtime error checking ThreadX. */
10971103

10981104
#define tx_block_allocate _txr_block_allocate
@@ -1790,7 +1796,6 @@ VOID _tx_misra_user_timer_pointer_get(TX_TIMER_INTERNAL *inte
17901796
VOID _tx_misra_thread_stack_check(TX_THREAD *thread_ptr, VOID **highest_stack);
17911797
VOID _tx_misra_trace_event_insert(ULONG event_id, VOID *info_field_1, ULONG info_field_2, ULONG info_field_3, ULONG info_field_4, ULONG filter, ULONG time_stamp);
17921798
UINT _tx_misra_always_true(void);
1793-
17941799
UCHAR **_tx_misra_indirect_void_to_uchar_pointer_convert(VOID **pointer);
17951800
UCHAR **_tx_misra_uchar_to_indirect_uchar_pointer_convert(UCHAR *pointer);
17961801
UCHAR *_tx_misra_block_pool_to_uchar_pointer_convert(TX_BLOCK_POOL *pool);
@@ -1823,7 +1828,6 @@ VOID _tx_misra_semaphore_put_notify_not_used(VOID (*semaphore
18231828
VOID _tx_misra_thread_not_used(TX_THREAD *thread_ptr);
18241829
VOID _tx_misra_thread_entry_exit_notify_not_used(VOID (*thread_entry_exit_notify)(TX_THREAD *notify_thread_ptr, UINT id));
18251830

1826-
18271831
#define TX_MEMSET(a,b,c) _tx_misra_memset((a), (UINT) (b), (UINT) (c))
18281832
#define TX_UCHAR_POINTER_ADD(a,b) _tx_misra_uchar_pointer_add((UCHAR *) (a), (ULONG) (b))
18291833
#define TX_UCHAR_POINTER_SUB(a,b) _tx_misra_uchar_pointer_sub((UCHAR *) (a), (ULONG) (b))
@@ -1842,8 +1846,6 @@ VOID _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
18421846
#define TX_TRACE_IN_LINE_INSERT(i,a,b,c,d,e) _tx_misra_trace_event_insert((ULONG) (i), (VOID *) (a), (ULONG) (b), (ULONG) (c), (ULONG) (d), (ULONG) (e), ((ULONG) TX_TRACE_TIME_SOURCE));
18431847
#endif
18441848
#define TX_LOOP_FOREVER (_tx_misra_always_true() == TX_TRUE)
1845-
1846-
18471849
#define TX_INDIRECT_VOID_TO_UCHAR_POINTER_CONVERT(a) _tx_misra_indirect_void_to_uchar_pointer_convert((a))
18481850
#define TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(a) _tx_misra_uchar_to_indirect_uchar_pointer_convert((a))
18491851
#define TX_BLOCK_POOL_TO_UCHAR_POINTER_CONVERT(a) _tx_misra_block_pool_to_uchar_pointer_convert((a))
@@ -1879,7 +1881,6 @@ VOID _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
18791881
#define TX_THREAD_NOT_USED(a) _tx_misra_thread_not_used((a))
18801882
#define TX_THREAD_ENTRY_EXIT_NOTIFY_NOT_USED(a) _tx_misra_thread_entry_exit_notify_not_used((a))
18811883

1882-
18831884
#else
18841885

18851886
/* Define the TX_MEMSET macro to the standard library function, if not already defined. */
@@ -1908,8 +1909,6 @@ VOID _tx_misra_thread_entry_exit_notify_not_used(VOID (*threa
19081909
(b) = (TX_TIMER *) working_ptr; \
19091910
}
19101911
#define TX_LOOP_FOREVER ((UINT) 1)
1911-
1912-
19131912
#define TX_INDIRECT_VOID_TO_UCHAR_POINTER_CONVERT(a) ((UCHAR **) ((VOID *) (a)))
19141913
#define TX_UCHAR_TO_INDIRECT_UCHAR_POINTER_CONVERT(a) ((UCHAR **) ((VOID *) (a)))
19151914
#define TX_BLOCK_POOL_TO_UCHAR_POINTER_CONVERT(a) ((UCHAR *) ((VOID *) (a)))

‎common/inc/tx_user_sample.h‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* PORT SPECIFIC C INFORMATION RELEASE */
2727
/* */
2828
/* tx_user.h PORTABLE C */
29-
/* 6.1 */
29+
/* 6.1.5 */
3030
/* */
3131
/* AUTHOR */
3232
/* */
@@ -44,9 +44,13 @@
4444
/* */
4545
/* DATE NAME DESCRIPTION */
4646
/* */
47-
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
48-
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
47+
/* 05-19-2020 William E. Lamie Initial Version 6.0 */
48+
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
4949
/* resulting in version 6.1 */
50+
/* 03-02-2021 Scott Larson Modified comment(s), */
51+
/* added option to remove */
52+
/* FileX pointer, */
53+
/* resulting in version 6.1.5 */
5054
/* */
5155
/**************************************************************************/
5256

@@ -76,6 +80,7 @@
7680
TX_DISABLE_PREEMPTION_THRESHOLD
7781
TX_DISABLE_REDUNDANT_CLEARING
7882
TX_DISABLE_NOTIFY_CALLBACKS
83+
TX_NO_FILEX_POINTER
7984
TX_NOT_INTERRUPTABLE
8085
TX_TIMER_PROCESS_IN_ISR
8186
@@ -98,6 +103,16 @@
98103
#define TX_TIMER_THREAD_PRIORITY ????
99104
*/
100105

106+
/* Determine if there is a FileX pointer in the thread control block.
107+
By default, the pointer is there for legacy/backwards compatibility.
108+
The pointer must also be there for applications using FileX.
109+
Define this to save space in the thread control block.
110+
*/
111+
112+
/*
113+
#define TX_NO_FILEX_POINTER
114+
*/
115+
101116
/* Determine if timer expirations (application timers, timeouts, and tx_thread_sleep calls
102117
should be processed within the a system timer thread or directly in the timer ISR.
103118
By default, the timer thread is used. When the following is defined, the timer expiration

‎common_modules/module_manager/src/txm_module_manager_stop.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
6060
/* FUNCTION RELEASE */
6161
/* */
6262
/* _txm_module_manager_stop PORTABLE C */
63-
/* 6.1 */
63+
/* 6.1.5 */
6464
/* AUTHOR */
6565
/* */
6666
/* Scott Larson, Microsoft Corporation */
@@ -108,7 +108,10 @@ extern UINT _txm_module_manager_usbx_stop(TXM_MODULE_INSTANCE *module_instance)
108108
/* */
109109
/* DATE NAME DESCRIPTION */
110110
/* */
111-
/* 09-30-2020 Scott Larson Initial Version 6.1 */
111+
/* 09-30-2020 Scott Larson Initial Version 6.1 */
112+
/* 03-02-2021 Scott Larson Modified comments, fix */
113+
/* object delete underflow, */
114+
/* resulting in version 6.1.5 */
112115
/* */
113116
/**************************************************************************/
114117
UINT _txm_module_manager_stop(TXM_MODULE_INSTANCE *module_instance)
@@ -531,9 +534,8 @@ TXM_MODULE_ALLOCATED_OBJECT *object_ptr;
531534
#endif
532535

533536
/* Delete the allocated objects for this module. */
534-
while (module_instance -> txm_module_instance_object_list_count--)
537+
while (module_instance -> txm_module_instance_object_list_count != 0)
535538
{
536-
537539
/* Pickup the current object pointer. */
538540
object_ptr = module_instance -> txm_module_instance_object_list_head;
539541

@@ -542,6 +544,9 @@ TXM_MODULE_ALLOCATED_OBJECT *object_ptr;
542544

543545
/* Release the object. */
544546
_tx_byte_release((VOID *) object_ptr);
547+
548+
/* Decrement count. */
549+
module_instance -> txm_module_instance_object_list_count--;
545550
}
546551

547552
/* Set the allocated list head pointer to NULL. */

0 commit comments

Comments
 (0)