Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change thread entry function and timer expiration function prototypes… #227

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change thread entry function and timer expiration function prototypes… #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions common/inc/tx_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ typedef struct TX_TIMER_INTERNAL_STRUCT
ULONG tx_timer_internal_re_initialize_ticks;

/* Define the timeout function and timeout function parameter. */
VOID (*tx_timer_internal_timeout_function)(ULONG id);
ULONG tx_timer_internal_timeout_param;
VOID (*tx_timer_internal_timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE tx_timer_internal_timeout_param;


/* Define the next and previous internal link pointers for active
Expand Down Expand Up @@ -496,8 +496,8 @@ typedef struct TX_THREAD_STRUCT
is recompiled. */

/* Define the thread's entry point and input parameter. */
VOID (*tx_thread_entry)(ULONG id);
ULONG tx_thread_entry_parameter;
VOID (*tx_thread_entry)(ALIGN_TYPE id);
ALIGN_TYPE tx_thread_entry_parameter;

/* Define the thread's timer block. This is used for thread
sleep and timeout requests. */
Expand Down Expand Up @@ -1725,7 +1725,7 @@ UINT _txr_semaphore_put_notify(TX_SEMAPHORE *semaphore_ptr, VOID (*semaph
VOID _tx_thread_context_save(VOID);
VOID _tx_thread_context_restore(VOID);
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG entry_input), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start);
Expand Down Expand Up @@ -1762,7 +1762,7 @@ UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr);
application. */

UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG entry_input), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start, UINT thread_control_block_size);
Expand All @@ -1784,7 +1784,7 @@ UINT _txe_thread_time_slice_change(TX_THREAD *thread_ptr, ULONG new_time_
UINT _txe_thread_wait_abort(TX_THREAD *thread_ptr);
#ifdef TX_ENABLE_MULTI_ERROR_CHECKING
UINT _txr_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG entry_input), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start, UINT thread_control_block_size);
Expand All @@ -1811,7 +1811,7 @@ UINT _txr_thread_wait_abort(TX_THREAD *thread_ptr);
UINT _tx_timer_activate(TX_TIMER *timer_ptr);
UINT _tx_timer_change(TX_TIMER *timer_ptr, ULONG initial_ticks, ULONG reschedule_ticks);
UINT _tx_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG input), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE input), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate);
UINT _tx_timer_deactivate(TX_TIMER *timer_ptr);
UINT _tx_timer_delete(TX_TIMER *timer_ptr);
Expand All @@ -1832,7 +1832,7 @@ VOID _tx_time_set(ULONG new_time);
UINT _txe_timer_activate(TX_TIMER *timer_ptr);
UINT _txe_timer_change(TX_TIMER *timer_ptr, ULONG initial_ticks, ULONG reschedule_ticks);
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG input), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE input), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size);
UINT _txe_timer_deactivate(TX_TIMER *timer_ptr);
UINT _txe_timer_delete(TX_TIMER *timer_ptr);
Expand All @@ -1842,7 +1842,7 @@ UINT _txe_timer_info_get(TX_TIMER *timer_ptr, CHAR **name, UINT *active,
UINT _txr_timer_activate(TX_TIMER *timer_ptr);
UINT _txr_timer_change(TX_TIMER *timer_ptr, ULONG initial_ticks, ULONG reschedule_ticks);
UINT _txr_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG input), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE input), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size);
UINT _txr_timer_deactivate(TX_TIMER *timer_ptr);
UINT _txr_timer_delete(TX_TIMER *timer_ptr);
Expand Down
2 changes: 1 addition & 1 deletion common/inc/tx_thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@

#ifndef TX_THREAD_CREATE_TIMEOUT_SETUP
#define TX_THREAD_CREATE_TIMEOUT_SETUP(t) (t) -> tx_thread_timer.tx_timer_internal_timeout_function = &(_tx_thread_timeout); \
(t) -> tx_thread_timer.tx_timer_internal_timeout_param = TX_POINTER_TO_ULONG_CONVERT((t));
(t) -> tx_thread_timer.tx_timer_internal_timeout_param = TX_POINTER_TO_ALIGN_TYPE_CONVERT((t));
#endif


