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

Merge remote-tracking branch 'origin/master' into clang-format-update

Browse Source
This commit is contained in:
aanper 2020-10-20 13:55:01 +03:00
commit 767f9aa4fa
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
applications/gui/gui_event.c
View File

@ -41,20 +41,26 @@ GuiEvent* gui_event_alloc() {
} }
void gui_event_free(GuiEvent* gui_event) { void gui_event_free(GuiEvent* gui_event) {
osStatus_t status;
assert(gui_event); assert(gui_event);
gui_event_unlock(gui_event); gui_event_unlock(gui_event);
assert(osMessageQueueDelete(gui_event->mqueue) == osOK); status = osMessageQueueDelete(gui_event->mqueue);
assert(status == osOK);
free(gui_event); free(gui_event);
} }
void gui_event_lock(GuiEvent* gui_event) { void gui_event_lock(GuiEvent* gui_event) {
osStatus_t status;
assert(gui_event); assert(gui_event);
assert(osMutexAcquire(gui_event->lock_mutex, osWaitForever) == osOK); status = osMutexAcquire(gui_event->lock_mutex, osWaitForever);
assert(status == osOK);
} }
void gui_event_unlock(GuiEvent* gui_event) { void gui_event_unlock(GuiEvent* gui_event) {
osStatus_t status;
assert(gui_event); assert(gui_event);
assert(osMutexRelease(gui_event->lock_mutex) == osOK); status = osMutexRelease(gui_event->lock_mutex);
assert(status == osOK);
} }
void gui_event_messsage_send(GuiEvent* gui_event, GuiMessage* message) { void gui_event_messsage_send(GuiEvent* gui_event, GuiMessage* message) {
@ -64,10 +70,12 @@ void gui_event_messsage_send(GuiEvent* gui_event, GuiMessage* message) {
} }
GuiMessage gui_event_message_next(GuiEvent* gui_event) { GuiMessage gui_event_message_next(GuiEvent* gui_event) {
osStatus_t status;
assert(gui_event); assert(gui_event);
GuiMessage message; GuiMessage message;
gui_event_unlock(gui_event); gui_event_unlock(gui_event);
assert(osMessageQueueGet(gui_event->mqueue, &message, NULL, osWaitForever) == osOK); status = osMessageQueueGet(gui_event->mqueue, &message, NULL, osWaitForever);
assert(status == osOK);
gui_event_lock(gui_event); gui_event_lock(gui_event);
return message; return message;
} }

4
applications/menu/menu_event.c
View File

@ -35,8 +35,10 @@ MenuEvent* menu_event_alloc() {
} }
void menu_event_free(MenuEvent* menu_event) { void menu_event_free(MenuEvent* menu_event) {
osStatus_t status;
assert(menu_event); assert(menu_event);
assert(osMessageQueueDelete(menu_event->mqueue) == osOK); status = osMessageQueueDelete(menu_event->mqueue);
assert(status == osOK);
free(menu_event); free(menu_event);
} }