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
commit 74e592757f
1 changed files with 2 additions and 4 deletions

View File

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