Expand Down
2 changes: 1 addition & 1 deletion common/src/tx_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
/* resulting in version 6.1.8 */
/* */
/**************************************************************************/
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ULONG id), ULONG entry_input,
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ALIGN_TYPE id), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start)
{
Expand Down
2 changes: 1 addition & 1 deletion common/src/tx_timer_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
/* */
/**************************************************************************/
UINT _tx_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG id), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE id), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate)
{

Expand Down
4 changes: 2 additions & 2 deletions common/src/tx_timer_expiration_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ UINT expiration_time; /* Value used for pointe
ULONG delta;
#endif
TX_TIMER_INTERNAL *current_timer;
VOID (*timeout_function)(ULONG id);
ULONG timeout_param = ((ULONG) 0);
VOID (*timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE timeout_param = ((ALIGN_TYPE) 0);
#ifdef TX_TIMER_ENABLE_PERFORMANCE_INFO
TX_TIMER *timer_ptr;
#endif
Expand Down
4 changes: 2 additions & 2 deletions common/src/tx_timer_thread_entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ TX_TIMER_INTERNAL *reactivate_timer;
TX_TIMER_INTERNAL *next_timer;
TX_TIMER_INTERNAL *previous_timer;
TX_TIMER_INTERNAL *current_timer;
VOID (*timeout_function)(ULONG id);
ULONG timeout_param = ((ULONG) 0);
VOID (*timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE timeout_param = ((ALIGN_TYPE) 0);
TX_THREAD *thread_ptr;
#ifdef TX_REACTIVATE_INLINE
TX_TIMER_INTERNAL **timer_list; /* Timer list pointer */
Expand Down
2 changes: 1 addition & 1 deletion common/src/txe_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
/* */
/**************************************************************************/
UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG id), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE id), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start, UINT thread_control_block_size)
Expand Down
2 changes: 1 addition & 1 deletion common/src/txe_timer_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/* */
/**************************************************************************/
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG id), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE id), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size)
{

Expand Down
2 changes: 1 addition & 1 deletion common_modules/module_lib/src/txm_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
/* resulting in version 6.1.10 */
/* */
/**************************************************************************/
UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ULONG entry_input), ULONG entry_input, VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold, ULONG time_slice, UINT auto_start, UINT thread_control_block_size)
UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr, VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input, VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold, ULONG time_slice, UINT auto_start, UINT thread_control_block_size)
{

UINT return_value;
Expand Down
2 changes: 1 addition & 1 deletion common_modules/module_lib/src/txm_timer_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
/* resulting in version 6.1.10 */
/* */
/**************************************************************************/
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr, VOID (*expiration_function)(ULONG), ULONG expiration_input, ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size)
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr, VOID (*expiration_function)(ALIGN_TYPE), ALIGN_TYPE expiration_input, ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size)
{

UINT return_value;
Expand Down
6 changes: 3 additions & 3 deletions common_modules/module_manager/inc/txm_module_manager_dispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2039,8 +2039,8 @@ ALIGN_TYPE return_value;
(TX_THREAD *) param_0,
(CHAR *) param_1,
module_instance -> txm_module_instance_shell_entry_function,
(VOID (*)(ULONG entry_input)) extra_parameters[0],
(ULONG) extra_parameters[1],
(VOID (*)(ALIGN_TYPE entry_input)) extra_parameters[0],
(ALIGN_TYPE) extra_parameters[1],
(VOID *) extra_parameters[2],
(ULONG) extra_parameters[3],
(UINT) extra_parameters[4],
Expand Down Expand Up @@ -2768,7 +2768,7 @@ static ALIGN_TYPE _txm_module_manager_tx_timer_create_dispatch(TXM_MODULE_INSTAN

ALIGN_TYPE return_value;
TX_TIMER *timer_ptr;
VOID (*expiration_function)(ULONG);
VOID (*expiration_function)(ALIGN_TYPE);

if (module_instance -> txm_module_instance_property_flags & TXM_MODULE_MEMORY_PROTECTION)
{
Expand Down
2 changes: 1 addition & 1 deletion common_modules/module_manager/src/txm_module_manager_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
/**************************************************************************/
UINT _txm_module_manager_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*shell_function)(TX_THREAD *, TXM_MODULE_INSTANCE *),
VOID (*entry_function)(ULONG id), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE id), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start,
UINT thread_control_block_size, TXM_MODULE_INSTANCE *module_instance)
Expand Down
16 changes: 8 additions & 8 deletions common_smp/inc/tx_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ typedef struct TX_TIMER_INTERNAL_STRUCT
ULONG tx_timer_internal_re_initialize_ticks;

