summaryrefslogtreecommitdiff
path: root/ports/rxv1/ccrx
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/rxv1/ccrx
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/rxv1/ccrx')
-rw-r--r--ports/rxv1/ccrx/inc/tx_port.h6
-rw-r--r--ports/rxv1/ccrx/readme_threadx.txt3
-rw-r--r--ports/rxv1/ccrx/src/tx_initialize_low_level.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_context_restore.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_context_save.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_interrupt_control.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_schedule.src48
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_stack_build.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_thread_system_return.src4
-rw-r--r--ports/rxv1/ccrx/src/tx_timer_interrupt.src4
10 files changed, 67 insertions, 18 deletions
diff --git a/ports/rxv1/ccrx/inc/tx_port.h b/ports/rxv1/ccrx/inc/tx_port.h
index 499e98f7..46e14bf9 100644
--- a/ports/rxv1/ccrx/inc/tx_port.h
+++ b/ports/rxv1/ccrx/inc/tx_port.h
@@ -26,7 +26,7 @@
/* PORT SPECIFIC C INFORMATION RELEASE */
/* */
/* tx_port.h RXv1/CCRX */
-/* 6.1.10 */
+/* 6.1.11 */
/* */
/* AUTHOR */
/* */
@@ -55,6 +55,8 @@
/* added missing interrupt */
/* control defines, */
/* resulting in version 6.1.10 */
+/* 04-25-2022 William E. Lamie Modified comment(s), */
+/* resulting in version 6.1.11 */
/* */
/**************************************************************************/
@@ -271,7 +273,7 @@ static void _tx_thread_system_return_inline(void)
#ifdef TX_THREAD_INIT
CHAR _tx_version_id[] =
- "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX RXv1/CCRX Version 6.1.10 *";
+ "Copyright (c) Microsoft Corporation. All rights reserved. * ThreadX RXv1/CCRX Version 6.1.11 *";
#else
extern CHAR _tx_version_id[];
#endif
diff --git a/ports/rxv1/ccrx/readme_threadx.txt b/ports/rxv1/ccrx/readme_threadx.txt
index 4078fa51..40d98026 100644
--- a/ports/rxv1/ccrx/readme_threadx.txt
+++ b/ports/rxv1/ccrx/readme_threadx.txt
@@ -150,6 +150,9 @@ For generic code revision information, please refer to the readme_threadx_generi
file, which is included in your distribution. The following details the revision
information associated with this specific port of ThreadX:
+04-25-2022 Release 6.1.11 changes:
+ tx_thread_schedule.src Added low power support
+
01-31-2022 Release 6.1.10 changes:
tx_port.h Removed system state macro, and added
missing interrupt control defines
diff --git a/ports/rxv1/ccrx/src/tx_initialize_low_level.src b/ports/rxv1/ccrx/src/tx_initialize_low_level.src
index e77e92e2..ef480d58 100644
--- a/ports/rxv1/ccrx/src/tx_initialize_low_level.src
+++ b/ports/rxv1/ccrx/src/tx_initialize_low_level.src
@@ -34,7 +34,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_initialize_low_level RXv1/CCRX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -72,6 +72,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/rxv1/ccrx/src/tx_thread_context_restore.src b/ports/rxv1/ccrx/src/tx_thread_context_restore.src
index e37b63b3..2813bb1e 100644
--- a/ports/rxv1/ccrx/src/tx_thread_context_restore.src
+++ b/ports/rxv1/ccrx/src/tx_thread_context_restore.src
@@ -45,7 +45,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_restore RXv1/CCRX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -84,6 +84,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/rxv1/ccrx/src/tx_thread_context_save.src b/ports/rxv1/ccrx/src/tx_thread_context_save.src
index 0683dfa9..86e2538a 100644
--- a/ports/rxv1/ccrx/src/tx_thread_context_save.src
+++ b/ports/rxv1/ccrx/src/tx_thread_context_save.src
@@ -40,7 +40,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_context_save RXv1/CCRX */
-;/* 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/rxv1/ccrx/src/tx_thread_interrupt_control.src b/ports/rxv1/ccrx/src/tx_thread_interrupt_control.src
index 11655e7f..4745c505 100644
--- a/ports/rxv1/ccrx/src/tx_thread_interrupt_control.src
+++ b/ports/rxv1/ccrx/src/tx_thread_interrupt_control.src
@@ -35,7 +35,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_interrupt_control RXv1/CCRX */
-;/* 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/rxv1/ccrx/src/tx_thread_schedule.src b/ports/rxv1/ccrx/src/tx_thread_schedule.src
index b7fca0cf..82c933bc 100644
--- a/ports/rxv1/ccrx/src/tx_thread_schedule.src
+++ b/ports/rxv1/ccrx/src/tx_thread_schedule.src
@@ -34,6 +34,11 @@
.GLB __tx_thread_execute_ptr
.GLB __tx_thread_current_ptr
.GLB __tx_timer_time_slice
+.IF TX_LOW_POWER==1
+ .GLB _tx_low_power_enter
+ .GLB _tx_low_power_exit
+ .GLB __tx_thread_preempt_disable
+.ENDIF
;
.SECTION P,CODE
@@ -42,7 +47,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_schedule RXv1/CCRX */
-;/* 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 @@
.GLB __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/rxv1/ccrx/src/tx_thread_stack_build.src b/ports/rxv1/ccrx/src/tx_thread_stack_build.src
index 9343091e..22da155a 100644
--- a/ports/rxv1/ccrx/src/tx_thread_stack_build.src
+++ b/ports/rxv1/ccrx/src/tx_thread_stack_build.src
@@ -36,7 +36,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_stack_build RXv1/CCRX */
-;/* 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/rxv1/ccrx/src/tx_thread_system_return.src b/ports/rxv1/ccrx/src/tx_thread_system_return.src
index 7e8134fb..9ca67d0f 100644
--- a/ports/rxv1/ccrx/src/tx_thread_system_return.src
+++ b/ports/rxv1/ccrx/src/tx_thread_system_return.src
@@ -40,7 +40,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_thread_system_return RXv1/CCRX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -78,6 +78,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/rxv1/ccrx/src/tx_timer_interrupt.src b/ports/rxv1/ccrx/src/tx_timer_interrupt.src
index c91849d3..8bdd9455 100644
--- a/ports/rxv1/ccrx/src/tx_timer_interrupt.src
+++ b/ports/rxv1/ccrx/src/tx_timer_interrupt.src
@@ -56,7 +56,7 @@
;/* FUNCTION RELEASE */
;/* */
;/* _tx_timer_interrupt RXv1/CCRX */
-;/* 6.1.10 */
+;/* 6.1.11 */
;/* AUTHOR */
;/* */
;/* William E. Lamie, Microsoft Corporation */
@@ -99,6 +99,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 21:36:42 +0000