Update for new message queue

arkanoid/arkanoid_game.c

@@ -355,14 +355,16 @@ static void arkanoid_draw_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(arkanoid_state->mutex);
 }
 
-static void arkanoid_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void arkanoid_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void arkanoid_update_timer_callback(FuriMessageQueue* event_queue) {
+static void arkanoid_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeTick};

blackjack/blackjack.c

@@ -466,13 +466,15 @@ void init(GameState* game_state) {
     start_round(game_state);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     AppEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void update_timer_callback(FuriMessageQueue* event_queue) {
+static void update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     AppEvent event = {.type = EventTypeTick};
     furi_message_queue_put(event_queue, &event, 0);

bpmtapper/bpm.c

@@ -122,7 +122,8 @@ static void show_hello() {
     // END HELLO DIALOG
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

bt_trigger/bt_trigger.c

@@ -201,7 +201,8 @@ static void input_callback(InputEvent* input_event, void* ctx) {
 }
 
 //Timer callback
-static void timer_callback(FuriMessageQueue* event_queue) {
+static void timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     //check eventqueue is not null
     furi_assert(event_queue);
     //creating event and adding it to the event list

bt_trigger/bt_trigger.h

@@ -46,7 +46,7 @@ typedef struct {
 
 static void draw_callback(Canvas* canvas, void* ctx);
 static void input_callback(InputEvent* input_event, void* ctx);
-static void timer_callback(FuriMessageQueue* event_queue);
+static void timer_callback(void* ctx);
 static void bt_hid_connection_status_changed_callback(BtStatus status, void* context);
 AppStruct* appStructAlloc();
 void cleanUpBeforeYouLeave(AppStruct* app);

doom/doom.c

@@ -794,7 +794,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
@@ -844,7 +845,8 @@ static void doom_state_init(PluginState* const plugin_state) {
 #endif
 }
 
-static void doom_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void doom_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeTick};

esp8266_deauth/esp8266_deauth.c

@@ -206,8 +206,8 @@ static void esp8266_deauth_module_render_callback(Canvas* const canvas, void* ct
     furi_mutex_release(app->mutex);
 }
 
-static void
-    esp8266_deauth_module_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void esp8266_deauth_module_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     SPluginEvent event = {.m_type = EventTypeKey, .m_input = *input_event};

flappy_bird/flappy_bird.c

@@ -269,14 +269,16 @@ static void flappy_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(game_state->mutex);
 }
 
-static void flappy_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void flappy_game_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void flappy_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void flappy_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeTick};

flashlight/flashlight.c

@@ -48,7 +48,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

game_of_life/game_of_life.c

@@ -85,7 +85,8 @@ static void update_field(State* state) {
     }
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     AppEvent event = {.type = EventTypeKey, .input = *input_event};

gpio_reader_a/GPIO_reader.c

@@ -63,7 +63,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

gps_nmea/gps.c

@@ -123,7 +123,8 @@ static void render_callback(Canvas* const canvas, void* context) {
     furi_mutex_release(gps_uart->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

hc_sr04/hc_sr04.c

@@ -89,7 +89,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
@@ -153,15 +154,12 @@ static void hc_sr04_measure(PluginState* const plugin_state) {
 
     const uint32_t start = furi_get_tick();
 
-    while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx))
-        ;
-    while(furi_get_tick() - start < timeout_ms && !furi_hal_gpio_read(&gpio_usart_rx))
-        ;
+    while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx));
+    while(furi_get_tick() - start < timeout_ms && !furi_hal_gpio_read(&gpio_usart_rx));
 
     const uint32_t pulse_start = DWT->CYCCNT;
 
-    while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx))
-        ;
+    while(furi_get_tick() - start < timeout_ms && furi_hal_gpio_read(&gpio_usart_rx));
     const uint32_t pulse_end = DWT->CYCCNT;
 
     //FURI_CRITICAL_EXIT();

heap_defence/heap_defence.c

@@ -484,7 +484,8 @@ static void heap_defense_render_callback(Canvas* const canvas, void* mutex) {
     furi_mutex_release(game->mutex);
 }
 
-static void heap_defense_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void heap_defense_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     if(input_event->type != InputTypePress && input_event->type != InputTypeLong) return;
 
     furi_assert(event_queue);