/* Define the timeout function and timeout function parameter. */
VOID (*tx_timer_internal_timeout_function)(ULONG id);
ULONG tx_timer_internal_timeout_param;
VOID (*tx_timer_internal_timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE tx_timer_internal_timeout_param;


/* Define the next and previous internal link pointers for active
Expand Down Expand Up @@ -512,8 +512,8 @@ typedef struct TX_THREAD_STRUCT
is recompiled. */

/* Define the thread's entry point and input parameter. */
VOID (*tx_thread_entry)(ULONG id);
ULONG tx_thread_entry_parameter;
VOID (*tx_thread_entry)(ALIGN_TYPE id);
ALIGN_TYPE tx_thread_entry_parameter;

/* Define the thread's timer block. This is used for thread
sleep and timeout requests. */
Expand Down Expand Up @@ -1752,7 +1752,7 @@ UINT _txe_semaphore_put_notify(TX_SEMAPHORE *semaphore_ptr, VOID (*semaph
VOID _tx_thread_context_save(VOID);
VOID _tx_thread_context_restore(VOID);
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG entry_input), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start);
Expand Down Expand Up @@ -1789,7 +1789,7 @@ UINT _tx_thread_wait_abort(TX_THREAD *thread_ptr);
application. */

UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG entry_input), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE entry_input), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start, UINT thread_control_block_size);
Expand All @@ -1816,7 +1816,7 @@ UINT _txe_thread_wait_abort(TX_THREAD *thread_ptr);
UINT _tx_timer_activate(TX_TIMER *timer_ptr);
UINT _tx_timer_change(TX_TIMER *timer_ptr, ULONG initial_ticks, ULONG reschedule_ticks);
UINT _tx_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG input), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE input), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate);
UINT _tx_timer_deactivate(TX_TIMER *timer_ptr);
UINT _tx_timer_delete(TX_TIMER *timer_ptr);
Expand All @@ -1837,7 +1837,7 @@ VOID _tx_time_set(ULONG new_time);
UINT _txe_timer_activate(TX_TIMER *timer_ptr);
UINT _txe_timer_change(TX_TIMER *timer_ptr, ULONG initial_ticks, ULONG reschedule_ticks);
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG input), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE input), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size);
UINT _txe_timer_deactivate(TX_TIMER *timer_ptr);
UINT _txe_timer_delete(TX_TIMER *timer_ptr);
Expand Down
2 changes: 1 addition & 1 deletion common_smp/inc/tx_thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ THREAD_DECLARE ULONG _tx_thread_performance_non_idle_retu

#ifndef TX_THREAD_CREATE_TIMEOUT_SETUP
#define TX_THREAD_CREATE_TIMEOUT_SETUP(t) (t) -> tx_thread_timer.tx_timer_internal_timeout_function = &(_tx_thread_timeout); \
(t) -> tx_thread_timer.tx_timer_internal_timeout_param = TX_POINTER_TO_ULONG_CONVERT((t));
(t) -> tx_thread_timer.tx_timer_internal_timeout_param = TX_POINTER_TO_ALIGN_TYPE_CONVERT((t));
#endif


Expand Down
2 changes: 1 addition & 1 deletion common_smp/src/tx_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
/* */
/**************************************************************************/
UINT _tx_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG id), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE id), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size, UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start)
{
Expand Down
2 changes: 1 addition & 1 deletion common_smp/src/tx_timer_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
/* */
/**************************************************************************/
UINT _tx_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG id), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE id), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate)
{

Expand Down
4 changes: 2 additions & 2 deletions common_smp/src/tx_timer_expiration_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ UINT expiration_time; /* Value used for pointe
ULONG delta;
#endif
TX_TIMER_INTERNAL *current_timer;
VOID (*timeout_function)(ULONG id);
ULONG timeout_param = ((ULONG) 0);
VOID (*timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE timeout_param = ((ALIGN_TYPE) 0);
#ifdef TX_TIMER_ENABLE_PERFORMANCE_INFO
TX_TIMER *timer_ptr;
#endif
Expand Down
4 changes: 2 additions & 2 deletions common_smp/src/tx_timer_thread_entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ TX_TIMER_INTERNAL *reactivate_timer;
TX_TIMER_INTERNAL *next_timer;
TX_TIMER_INTERNAL *previous_timer;
TX_TIMER_INTERNAL *current_timer;
VOID (*timeout_function)(ULONG id);
ULONG timeout_param = ((ULONG) 0);
VOID (*timeout_function)(ALIGN_TYPE id);
ALIGN_TYPE timeout_param = ((ALIGN_TYPE) 0);
TX_THREAD *thread_ptr;
#ifdef TX_REACTIVATE_INLINE
TX_TIMER_INTERNAL **timer_list; /* Timer list pointer */
Expand Down
2 changes: 1 addition & 1 deletion common_smp/src/txe_thread_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
/* */
/**************************************************************************/
UINT _txe_thread_create(TX_THREAD *thread_ptr, CHAR *name_ptr,
VOID (*entry_function)(ULONG id), ULONG entry_input,
VOID (*entry_function)(ALIGN_TYPE id), ALIGN_TYPE entry_input,
VOID *stack_start, ULONG stack_size,
UINT priority, UINT preempt_threshold,
ULONG time_slice, UINT auto_start, UINT thread_control_block_size)
Expand Down
2 changes: 1 addition & 1 deletion common_smp/src/txe_timer_create.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/* */
/**************************************************************************/
UINT _txe_timer_create(TX_TIMER *timer_ptr, CHAR *name_ptr,
VOID (*expiration_function)(ULONG id), ULONG expiration_input,
VOID (*expiration_function)(ALIGN_TYPE id), ALIGN_TYPE expiration_input,
ULONG initial_ticks, ULONG reschedule_ticks, UINT auto_activate, UINT timer_control_block_size)
{

Expand Down
Loading