Firmware/ThreadX4TGFS
8
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrects naming of TX_INTERRUPT_SAVE_AREA to meet test expectations

Browse Source 
Also corrects the sizes, as ULONG is XLEN bits
This commit is contained in:
Eyck-Alexander Jentzsch
2026-03-22 15:56:00 +01:00
parent 7307a86860
commit 9947ce8d52
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
port/threadx/inc/tx_port.h
View File

@@ -335,25 +335,25 @@ extern TEST_FLAG test_forced_mutex_timeout;
#ifdef TX_DISABLE_INLINE #ifdef TX_DISABLE_INLINE
ULONG64 _tx_thread_interrupt_control(unsigned int new_posture); ULONG _tx_thread_interrupt_control(unsigned int new_posture);
#define TX_INTERRUPT_SAVE_AREA register ULONG64 interrupt_save; #define TX_INTERRUPT_SAVE_AREA register ULONG tx_saved_posture;
#define TX_DISABLE interrupt_save = _tx_thread_interrupt_control(TX_INT_DISABLE); #define TX_DISABLE tx_saved_posture = _tx_thread_interrupt_control(TX_INT_DISABLE);
#define TX_RESTORE _tx_thread_interrupt_control(interrupt_save); #define TX_RESTORE _tx_thread_interrupt_control(tx_saved_posture);
#else #else
#define TX_INTERRUPT_SAVE_AREA ULONG64 interrupt_save; #define TX_INTERRUPT_SAVE_AREA ULONG tx_saved_posture;
/* Atomically read mstatus into interrupt_save and clear bit 3 of mstatus. */ /* Atomically read mstatus into tx_saved_posture and clear bit 3 of mstatus. */
#define TX_DISABLE \ #define TX_DISABLE \
{ \ { \
__asm__("csrrci %0, mstatus, 0x08" : "=r"(interrupt_save) :); \ __asm__("csrrci %0, mstatus, 0x08" : "=r"(tx_saved_posture) :); \
}; };
/* We only care about mstatus.mie (bit 3), so mask interrupt_save and write to mstatus. */ /* We only care about mstatus.mie (bit 3), so mask tx_saved_posture and write to mstatus. */
#define TX_RESTORE \ #define TX_RESTORE \
{ \ { \
register ULONG64 __tempmask = interrupt_save & 0x08; \ register ULONG __tempmask = tx_saved_posture & 0x08; \
__asm__("csrrs x0, mstatus, %0 \n\t" : : "r"(__tempmask) :); \ __asm__("csrrs x0, mstatus, %0 \n\t" : : "r"(__tempmask) :); \
}; };

6
port/threadx_smp/inc/tx_port.h
View File

@@ -315,10 +315,10 @@ typedef struct TX_THREAD_SMP_PROTECT_STRUCT
is used to define a local function save area for the disable and restore is used to define a local function save area for the disable and restore
macros. */ macros. */
#define TX_INTERRUPT_SAVE_AREA ULONG64 interrupt_save; #define TX_INTERRUPT_SAVE_AREA ULONG tx_saved_posture;
#define TX_DISABLE interrupt_save = _tx_thread_smp_protect(); #define TX_DISABLE tx_saved_posture = _tx_thread_smp_protect();
#define TX_RESTORE _tx_thread_smp_unprotect(interrupt_save); #define TX_RESTORE _tx_thread_smp_unprotect(tx_saved_posture);
/************* End ThreadX SMP data type and function prototype definitions. *************/ /************* End ThreadX SMP data type and function prototype definitions. *************/