[FL-2219, FL-2251] System, FuriCore, FuriHal: various bug fixes and improvements (#986)
* Replace irq shenanigans with critical section * Power: halt system on power off instead of crash. * Gui: properly handle input event on NULL current_view * FuriHal: correct gpio configuration sequence * FuriHal: cleanup uart initialization. Makefile: allow to disable thread support. * Loader: improve locking, fix simultaneous app start crash, full command line args support for gui apps, more consistent insomnia * Loader: correct spelling * FuriHal: increase gpio configuration readability * FuriHal: correct gpio configuration error when mode is GpioModeEventRiseFall Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
This commit is contained in:
@@ -22,6 +22,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <furi/common_defines.h>
|
||||
|
||||
#include "cmsis_os2.h" // ::CMSIS:RTOS2
|
||||
#include "cmsis_compiler.h" // Compiler agnostic definitions
|
||||
#include "os_tick.h" // OS Tick API
|
||||
@@ -455,11 +457,10 @@ uint32_t osKernelGetTickFreq (void) {
|
||||
Get the RTOS kernel system timer count.
|
||||
*/
|
||||
uint32_t osKernelGetSysTimerCount (void) {
|
||||
uint32_t irqmask = IS_IRQ_MASKED();
|
||||
TickType_t ticks;
|
||||
uint32_t val;
|
||||
|
||||
__disable_irq();
|
||||
FURI_CRITICAL_ENTER();
|
||||
|
||||
ticks = xTaskGetTickCount();
|
||||
val = OS_Tick_GetCount();
|
||||
@@ -471,9 +472,7 @@ uint32_t osKernelGetSysTimerCount (void) {
|
||||
}
|
||||
val += ticks * OS_Tick_GetInterval();
|
||||
|
||||
if (irqmask == 0U) {
|
||||
__enable_irq();
|
||||
}
|
||||
FURI_CRITICAL_EXIT();
|
||||
|
||||
/* Return system timer count */
|
||||
return (val);
|
||||
|
Reference in New Issue
Block a user