summaryrefslogtreecommitdiff
path: root/ports/rxv2/gnu/src
diff options
context:
space:
mode:
authorTiejunZhou <[email protected]>2022-04-26 14:21:38 +0800
committerGitHub <[email protected]>2022-04-26 14:21:38 +0800
commite11c166a4045d80ea74fe917e5608474754f5067 (patch)
tree0618f87d27c3856df9e856db75048424a8829399 /ports/rxv2/gnu/src
parentcef9cb22a5e2b9bca56074c5e627225ec0dd3d73 (diff)
parent408f9fa1b78059906368d60d8375ba1fdbb9dc9f (diff)
Merge pull request #187 from azure-rtos/tizho/rx_updatev6.1.11_rel
Import RX port update for 6.1.11 release.
Diffstat (limited to 'ports/rxv2/gnu/src')
-rw-r--r--ports/rxv2/gnu/src/tx_initialize_low_level.S4
-rw-r--r--ports/rxv2/gnu/src/tx_thread_context_restore.S4
-rw-r--r--ports/rxv2/gnu/src/tx_thread_context_save.S4
-rw-r--r--ports/rxv2/gnu/src/tx_thread_interrupt_control.S4
-rw-r--r--ports/rxv2/gnu/src/tx_thread_schedule.S50
-rw-r--r--ports/rxv2/gnu/src/tx_thread_stack_build.S4
-rw-r--r--ports/rxv2/gnu/src/tx_thread_system_return.S4
-rw-r--r--ports/rxv2/gnu/src/tx_timer_interrupt.S4
8 files changed, 61 insertions, 17 deletions
diff --git a/ports/rxv2/gnu/src/tx_initialize_low_level.S b/ports/rxv2/gnu/src/tx_initialize_low_level.S
index 189bc121..929309ac 100644
--- a/ports/rxv2/gnu/src/tx_initialize_low_level.S
+++ b/ports/rxv2/gnu/src/tx_initialize_low_level.S
@@ -29,7 +29,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_initialize_low_level RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -67,6 +67,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 */
;/* */
;/**************************************************************************/
.global __tx_initialize_low_level
diff --git a/ports/rxv2/gnu/src/tx_thread_context_restore.S b/ports/rxv2/gnu/src/tx_thread_context_restore.S
index 7b61af43..b3e8eb62 100644
--- a/ports/rxv2/gnu/src/tx_thread_context_restore.S
+++ b/ports/rxv2/gnu/src/tx_thread_context_restore.S
@@ -46,7 +46,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_restore RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -85,6 +85,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_restore(VOID)
diff --git a/ports/rxv2/gnu/src/tx_thread_context_save.S b/ports/rxv2/gnu/src/tx_thread_context_save.S
index ca381e90..abbb16d5 100644
--- a/ports/rxv2/gnu/src/tx_thread_context_save.S
+++ b/ports/rxv2/gnu/src/tx_thread_context_save.S
@@ -40,7 +40,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_save RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -76,6 +76,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/rxv2/gnu/src/tx_thread_interrupt_control.S b/ports/rxv2/gnu/src/tx_thread_interrupt_control.S
index 535334de..c34ad3c8 100644
--- a/ports/rxv2/gnu/src/tx_thread_interrupt_control.S
+++ b/ports/rxv2/gnu/src/tx_thread_interrupt_control.S
@@ -35,7 +35,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_interrupt_control RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -70,6 +70,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/rxv2/gnu/src/tx_thread_schedule.S b/ports/rxv2/gnu/src/tx_thread_schedule.S
index 9587ac03..e3baf0fa 100644
--- a/ports/rxv2/gnu/src/tx_thread_schedule.S
+++ b/ports/rxv2/gnu/src/tx_thread_schedule.S
@@ -34,6 +34,11 @@
.global __tx_thread_execute_ptr
.global __tx_thread_current_ptr
.global __tx_timer_time_slice
+#if (TX_LOW_POWER == 1)
+ .global _tx_low_power_enter
+ .global _tx_low_power_exit
+ .global __tx_thread_preempt_disable
+#endif
;
.text
@@ -42,7 +47,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_schedule RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -82,6 +87,9 @@
;/* 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), and */
+;/* added low power support, */
+;/* resulting in version 6.1.11 */
;/* */
;/**************************************************************************/
;VOID _tx_thread_schedule(VOID)
@@ -89,26 +97,48 @@
.global __tx_thread_schedule
__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
__tx_thread_schedule_loop:
+ SETPSW I ; Enable interrupts
+ CLRPSW I ; Disable interrupts
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
+ 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/rxv2/gnu/src/tx_thread_stack_build.S b/ports/rxv2/gnu/src/tx_thread_stack_build.S
index 97f9b8df..dbf86a27 100644
--- a/ports/rxv2/gnu/src/tx_thread_stack_build.S
+++ b/ports/rxv2/gnu/src/tx_thread_stack_build.S
@@ -36,7 +36,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_stack_build RXv2/GNURX */
-;/* 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_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID))
diff --git a/ports/rxv2/gnu/src/tx_thread_system_return.S b/ports/rxv2/gnu/src/tx_thread_system_return.S
index aeacbc65..27bda670 100644
--- a/ports/rxv2/gnu/src/tx_thread_system_return.S
+++ b/ports/rxv2/gnu/src/tx_thread_system_return.S
@@ -30,7 +30,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_system_return RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -68,6 +68,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_system_return(VOID)
diff --git a/ports/rxv2/gnu/src/tx_timer_interrupt.S b/ports/rxv2/gnu/src/tx_timer_interrupt.S
index 8b8f5b9d..8d2398be 100644
--- a/ports/rxv2/gnu/src/tx_timer_interrupt.S
+++ b/ports/rxv2/gnu/src/tx_timer_interrupt.S
@@ -55,7 +55,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_timer_interrupt RXv2/GNURX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -98,6 +98,8 @@
;/* 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 */
;/* */
;/**************************************************************************/
;VOID _tx_timer_interrupt(VOID)
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-29 13:18:11 +0000