diff options
| author | Frédéric Desbiens <[email protected]> | 2026-10-02 10:42:44 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-10-02 10:42:44 -0400 |
| commit | 93387b0a60382a29579bbad5045c68328e3751df (patch) | |
| tree | 42be790d602cb76f55090e5a7c418df7ea2b3428 /ports/rxv1 | |
| parent | 44d7c95c582d415c4ad84527180b29c93c3bf664 (diff) | |
| parent | 28281cd5647d4671236ca08d19bd18ed15b2265a (diff) | |
Merge pull request #783 from eclipse-threadx/devv6.5.2.202603_rel
Merged changes ahead of the v6.5.2.202603 release
Diffstat (limited to 'ports/rxv1')
| -rw-r--r-- | ports/rxv1/ccrx/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/rxv1/ccrx/inc/tx_port.h | 2 | ||||
| -rw-r--r-- | ports/rxv1/gnu/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/rxv1/gnu/inc/tx_port.h | 2 | ||||
| -rw-r--r-- | ports/rxv1/gnu/src/tx_thread_context_save.S | 2 | ||||
| -rw-r--r-- | ports/rxv1/iar/inc/tx_port.h | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/ports/rxv1/ccrx/CMakeLists.txt b/ports/rxv1/ccrx/CMakeLists.txt index f2269c51..4118eb37 100644 --- a/ports/rxv1/ccrx/CMakeLists.txt +++ b/ports/rxv1/ccrx/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(${PROJECT_NAME} ) target_include_directories(${PROJECT_NAME} + SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/inc ) diff --git a/ports/rxv1/ccrx/inc/tx_port.h b/ports/rxv1/ccrx/inc/tx_port.h index bdd8c7f4..bc870ba1 100644 --- a/ports/rxv1/ccrx/inc/tx_port.h +++ b/ports/rxv1/ccrx/inc/tx_port.h @@ -260,7 +260,7 @@ static void _tx_thread_system_return_inline(void) #ifdef TX_THREAD_INIT CHAR _tx_version_id[] = - "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/CCRX Version 6.5.1.202602a *"; + "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/CCRX Version 6.5.2.202603 *"; #else extern CHAR _tx_version_id[]; #endif diff --git a/ports/rxv1/gnu/CMakeLists.txt b/ports/rxv1/gnu/CMakeLists.txt index 9357c697..1735b774 100644 --- a/ports/rxv1/gnu/CMakeLists.txt +++ b/ports/rxv1/gnu/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(${PROJECT_NAME} ) target_include_directories(${PROJECT_NAME} + SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/inc ) diff --git a/ports/rxv1/gnu/inc/tx_port.h b/ports/rxv1/gnu/inc/tx_port.h index 1bd542fd..def347fb 100644 --- a/ports/rxv1/gnu/inc/tx_port.h +++ b/ports/rxv1/gnu/inc/tx_port.h @@ -257,7 +257,7 @@ static void _tx_thread_system_return_inline(void) #ifdef TX_THREAD_INIT CHAR _tx_version_id[] = - "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/GNURX Version 6.5.1.202602a *"; + "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/GNURX Version 6.5.2.202603 *"; #else extern CHAR _tx_version_id[]; #endif diff --git a/ports/rxv1/gnu/src/tx_thread_context_save.S b/ports/rxv1/gnu/src/tx_thread_context_save.S index 228c4991..97ac6af9 100644 --- a/ports/rxv1/gnu/src/tx_thread_context_save.S +++ b/ports/rxv1/gnu/src/tx_thread_context_save.S @@ -69,7 +69,7 @@ __tx_thread_context_save: ; SP+4 -> Saved R1 ; SP+8 -> Saved R2 ; SP+12-> Interrupted PC -; SP+16-> Interrupted PSW +; SP+16-> Interrupted PSW */ ; ; /* Check for a nested interrupt condition. */ ; if (_tx_thread_system_state++) diff --git a/ports/rxv1/iar/inc/tx_port.h b/ports/rxv1/iar/inc/tx_port.h index 47575a86..9186cec8 100644 --- a/ports/rxv1/iar/inc/tx_port.h +++ b/ports/rxv1/iar/inc/tx_port.h @@ -257,7 +257,7 @@ static void _tx_thread_system_return_inline(void) #ifdef TX_THREAD_INIT CHAR _tx_version_id[] = - "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/IAR Version 6.5.1.202602a *"; + "(c) 2024 Microsoft Corp. (c) 2026-present Eclipse ThreadX contributors. * ThreadX RXv1/IAR Version 6.5.2.202603 *"; #else extern CHAR _tx_version_id[]; #endif |