diff options
Diffstat (limited to 'ports/rxv3/iar/src')
| -rw-r--r-- | ports/rxv3/iar/src/tx_initialize_low_level.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_context_restore.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_context_save.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_interrupt_control.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_schedule.s | 51 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_stack_build.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_thread_system_return.s | 4 | ||||
| -rw-r--r-- | ports/rxv3/iar/src/tx_timer_interrupt.s | 4 |
8 files changed, 60 insertions, 19 deletions
diff --git a/ports/rxv3/iar/src/tx_initialize_low_level.s b/ports/rxv3/iar/src/tx_initialize_low_level.s index b74419d4..e3f9bdb1 100644 --- a/ports/rxv3/iar/src/tx_initialize_low_level.s +++ b/ports/rxv3/iar/src/tx_initialize_low_level.s @@ -31,7 +31,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_initialize_low_level RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ public __tx_initialize_low_level diff --git a/ports/rxv3/iar/src/tx_thread_context_restore.s b/ports/rxv3/iar/src/tx_thread_context_restore.s index dad03641..1409749e 100644 --- a/ports/rxv3/iar/src/tx_thread_context_restore.s +++ b/ports/rxv3/iar/src/tx_thread_context_restore.s @@ -45,7 +45,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_context_restore RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -83,6 +83,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ public __tx_thread_context_restore diff --git a/ports/rxv3/iar/src/tx_thread_context_save.s b/ports/rxv3/iar/src/tx_thread_context_save.s index 57b7f5d3..440426ec 100644 --- a/ports/rxv3/iar/src/tx_thread_context_save.s +++ b/ports/rxv3/iar/src/tx_thread_context_save.s @@ -39,7 +39,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_context_save RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -75,6 +75,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_context_save(VOID) diff --git a/ports/rxv3/iar/src/tx_thread_interrupt_control.s b/ports/rxv3/iar/src/tx_thread_interrupt_control.s index 8e0ab20a..0e73cf66 100644 --- a/ports/rxv3/iar/src/tx_thread_interrupt_control.s +++ b/ports/rxv3/iar/src/tx_thread_interrupt_control.s @@ -34,7 +34,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_interrupt_control RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -69,6 +69,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ ;UINT _tx_thread_interrupt_control(UINT new_posture) diff --git a/ports/rxv3/iar/src/tx_thread_schedule.s b/ports/rxv3/iar/src/tx_thread_schedule.s index 3f743b14..85d764c0 100644 --- a/ports/rxv3/iar/src/tx_thread_schedule.s +++ b/ports/rxv3/iar/src/tx_thread_schedule.s @@ -34,6 +34,11 @@ extern __tx_thread_execute_ptr extern __tx_thread_current_ptr extern __tx_timer_time_slice +#if (TX_LOW_POWER == 1) + extern _tx_low_power_enter + extern _tx_low_power_exit + extern __tx_thread_preempt_disable +#endif section .text:CODE:ROOT @@ -42,7 +47,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_schedule RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -89,26 +94,48 @@ __tx_thread_schedule: ; -; /* Enable interrupts. */ -; - SETPSW I ; ; /* Wait for a thread to execute. */ ; do ; { - MOV.L #__tx_thread_execute_ptr, R1 ; Address of thread to executer ptr + MOV.L #__tx_thread_execute_ptr, R1 ; Address of thread to executer ptr __tx_thread_schedule_loop: - MOV.L [R1],R2 ; Pickup next thread to execute - CMP #0,R2 ; Is it NULL? - BEQ __tx_thread_schedule_loop ; Yes, idle system, keep checking + SETPSW I ; Enable interrupts + CLRPSW I ; Disable interrupts + MOV.L [R1],R2 ; Pickup next thread to execute + CMP #0,R2 ; Is it NULL? + BNE __tx_thread_thread_ready ; Not NULL, schedule the thread + ; Idle system - no thread is ready +#if (TX_LOW_POWER == 1) + MOV.L #__tx_thread_preempt_disable, R1 ; Load prempt disable flag. + MOV.L [R1], R2 + ADD #1, R2 ; Disable preemption while enter/exit + MOV.L R2, [R1] + BSR _tx_low_power_enter ; Possibly enter low power mode +#endif + +#if (TX_ENABLE_WAIT == 1) + WAIT ; Wait for interrupt +#endif + +#if (TX_LOW_POWER == 1) + CLRPSW I ; Disable interrupts (because WAIT enables interrupts) + BSR _tx_low_power_exit ; Possibly exit low power mode + MOV.L #__tx_thread_preempt_disable, R1 ; Load prempt disable flag. + MOV.L [R1], R2 + SUB #1, R2 ; Enable preemption + MOV.L R2, [R1] + MOV.L #__tx_thread_execute_ptr, R1 ; Address of thread to executer ptr +#endif + + BRA __tx_thread_schedule_loop ; Idle system, keep checking + +__tx_thread_thread_ready: ; ; } ; while(_tx_thread_execute_ptr == TX_NULL); ; -; /* Yes! We have a thread to execute. Lockout interrupts and -; transfer control to it. */ -; - CLRPSW I ; Disable interrupts +; /* Yes! We have a thread to execute. Note that interrupts are locked out at this point. */ ; ; /* Setup the current thread pointer. */ ; _tx_thread_current_ptr = _tx_thread_execute_ptr; diff --git a/ports/rxv3/iar/src/tx_thread_stack_build.s b/ports/rxv3/iar/src/tx_thread_stack_build.s index c5309192..c615098a 100644 --- a/ports/rxv3/iar/src/tx_thread_stack_build.s +++ b/ports/rxv3/iar/src/tx_thread_stack_build.s @@ -28,7 +28,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_stack_build RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -65,6 +65,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ diff --git a/ports/rxv3/iar/src/tx_thread_system_return.s b/ports/rxv3/iar/src/tx_thread_system_return.s index 558e6534..3234b059 100644 --- a/ports/rxv3/iar/src/tx_thread_system_return.s +++ b/ports/rxv3/iar/src/tx_thread_system_return.s @@ -27,7 +27,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -64,6 +64,8 @@ ;/* resulting in version 6.1.9 */ ;/* 01-31-2022 William E. Lamie Modified comment(s), */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ diff --git a/ports/rxv3/iar/src/tx_timer_interrupt.s b/ports/rxv3/iar/src/tx_timer_interrupt.s index b60088f5..858c57b5 100644 --- a/ports/rxv3/iar/src/tx_timer_interrupt.s +++ b/ports/rxv3/iar/src/tx_timer_interrupt.s @@ -43,7 +43,7 @@ SWI0 EQU 0x872E0 ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_timer_interrupt RXv3/IAR */ -;/* 6.1.10 */ +;/* 6.1.11 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -86,6 +86,8 @@ SWI0 EQU 0x872E0 ;/* added missing thread */ ;/* preemption logic, */ ;/* resulting in version 6.1.10 */ +;/* 04-25-2022 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.11 */ ;/* */ ;/**************************************************************************/ |
