From 7fcd884c79d420631b9b5a208f4a82a04cca95cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Tue, 29 Jun 2021 14:50:04 +0200 Subject: [PATCH] refactor: minimize filebrowser main functions --- file-browser/src/main.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/file-browser/src/main.c b/file-browser/src/main.c index 6af2b72c18ddd292a49e8ffb38ae3bb75bbabb64..deced812287b6417010f962c723ff43a3753b050 100644 --- a/file-browser/src/main.c +++ b/file-browser/src/main.c @@ -81,7 +81,12 @@ static file_operation_error_t exec_options_init(exec_options_loader_t *loader, c return error; } -static error_t file_browser_start(logger_t *logger, mzapo_ledstrip_t ledstrip, mzapo_rgb_led_t rgb_leds, display_t display, void *knobs) { +static error_t file_browser_start(logger_t *logger) { + mzapo_rgb_led_t rgb_leds = mzapo_create_rgb_led(); + + display_t display = mzapo_create_display(); + mzapo_ledstrip_t ledstrip = mzapo_create_ledstrip(); + void *knobs = mzapo_get_knobs_address(); struct termios oldstdin; if (!mzapo_check_pheripherals(&ledstrip, &rgb_leds, &display, &knobs)) { logger_error(logger, __FILE__, __FUNCTION__, __LINE__, @@ -134,22 +139,12 @@ int main(int argc, char *argv[]) { /* Try to acquire lock the first */ if (serialize_lock(1) <= 0) { logger_warn(&logger, __FILE__, __FUNCTION__, __LINE__, "System is occupied"); - - if (1) { - /* Wait till application holding lock releases IT or exits */ - logger_info(&logger, __FILE__, __FUNCTION__, __LINE__, - "Waiting"); - serialize_lock(0); - } + logger_info(&logger, __FILE__, __FUNCTION__, __LINE__, + "Waiting"); + serialize_lock(0); } - mzapo_rgb_led_t rgb_leds = mzapo_create_rgb_led(); - - display_t display = mzapo_create_display(); - mzapo_ledstrip_t ledstrip = mzapo_create_ledstrip(); - void* knobs = mzapo_get_knobs_address(); - - error_t rerror = file_browser_start(&logger, ledstrip, rgb_leds, display, knobs); + error_t rerror = file_browser_start(&logger); serialize_unlock();