Skip to content

Commit f7f0957

Browse files
committed
Release 6.1.10
1 parent b216ceb commit f7f0957

File tree

3,268 files changed

+517838
-62903
lines changed

Some content is hidden

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

3,268 files changed

+517838
-62903
lines changed

common/inc/tx_api.h

Lines changed: 10 additions & 2 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.9 */
29+
/* 6.1.10 */
3030
/* AUTHOR */
3131
/* */
3232
/* William E. Lamie, Microsoft Corporation */
@@ -78,6 +78,10 @@
7878
/* 10-15-2021 Yuxin Zhou Modified comment(s), */
7979
/* update patch number, */
8080
/* resulting in version 6.1.9 */
81+
/* 01-31-2022 Scott Larson Modified comment(s), */
82+
/* add unused parameter macro, */
83+
/* update patch number, */
84+
/* resulting in version 6.1.10 */
8185
/* */
8286
/**************************************************************************/
8387

@@ -95,6 +99,10 @@ extern "C" {
9599

96100
#endif
97101

102+
/* Disable warning of parameter not used. */
103+
#ifndef TX_PARAMETER_NOT_USED
104+
#define TX_PARAMETER_NOT_USED(p) ((void)(p))
105+
#endif /* TX_PARAMETER_NOT_USED */
98106

99107
/* Include the port-specific data type file. */
100108

@@ -110,7 +118,7 @@ extern "C" {
110118
#define AZURE_RTOS_THREADX
111119
#define THREADX_MAJOR_VERSION 6
112120
#define THREADX_MINOR_VERSION 1
113-
#define THREADX_PATCH_VERSION 9
121+
#define THREADX_PATCH_VERSION 10
114122

115123
/* Define the following symbol for backward compatibility */
116124
#define EL_PRODUCT_THREADX

common_modules/inc/txm_module.h

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* txm_module.h PORTABLE C */
29-
/* 6.1.3 */
29+
/* 6.1.10 */
3030
/* AUTHOR */
3131
/* */
3232
/* Scott Larson, Microsoft Corporation */
@@ -44,6 +44,9 @@
4444
/* 12-31-2020 Scott Larson Modified comment(s), added */
4545
/* port-specific extension, */
4646
/* resulting in version 6.1.3 */
47+
/* 01-31-2022 Scott Larson Modified comment(s), added */
48+
/* callback thread prototype, */
49+
/* resulting in version 6.1.10 */
4750
/* */
4851
/**************************************************************************/
4952

@@ -64,23 +67,23 @@
6467

6568
#ifdef TXM_MODULE_ENABLE_FILEX
6669
#include "txm_module_filex.h"
67-
#endif
70+
#endif
6871

6972
#ifdef TXM_MODULE_ENABLE_GUIX
7073
#include "txm_module_guix.h"
71-
#endif
74+
#endif
7275

7376
#ifdef TXM_MODULE_ENABLE_NETX
7477
#include "txm_module_netx.h"
75-
#endif
78+
#endif
7679

7780
#ifdef TXM_MODULE_ENABLE_NETXDUO
7881
#include "txm_module_netxduo.h"
79-
#endif
82+
#endif
8083

8184
#ifdef TXM_MODULE_ENABLE_USBX
8285
#include "txm_module_usbx.h"
83-
#endif
86+
#endif
8487

8588

8689
#ifdef FX_FILEX_PRESENT
@@ -157,7 +160,7 @@ extern "C" {
157160
/* Define each module's callback queue depth. This is used to queue up incoming call back requests. */
158161

159162
#ifndef TXM_MODULE_CALLBACKS_QUEUE_DEPTH
160-
#define TXM_MODULE_CALLBACKS_QUEUE_DEPTH 8 /* Number queued callback requests. */
163+
#define TXM_MODULE_CALLBACKS_QUEUE_DEPTH 8 /* Number queued callback requests. */
161164
#endif
162165

163166

@@ -367,7 +370,7 @@ typedef struct TXM_MODULE_PREAMBLE_STRUCT
367370
ULONG txm_module_preamble_property_flags; /* Properties Bit Map */
368371
ULONG txm_module_preamble_shell_entry_function; /* Module shell Entry Function */
369372
ULONG txm_module_preamble_start_function; /* Module Thread Start Function */
370-
ULONG txm_module_preamble_stop_function; /* Module Thread Stop Function */
373+
ULONG txm_module_preamble_stop_function; /* Module Thread Stop Function */
371374
ULONG txm_module_preamble_start_stop_priority; /* Module Start/Stop Thread Priority */
372375
ULONG txm_module_preamble_start_stop_stack_size; /* Module Start/Stop Thread Priority */
373376
ULONG txm_module_preamble_callback_function; /* Module Callback Thread Function */
@@ -448,10 +451,10 @@ typedef struct TXM_MODULE_INSTANCE_STRUCT
448451
VOID (*txm_module_instance_start_thread_entry)(ULONG);
449452
VOID (*txm_module_instance_stop_thread_entry)(ULONG);
450453
VOID (*txm_module_instance_callback_request_thread_entry)(ULONG);
451-
454+
452455
/* Define the port extention to the module manager structure. */
453456
TXM_MODULE_MANAGER_PORT_EXTENSION
454-
457+
455458
TX_THREAD txm_module_instance_start_stop_thread;
456459
TX_THREAD txm_module_instance_callback_request_thread;
457460
TX_QUEUE txm_module_instance_callback_request_queue;
@@ -462,29 +465,29 @@ typedef struct TXM_MODULE_INSTANCE_STRUCT
462465
ULONG txm_module_instance_callback_priority;
463466
ULONG txm_module_instance_application_module_id;
464467
UINT txm_module_instance_maximum_priority;
465-
468+
466469
/* Define the head pointer of the list of objects allocated by the module. */
467470
struct TXM_MODULE_ALLOCATED_OBJECT_STRUCT
468471
*txm_module_instance_object_list_head;
469472
ULONG txm_module_instance_object_list_count;
470473

471474
struct TXM_MODULE_INSTANCE_STRUCT
472475
*txm_module_instance_loaded_next,
473-
*txm_module_instance_loaded_previous;
476+
*txm_module_instance_loaded_previous;
474477
} TXM_MODULE_INSTANCE;
475478

476479

477-
/* Determine if the thread entry info control block has an extension defined. If not, define the extension to
480+
/* Determine if the thread entry info control block has an extension defined. If not, define the extension to
478481
whitespace. */
479482

480483
#ifndef TXM_MODULE_THREAD_ENTRY_INFO_USER_EXTENSION
481484
#define TXM_MODULE_THREAD_ENTRY_INFO_USER_EXTENSION
482485
#endif
483486

484487

485-
/* Define the thread entry information structure. This structure is placed on the thread's stack such that the
488+
/* Define the thread entry information structure. This structure is placed on the thread's stack such that the
486489
module's _txm_thread_shell_entry function does not need to access anything in the thread control block. */
487-
490+
488491
typedef struct TXM_MODULE_THREAD_ENTRY_INFO_STRUCT
489492
{
490493
TX_THREAD *txm_module_thread_entry_info_thread;
@@ -516,7 +519,7 @@ typedef struct TXM_MODULE_ALLOCATED_OBJECT_STRUCT
516519
} TXM_MODULE_ALLOCATED_OBJECT;
517520

518521

519-
/* Determine if module code is being compiled. If so, remap the ThreadX API to
522+
/* Determine if module code is being compiled. If so, remap the ThreadX API to
520523
the module shell functions that will go through the module <-> module manager
521524
interface. */
522525

@@ -541,6 +544,7 @@ VOID _txm_module_thread_shell_entry(TX_THREAD *thread_ptr, TXM_MODULE_THREAD_EN
541544
UINT _txm_module_thread_system_suspend(TX_THREAD *thread_ptr);
542545

543546
UINT _txm_module_application_request(ULONG request, ALIGN_TYPE param_1, ALIGN_TYPE param_2, ALIGN_TYPE param_3);
547+
VOID _txm_module_callback_request_thread_entry(ULONG id);
544548
UINT _txm_module_object_allocate(VOID **object_ptr, ULONG object_size);
545549
UINT _txm_module_object_deallocate(VOID *object_ptr);
546550
UINT _txm_module_object_pointer_get(UINT object_type, CHAR *name, VOID **object_ptr);
@@ -574,7 +578,7 @@ VOID _txm_module_usbx_duo_callback_request(TXM_MODULE_CALLBACK_MESSAGE *callbac
574578

575579
/* Map the module manager APIs just in case this is being included from the module manager in the
576580
resident portion of the application. */
577-
581+
578582
#define txm_module_manager_initialize _txm_module_manager_initialize
579583
#define txm_module_manager_absolute_load _txm_module_manager_absolute_load
580584
#define txm_module_manager_in_place_load _txm_module_manager_in_place_load
@@ -615,7 +619,7 @@ UINT _txm_module_manager_file_load(TXM_MODULE_INSTANCE *module_instance, CHAR *
615619
UINT _txm_module_manager_initialize(VOID *module_memory_start, ULONG module_memory_size);
616620
UINT _txm_module_manager_absolute_load(TXM_MODULE_INSTANCE *module_instance, CHAR *name, VOID *module_location);
617621
UINT _txm_module_manager_in_place_load(TXM_MODULE_INSTANCE *module_instance, CHAR *name, VOID *module_location);
618-
UINT _txm_module_manager_internal_load(TXM_MODULE_INSTANCE *module_instance, CHAR *name, VOID *module_location,
622+
UINT _txm_module_manager_internal_load(TXM_MODULE_INSTANCE *module_instance, CHAR *name, VOID *module_location,
619623
ULONG code_size, VOID *code_allocation_ptr, ULONG code_allocation_size);
620624
ALIGN_TYPE _txm_module_manager_kernel_dispatch(ULONG kernel_request, ALIGN_TYPE param_0, ALIGN_TYPE param_1, ALIGN_TYPE param_2);
621625
UINT _txm_module_manager_object_allocate(VOID **object_ptr_ptr, ULONG object_size, TXM_MODULE_INSTANCE *module_instance);
@@ -628,7 +632,7 @@ UINT _txm_module_manager_memory_load(TXM_MODULE_INSTANCE *module_instance, CHAR
628632
UINT _txm_module_manager_properties_get(TXM_MODULE_INSTANCE *module_instance, ULONG *module_properties_ptr);
629633
UINT _txm_module_manager_start(TXM_MODULE_INSTANCE *module_instance);
630634
UINT _txm_module_manager_stop(TXM_MODULE_INSTANCE *module_instance);
631-
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name, VOID (*shell_function)(TX_THREAD *, TXM_MODULE_INSTANCE *),
635+
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name, VOID (*shell_function)(TX_THREAD *, TXM_MODULE_INSTANCE *),
632636
VOID (*entry_function)(ULONG), ULONG entry_input,
633637
VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold,
634638
ULONG time_slice, UINT auto_start, UINT thread_control_block_size, TXM_MODULE_INSTANCE *module_instance);

0 commit comments

Comments
 (0)