after merge fixes

applications/services/expansion/expansion.c

@@ -1,5 +1,4 @@
 #include "expansion.h"
-#include "expansion_i.h"
 
 #include <furi_hal_serial_control.h>
 
@@ -19,7 +18,6 @@ typedef enum {
     ExpansionStateDisabled,
     ExpansionStateEnabled,
     ExpansionStateRunning,
-    ExpansionStateConnectionEstablished,
 } ExpansionState;
 
 typedef enum {
@@ -29,15 +27,10 @@ typedef enum {
     ExpansionMessageTypeReloadSettings,
     ExpansionMessageTypeModuleConnected,
     ExpansionMessageTypeModuleDisconnected,
-    ExpansionMessageTypeConnectionEstablished,
-    ExpansionMessageTypeIsConnected,
 } ExpansionMessageType;
 
 typedef union {
-    union {
-        FuriHalSerialId serial_id;
-        bool* is_connected;
-    };
+    FuriHalSerialId serial_id;
 } ExpansionMessageData;
 
 typedef struct {
@@ -52,8 +45,6 @@ struct Expansion {
     FuriHalSerialId serial_id;
     ExpansionWorker* worker;
     ExpansionState state;
-
-    ExpansionSettings settings;
 };
 
 static const char* const expansion_uart_names[] = {
@@ -76,21 +67,13 @@ static void expansion_detect_callback(void* context) {
     UNUSED(status);
 }
 
-static void expansion_worker_callback(void* context, ExpansionWorkerCallbackReason reason) {
+static void expansion_worker_callback(void* context) {
     furi_assert(context);
     Expansion* instance = context;
 
-    ExpansionMessage message;
-    switch(reason) {
-    case ExpansionWorkerCallbackReasonExit:
-        message.type = ExpansionMessageTypeModuleDisconnected;
-        message.api_lock = NULL; // Not locking the API here to avoid a deadlock
-        break;
-
-    case ExpansionWorkerCallbackReasonConnected:
-        message.type = ExpansionMessageTypeConnectionEstablished;
-        message.api_lock = api_lock_alloc_locked();
-        break;
+    ExpansionMessage message = {
+        .type = ExpansionMessageTypeModuleDisconnected,
+        .api_lock = NULL, // Not locking the API here to avoid a deadlock
     };
 
     const FuriStatus status = furi_message_queue_put(instance->queue, &message, FuriWaitForever);
@@ -110,7 +93,7 @@ static void
 
     if(settings.uart_index < FuriHalSerialIdMax) {
         instance->state = ExpansionStateEnabled;
-        instance->serial_id = instance->settings.uart_index;
+        instance->serial_id = settings.uart_index;
         furi_hal_serial_control_set_expansion_callback(
             instance->serial_id, expansion_detect_callback, instance);
 
@@ -123,9 +106,7 @@ static void
     UNUSED(data);
     if(instance->state == ExpansionStateDisabled) {
         return;
-    } else if(
-        instance->state == ExpansionStateRunning ||
-        instance->state == ExpansionStateConnectionEstablished) {
+    } else if(instance->state == ExpansionStateRunning) {
         expansion_worker_stop(instance->worker);
         expansion_worker_free(instance->worker);
     } else {
@@ -201,8 +182,7 @@ static void expansion_control_handler_module_disconnected(
     Expansion* instance,
     const ExpansionMessageData* data) {
     UNUSED(data);
-    if(instance->state != ExpansionStateRunning &&
-       instance->state != ExpansionStateConnectionEstablished) {
+    if(instance->state != ExpansionStateRunning) {
         return;
     }
 
@@ -212,23 +192,6 @@ static void expansion_control_handler_module_disconnected(
         instance->serial_id, expansion_detect_callback, instance);
 }
 
-static void expansion_control_handler_connection_established(
-    Expansion* instance,
-    const ExpansionMessageData* data) {
-    UNUSED(data);
-    if(instance->state != ExpansionStateRunning &&
-       instance->state != ExpansionStateConnectionEstablished) {
-        return;
-    }
-
-    instance->state = ExpansionStateConnectionEstablished;
-}
-
-static void
-    expansion_control_handler_is_connected(Expansion* instance, const ExpansionMessageData* data) {
-    *data->is_connected = instance->state == ExpansionStateConnectionEstablished;
-}
-
 typedef void (*ExpansionControlHandler)(Expansion*, const ExpansionMessageData*);
 
 static const ExpansionControlHandler expansion_control_handlers[] = {
@@ -238,8 +201,6 @@ static const ExpansionControlHandler expansion_control_handlers[] = {
     [ExpansionMessageTypeReloadSettings] = expansion_control_handler_reload_settings,
     [ExpansionMessageTypeModuleConnected] = expansion_control_handler_module_connected,
     [ExpansionMessageTypeModuleDisconnected] = expansion_control_handler_module_disconnected,
-    [ExpansionMessageTypeConnectionEstablished] = expansion_control_handler_connection_established,
-    [ExpansionMessageTypeIsConnected] = expansion_control_handler_is_connected,
 };
 
 static int32_t expansion_control(void* context) {
@@ -334,22 +295,6 @@ void expansion_disable(Expansion* instance) {
     api_lock_wait_unlock_and_free(message.api_lock);
 }
 
-bool expansion_is_connected(Expansion* instance) {
-    furi_check(instance);
-    bool is_connected;
-
-    ExpansionMessage message = {
-        .type = ExpansionMessageTypeIsConnected,
-        .data.is_connected = &is_connected,
-        .api_lock = api_lock_alloc_locked(),
-    };
-
-    furi_message_queue_put(instance->queue, &message, FuriWaitForever);
-    api_lock_wait_unlock_and_free(message.api_lock);
-
-    return is_connected;
-}
-
 void expansion_set_listen_serial(Expansion* instance, FuriHalSerialId serial_id) {
     furi_check(instance);
     furi_check(serial_id < FuriHalSerialIdMax);
@@ -363,7 +308,3 @@ void expansion_set_listen_serial(Expansion* instance, FuriHalSerialId serial_id)
     furi_message_queue_put(instance->queue, &message, FuriWaitForever);
     api_lock_wait_unlock_and_free(message.api_lock);
 }
-
-ExpansionSettings* expansion_get_settings(Expansion* instance) {
-    return &instance->settings;
-}

applications/services/expansion/expansion.h

@@ -50,15 +50,6 @@ void expansion_enable(Expansion* instance);
  */
 void expansion_disable(Expansion* instance);
 
-/**
- * @brief Check if an expansion module is connected.
- *
- * @param[in,out] instance pointer to the Expansion instance.
- *
- * @returns true if the module is connected and initialized, false otherwise.
- */
-bool expansion_is_connected(Expansion* instance);
-
 /**
  * @brief Enable support for expansion modules on designated serial port.
  *

applications/services/expansion/expansion_i.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include "expansion_settings.h"
-#include "expansion.h"
-
-ExpansionSettings* expansion_get_settings(Expansion* instance);

applications/services/expansion/expansion_settings.c

@@ -2,7 +2,6 @@
 
 #include <storage/storage.h>
 #include <toolbox/saved_struct.h>
-#include <furi_hal_serial.h>
 
 #include "expansion_settings_filename.h"
 

applications/services/expansion/expansion_worker.c

@@ -223,7 +223,6 @@ static bool expansion_worker_handle_state_handshake(
 
         if(furi_hal_serial_is_baud_rate_supported(instance->serial_handle, baud_rate)) {
             instance->state = ExpansionWorkerStateConnected;
-            instance->callback(instance->cb_context, ExpansionWorkerCallbackReasonConnected);
             // Send response at previous baud rate
             if(!expansion_worker_send_status_response(instance, ExpansionFrameErrorNone)) break;
             furi_hal_serial_set_br(instance->serial_handle, baud_rate);
@@ -352,7 +351,7 @@ static int32_t expansion_worker(void* context) {
 
     // Do not invoke worker callback on user-requested exit
     if((instance->exit_reason != ExpansionWorkerExitReasonUser) && (instance->callback != NULL)) {
-        instance->callback(instance->cb_context, ExpansionWorkerCallbackReasonExit);
+        instance->callback(instance->cb_context);
     }
 
     return 0;

applications/services/expansion/expansion_worker.h

@@ -17,20 +17,14 @@
  */
 typedef struct ExpansionWorker ExpansionWorker;
 
-typedef enum {
-    ExpansionWorkerCallbackReasonExit,
-    ExpansionWorkerCallbackReasonConnected,
-} ExpansionWorkerCallbackReason;
-
 /**
  * @brief Worker callback type.
  *
  * @see expansion_worker_set_callback()
  *
  * @param[in,out] context pointer to a user-defined object.
- * @param[in] reason reason for the callback.
  */
-typedef void (*ExpansionWorkerCallback)(void* context, ExpansionWorkerCallbackReason reason);
+typedef void (*ExpansionWorkerCallback)(void* context);
 
 /**
  * @brief Create an expansion worker instance.