liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2433, FL-2408] Get rid of file_worker in archive and various fixes (#1105)

Browse Source 
* Archive: get rid of file_worker and various fixes
* USB init moved to CLI service
This commit is contained in:
Nikolay Minaylov
2022-04-14 14:28:59 +03:00
committed by GitHub
parent fed18f7c42
commit 72a6bbb8ad
13 changed files with 173 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/FreeRTOS-glue/cmsis_os2.c
View File

@@ -1225,7 +1225,7 @@ osStatus_t osTimerStart (osTimerId_t timer_id, uint32_t ticks) {
stat = osErrorParameter;
}
else {
if (xTimerChangePeriod (hTimer, ticks, 0) == pdPASS) {
if (xTimerChangePeriod (hTimer, ticks, portMAX_DELAY) == pdPASS) {
stat = osOK;
} else {
stat = osErrorResource;
@@ -1254,7 +1254,7 @@ osStatus_t osTimerStop (osTimerId_t timer_id) {
stat = osErrorResource;
}
else {
if (xTimerStop (hTimer, 0) == pdPASS) {
if (xTimerStop (hTimer, portMAX_DELAY) == pdPASS) {
stat = osOK;
} else {
stat = osError;
@@ -1305,7 +1305,7 @@ osStatus_t osTimerDelete (osTimerId_t timer_id) {
callb = (TimerCallback_t *)pvTimerGetTimerID (hTimer);
#endif
if (xTimerDelete (hTimer, 0) == pdPASS) {
if (xTimerDelete (hTimer, portMAX_DELAY) == pdPASS) {
#if (configSUPPORT_DYNAMIC_ALLOCATION == 1)
if ((uint32_t)callb & 1U) {
/* Callback memory was allocated from dynamic pool, clear flag */