@@ -492,7 +493,8 @@ static void heap_defense_input_callback(InputEvent* input_event, FuriMessageQueu
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void heap_defense_timer_callback(FuriMessageQueue* event_queue) {
+static void heap_defense_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event;

ir_intervalometer/intervalometer.c

@@ -478,7 +478,8 @@ static void flipvalo_run_state_init(struct flipvalo_run_state* fv_run_state) {
     fv_run_state->tick_cur = 0;
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     struct plugin_event event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);

jetpack_joyride/jetpack.c

@@ -251,14 +251,16 @@ static void jetpack_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(game_state->mutex);
 }
 
-static void jetpack_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void jetpack_game_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void jetpack_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void jetpack_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeTick};

metronome/metronome.c

@@ -136,7 +136,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(metronome_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

mfkey/mfkey.c

@@ -756,7 +756,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(program_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

multi_converter/multi_converter.c

@@ -21,8 +21,8 @@ static void multi_converter_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(multi_converter_state->mutex);
 }
 
-static void
-    multi_converter_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void multi_converter_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     MultiConverterEvent event = {.type = EventTypeKey, .input = *input_event};

multi_dice/dice.c

@@ -33,7 +33,8 @@ typedef struct {
     bool letsRoll;
 } DiceState;
 
-static void dice_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void dice_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);

nightstand_clock/clock_app.c

@@ -82,7 +82,8 @@ void handle_down() {
     set_backlight_brightness((float)(brightness / 100.f));
 }
 
-static void clock_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void clock_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);

nrf24batch/nrf24batch.c

@@ -1091,7 +1091,8 @@ static void save_batch(void) {
     }
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);

nrf24mousejacker/mousejacker.c

@@ -92,7 +92,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

nrf24scan/nrf24scan.c

@@ -456,7 +456,8 @@ static uint8_t load_settings_file(Stream* file_stream) {
     return err;
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);

nrf24sniff/nrfsniff.c

@@ -128,7 +128,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

rc2014_coleco/coleco.c

@@ -131,7 +131,8 @@ static void render_callback(Canvas* const canvas, void* context) {
     furi_mutex_release(coleco->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

rootoflife/roots_of_life_game.c

@@ -604,14 +604,16 @@ static void roots_draw_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(state->mutex);
 }
 
-static void roots_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void roots_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void roots_update_timer_callback(FuriMessageQueue* event_queue) {
+static void roots_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeTick};

scorched_tanks/scorched_tanks_game_app.c

@@ -350,14 +350,16 @@ static void scorched_tanks_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(game_state->mutex);
 }
 
-static void scorched_tanks_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void scorched_tanks_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     ScorchedTanksEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void scorched_tanks_update_timer_callback(FuriMessageQueue* event_queue) {
+static void scorched_tanks_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     ScorchedTanksEvent event = {.type = EventTypeTick};

sentry_safe/sentry_safe.c

@@ -45,7 +45,8 @@ static void sentry_safe_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(sentry_state->mutex);
 }
 
-static void sentry_safe_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void sentry_safe_input_callback(InputEvent* input_event, void*ctx) {
+    FuriMessageQueue* event_queue=ctx;
     furi_assert(event_queue);
 
     Event event = {.type = EventTypeKey, .input = *input_event};

snake_2/snake_20.c

@@ -191,14 +191,16 @@ static void snake_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(snake_state->mutex);
 }
 
-static void snake_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void snake_game_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     SnakeEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void snake_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void snake_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     SnakeEvent event = {.type = EventTypeTick};

solitaire/solitaire.c

