ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5078 from v2422/master 

Enable access to kernel tick information in ISR
pull/5008/merge
Jimmy Brisson 2017-09-29 10:10:46 -05:00 committed by GitHub
parent 1a04b0a7b4 6c5af87c73
commit 74e592757f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtos/TARGET_CORTEX/rtx5/rtx_kernel.c
View File

@ -607,8 +607,7 @@ void osKernelResume (uint32_t sleep_ticks) {
/// Get the RTOS kernel tick count. /// Get the RTOS kernel tick count.
uint64_t osKernelGetTickCount (void) { uint64_t osKernelGetTickCount (void) {
if (IS_IRQ_MODE() || IS_IRQ_MASKED()) { if (IS_IRQ_MODE() || IS_IRQ_MASKED()) {
EvrRtxKernelGetTickCount(0U); return svcRtxKernelGetTickCount();
return 0U;
} else { } else {
return __svcKernelGetTickCount(); return __svcKernelGetTickCount();
} }
@ -617,8 +616,7 @@ uint64_t osKernelGetTickCount (void) {
/// Get the RTOS kernel tick frequency. /// Get the RTOS kernel tick frequency.
uint32_t osKernelGetTickFreq (void) { uint32_t osKernelGetTickFreq (void) {
if (IS_IRQ_MODE() || IS_IRQ_MASKED()) { if (IS_IRQ_MODE() || IS_IRQ_MASKED()) {
EvrRtxKernelGetTickFreq(0U); return svcRtxKernelGetTickFreq();
return 0U;
} else { } else {
return __svcKernelGetTickFreq(); return __svcKernelGetTickFreq();
} }