Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-20 04:54:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dialogs: move api lock to toolbox

Browse Source
This commit is contained in:
SG
2022-11-12 08:14:11 +10:00
parent 861f47dd8d
commit 61adff99b7
7 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/services/dialogs/dialogs.c
View File

@@ -1,6 +1,6 @@
#include "dialogs/dialogs_message.h" #include "dialogs/dialogs_message.h"
#include "dialogs_i.h" #include "dialogs_i.h"
#include "dialogs_api_lock.h" #include <toolbox/api_lock.h>
#include "dialogs_module_file_browser.h" #include "dialogs_module_file_browser.h"
#include "dialogs_module_message.h" #include "dialogs_module_message.h"
@@ -35,7 +35,7 @@ static void dialogs_app_process_message(DialogsApp* app, DialogsAppMessage* mess
dialogs_app_process_module_message(&message->data->dialog); dialogs_app_process_module_message(&message->data->dialog);
break; break;
} }
API_LOCK_UNLOCK(message->lock); api_lock_unlock(message->lock);
} }
int32_t dialogs_srv(void* p) { int32_t dialogs_srv(void* p) {

10
applications/services/dialogs/dialogs_api.c
View File

@@ -1,6 +1,6 @@
#include "dialogs/dialogs_message.h" #include "dialogs/dialogs_message.h"
#include "dialogs_i.h" #include "dialogs_i.h"
#include "dialogs_api_lock.h" #include <toolbox/api_lock.h>
#include <assets_icons.h> #include <assets_icons.h>
/****************** File browser ******************/ /****************** File browser ******************/
@@ -10,7 +10,7 @@ bool dialog_file_browser_show(
FuriString* result_path, FuriString* result_path,
FuriString* path, FuriString* path,
const DialogsFileBrowserOptions* options) { const DialogsFileBrowserOptions* options) {
FuriApiLock lock = API_LOCK_INIT_LOCKED(); FuriApiLock lock = api_lock_alloc_locked();
furi_check(lock != NULL); furi_check(lock != NULL);
DialogsAppData data = { DialogsAppData data = {
@@ -35,7 +35,7 @@ bool dialog_file_browser_show(
furi_check( furi_check(
furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk); furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk);
API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(lock); api_lock_wait_unlock_and_free(lock);
return return_data.bool_value; return return_data.bool_value;
} }
@@ -43,7 +43,7 @@ bool dialog_file_browser_show(
/****************** Message ******************/ /****************** Message ******************/
DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage* dialog_message) { DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage* dialog_message) {
FuriApiLock lock = API_LOCK_INIT_LOCKED(); FuriApiLock lock = api_lock_alloc_locked();
furi_check(lock != NULL); furi_check(lock != NULL);
DialogsAppData data = { DialogsAppData data = {
@@ -61,7 +61,7 @@ DialogMessageButton dialog_message_show(DialogsApp* context, const DialogMessage
furi_check( furi_check(
furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk); furi_message_queue_put(context->message_queue, &message, FuriWaitForever) == FuriStatusOk);
API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(lock); api_lock_wait_unlock_and_free(lock);
return return_data.dialog_value; return return_data.dialog_value;
} }

18
applications/services/dialogs/dialogs_api_lock.h
View File

@@ -1,18 +0,0 @@
#pragma once
typedef FuriEventFlag* FuriApiLock;
#define API_LOCK_EVENT (1U << 0)
#define API_LOCK_INIT_LOCKED() furi_event_flag_alloc();
#define API_LOCK_WAIT_UNTIL_UNLOCK(_lock) \
furi_event_flag_wait(_lock, API_LOCK_EVENT, FuriFlagWaitAny, FuriWaitForever);
#define API_LOCK_FREE(_lock) furi_event_flag_free(_lock);
#define API_LOCK_UNLOCK(_lock) furi_event_flag_set(_lock, API_LOCK_EVENT);
#define API_LOCK_WAIT_UNTIL_UNLOCK_AND_FREE(_lock) \
API_LOCK_WAIT_UNTIL_UNLOCK(_lock); \
API_LOCK_FREE(_lock);

2
applications/services/dialogs/dialogs_message.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include <furi.h> #include <furi.h>
#include "dialogs_i.h" #include "dialogs_i.h"
#include "dialogs_api_lock.h" #include <toolbox/api_lock.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

12
applications/services/dialogs/dialogs_module_file_browser.c
View File

@@ -1,5 +1,5 @@
#include "dialogs_i.h" #include "dialogs_i.h"
#include "dialogs_api_lock.h" #include <toolbox/api_lock.h>
#include "gui/modules/file_browser.h" #include "gui/modules/file_browser.h"
typedef struct { typedef struct {
@@ -11,14 +11,14 @@ static void dialogs_app_file_browser_back_callback(void* context) {
furi_assert(context); furi_assert(context);
DialogsAppFileBrowserContext* file_browser_context = context; DialogsAppFileBrowserContext* file_browser_context = context;
file_browser_context->result = false; file_browser_context->result = false;
API_LOCK_UNLOCK(file_browser_context->lock); api_lock_unlock(file_browser_context->lock);
} }
static void dialogs_app_file_browser_callback(void* context) { static void dialogs_app_file_browser_callback(void* context) {
furi_assert(context); furi_assert(context);
DialogsAppFileBrowserContext* file_browser_context = context; DialogsAppFileBrowserContext* file_browser_context = context;
file_browser_context->result = true; file_browser_context->result = true;
API_LOCK_UNLOCK(file_browser_context->lock); api_lock_unlock(file_browser_context->lock);
} }
bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrowser* data) { bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrowser* data) {
@@ -27,7 +27,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
DialogsAppFileBrowserContext* file_browser_context = DialogsAppFileBrowserContext* file_browser_context =
malloc(sizeof(DialogsAppFileBrowserContext)); malloc(sizeof(DialogsAppFileBrowserContext));
file_browser_context->lock = API_LOCK_INIT_LOCKED(); file_browser_context->lock = api_lock_alloc_locked();
ViewHolder* view_holder = view_holder_alloc(); ViewHolder* view_holder = view_holder_alloc();
view_holder_attach_to_gui(view_holder, gui); view_holder_attach_to_gui(view_holder, gui);
@@ -44,7 +44,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
view_holder_set_view(view_holder, file_browser_get_view(file_browser)); view_holder_set_view(view_holder, file_browser_get_view(file_browser));
view_holder_start(view_holder); view_holder_start(view_holder);
API_LOCK_WAIT_UNTIL_UNLOCK(file_browser_context->lock); api_lock_wait_unlock(file_browser_context->lock);
ret = file_browser_context->result; ret = file_browser_context->result;
@@ -52,7 +52,7 @@ bool dialogs_app_process_module_file_browser(const DialogsAppMessageDataFileBrow
view_holder_free(view_holder); view_holder_free(view_holder);
file_browser_stop(file_browser); file_browser_stop(file_browser);
file_browser_free(file_browser); file_browser_free(file_browser);
API_LOCK_FREE(file_browser_context->lock); api_lock_free(file_browser_context->lock);
free(file_browser_context); free(file_browser_context);
furi_record_close(RECORD_GUI); furi_record_close(RECORD_GUI);

12
applications/services/dialogs/dialogs_module_message.c
View File

@@ -1,5 +1,5 @@
#include "dialogs_i.h" #include "dialogs_i.h"
#include "dialogs_api_lock.h" #include <toolbox/api_lock.h>
#include <gui/modules/dialog_ex.h> #include <gui/modules/dialog_ex.h>
typedef struct { typedef struct {
@@ -30,7 +30,7 @@ static void dialogs_app_message_back_callback(void* context) {
furi_assert(context); furi_assert(context);
DialogsAppMessageContext* message_context = context; DialogsAppMessageContext* message_context = context;
message_context->result = DialogMessageButtonBack; message_context->result = DialogMessageButtonBack;
API_LOCK_UNLOCK(message_context->lock); api_lock_unlock(message_context->lock);
} }
static void dialogs_app_message_callback(DialogExResult result, void* context) { static void dialogs_app_message_callback(DialogExResult result, void* context) {
@@ -49,7 +49,7 @@ static void dialogs_app_message_callback(DialogExResult result, void* context) {
default: default:
break; break;
} }
API_LOCK_UNLOCK(message_context->lock); api_lock_unlock(message_context->lock);
} }
DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDataDialog* data) { DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDataDialog* data) {
@@ -57,7 +57,7 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
Gui* gui = furi_record_open(RECORD_GUI); Gui* gui = furi_record_open(RECORD_GUI);
const DialogMessage* message = data->message; const DialogMessage* message = data->message;
DialogsAppMessageContext* message_context = malloc(sizeof(DialogsAppMessageContext)); DialogsAppMessageContext* message_context = malloc(sizeof(DialogsAppMessageContext));
message_context->lock = API_LOCK_INIT_LOCKED(); message_context->lock = api_lock_alloc_locked();
ViewHolder* view_holder = view_holder_alloc(); ViewHolder* view_holder = view_holder_alloc();
view_holder_attach_to_gui(view_holder, gui); view_holder_attach_to_gui(view_holder, gui);
@@ -87,14 +87,14 @@ DialogMessageButton dialogs_app_process_module_message(const DialogsAppMessageDa
view_holder_set_view(view_holder, dialog_ex_get_view(dialog_ex)); view_holder_set_view(view_holder, dialog_ex_get_view(dialog_ex));
view_holder_start(view_holder); view_holder_start(view_holder);
API_LOCK_WAIT_UNTIL_UNLOCK(message_context->lock); api_lock_wait_unlock(message_context->lock);
ret = message_context->result; ret = message_context->result;
view_holder_stop(view_holder); view_holder_stop(view_holder);
view_holder_free(view_holder); view_holder_free(view_holder);
dialog_ex_free(dialog_ex); dialog_ex_free(dialog_ex);
API_LOCK_FREE(message_context->lock); api_lock_free(message_context->lock);
free(message_context); free(message_context);
furi_record_close(RECORD_GUI); furi_record_close(RECORD_GUI);

19
lib/toolbox/api_lock.h Normal file
View File

@@ -0,0 +1,19 @@
#pragma once
#include <furi/furi.h>
typedef FuriEventFlag* FuriApiLock;
#define API_LOCK_EVENT (1U << 0)
#define api_lock_alloc_locked() furi_event_flag_alloc()
#define api_lock_wait_unlock(_lock) \
furi_event_flag_wait(_lock, API_LOCK_EVENT, FuriFlagWaitAny, FuriWaitForever)
#define api_lock_free(_lock) furi_event_flag_free(_lock)
#define api_lock_unlock(_lock) furi_event_flag_set(_lock, API_LOCK_EVENT)
#define api_lock_wait_unlock_and_free(_lock) \
api_lock_wait_unlock(_lock); \
api_lock_free(_lock);