@@ -455,13 +455,15 @@ void init_start(GameState* game_state) {
     game_state->animation.buffer = make_buffer();
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     AppEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void update_timer_callback(FuriMessageQueue* event_queue) {
+static void update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     AppEvent event = {.type = EventTypeTick};
     furi_message_queue_put(event_queue, &event, 0);

t_rex_runner/trexrunner.c

@@ -136,7 +136,8 @@ static void timer_callback(void* ctx) {
     furi_mutex_release(game_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

tama_p1/tama_p1.c

@@ -458,14 +458,16 @@ static void tama_p1_draw_callback(Canvas* const canvas, void* cb_ctx) {
     furi_mutex_release(mutex);
 }
 
-static void tama_p1_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void tama_p1_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TamaEvent event = {.type = EventTypeInput, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void tama_p1_update_timer_callback(FuriMessageQueue* event_queue) {
+static void tama_p1_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TamaEvent event = {.type = EventTypeTick};

tanks/tanks_game.c

@@ -619,14 +619,16 @@ static void tanks_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(tanks_state->mutex);
 }
 
-static void tanks_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void tanks_game_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TanksEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void tanks_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void tanks_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TanksEvent event = {.type = EventTypeTick};

tetris/tetris_game.c

@@ -231,7 +231,8 @@ static void tetris_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(tetris_state->mutex);
 }
 
-static void tetris_game_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void tetris_game_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TetrisEvent event = {.type = EventTypeKey, .input = *input_event};
@@ -384,7 +385,8 @@ static bool tetris_game_piece_at_bottom(TetrisState* tetris_state, Piece* newPie
     return false;
 }
 
-static void tetris_game_update_timer_callback(FuriMessageQueue* event_queue) {
+static void tetris_game_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     TetrisEvent event = {.type = EventTypeTick};

tictactoe/tictactoe_game.c

@@ -288,14 +288,16 @@ static void tictactoe_draw_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(ticst->mutex);
 }
 
-static void tictactoe_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void tictactoe_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void tictactoe_update_timer_callback(FuriMessageQueue* event_queue) {
+static void tictactoe_update_timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     GameEvent event = {.type = EventTypeTick};

timelapse/zeitraffer.c

@@ -107,7 +107,8 @@ static void input_callback(InputEvent* input_event, void* ctx) {
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void timer_callback(FuriMessageQueue* event_queue) {
+static void timer_callback(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     // Проверяем, что контекст не нулевой
     furi_assert(event_queue);
 

totp/cli/cli_shared_methods.c

@@ -26,7 +26,8 @@ bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli) {
     return true;
 }
 
-void totp_cli_force_close_app(FuriMessageQueue* event_queue) {
+void totp_cli_force_close_app(void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     PluginEvent event = {.type = EventForceCloseApp};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }

totp/cli/cli_shared_methods.h

@@ -20,7 +20,7 @@ bool totp_cli_ensure_authenticated(const PluginState* plugin_state, Cli* cli);
  * @brief Forces application to be instantly closed
  * @param event_queue main app queue
  */
-void totp_cli_force_close_app(FuriMessageQueue* event_queue);
+void totp_cli_force_close_app(void* ctx);
 
 /**
  * @brief Reads line of characters from console

tuning_fork/tuning_fork.c

@@ -187,7 +187,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(tuning_fork_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};

wardriver/wardriver.c

@@ -113,7 +113,8 @@ static void tick_callback(void* ctx_q) {
     furi_message_queue_put(queue, &event, 0);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* queue = ctx;
     furi_assert(queue);
     Event event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(queue, &event, FuriWaitForever);

wifi_scanner/wifi_scanner.c

@@ -636,7 +636,8 @@ static void wifi_module_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(app->mutex);
 }
 
-static void wifi_module_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void wifi_module_input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
 
     SPluginEvent event = {.m_type = EventTypeKey, .m_input = *input_event};

wiiec/wii_anal.c

@@ -44,8 +44,9 @@
 // OS Callback : Timer tick
 // We register this function to be called when the OS signals a timer 'tick' event
 //
-static void cbTimer(FuriMessageQueue* queue) {
+static void cbTimer(void* ctx) {
     ENTER;
+    FuriMessageQueue* queue = ctx;
     furi_assert(queue);
 
     eventMsg_t message = {.id = EVID_TICK};
@@ -59,8 +60,9 @@ static void cbTimer(FuriMessageQueue* queue) {
 // OS Callback : Keypress
 // We register this function to be called when the OS detects a keypress
 //
-static void cbInput(InputEvent* event, FuriMessageQueue* queue) {
+static void cbInput(InputEvent* event, void* ctx) {
     ENTER;
+    FuriMessageQueue* queue = ctx;
     furi_assert(queue);
     furi_assert(event);
 

zombiez/zombiez.c

@@ -184,7 +184,8 @@ static void render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(plugin_state->mutex);
 }
 
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+static void input_callback(InputEvent* input_event, void* ctx) {
+    FuriMessageQueue* event_queue = ctx;
     furi_assert(event_queue);
     PluginEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);