Merge branch 'ofw_dev' into blerefactr

targets/f7/ble_glue/services/dev_info_service.c

@@ -1,6 +1,6 @@
 #include "dev_info_service.h"
 #include "app_common.h"
-#include "gatt_char.h"
+#include <furi_ble/gatt.h>
 #include <ble/ble.h>
 
 #include <furi.h>
@@ -20,45 +20,30 @@ typedef enum {
     DevInfoSvcGattCharacteristicCount,
 } DevInfoSvcGattCharacteristicId;
 
-#define DEVICE_INFO_HARDWARE_REV_SIZE 4
-typedef struct {
-    uint16_t service_handle;
-    FlipperGattCharacteristicInstance characteristics[DevInfoSvcGattCharacteristicCount];
-    FuriString* version_string;
-    char hardware_revision[DEVICE_INFO_HARDWARE_REV_SIZE];
-} DevInfoSvc;
+#define DEVICE_INFO_HARDWARE_REV_SIZE (4)
+#define DEVICE_INFO_SOFTWARE_REV_SIZE (40)
 
-static DevInfoSvc* dev_info_svc = NULL;
+struct BleServiceDevInfo {
+    uint16_t service_handle;
+    BleGattCharacteristicInstance characteristics[DevInfoSvcGattCharacteristicCount];
+};
 
 static const char dev_info_man_name[] = "Flipper Devices Inc.";
 static const char dev_info_serial_num[] = "1.0";
 static const char dev_info_rpc_version[] = TOSTRING(PROTOBUF_MAJOR_VERSION.PROTOBUF_MINOR_VERSION);
+static char hardware_revision[DEVICE_INFO_HARDWARE_REV_SIZE] = {0};
+static char software_revision[DEVICE_INFO_SOFTWARE_REV_SIZE] = {0};
 
-static bool dev_info_char_firmware_rev_callback(
-    const void* context,
-    const uint8_t** data,
-    uint16_t* data_len) {
-    const DevInfoSvc* dev_info_svc = *(DevInfoSvc**)context;
-    *data_len = strlen(dev_info_svc->hardware_revision);
+static bool
+    dev_info_char_data_callback(const void* context, const uint8_t** data, uint16_t* data_len) {
+    *data_len = (uint16_t)strlen(context); //-V1029
     if(data) {
-        *data = (const uint8_t*)&dev_info_svc->hardware_revision;
+        *data = (const uint8_t*)context;
     }
     return false;
 }
 
-static bool dev_info_char_software_rev_callback(
-    const void* context,
-    const uint8_t** data,
-    uint16_t* data_len) {
-    const DevInfoSvc* dev_info_svc = *(DevInfoSvc**)context;
-    *data_len = furi_string_size(dev_info_svc->version_string);
-    if(data) {
-        *data = (const uint8_t*)furi_string_get_cstr(dev_info_svc->version_string);
-    }
-    return false;
-}
-
-static const FlipperGattCharacteristicParams dev_info_svc_chars[DevInfoSvcGattCharacteristicCount] =
+static const BleGattCharacteristicParams ble_svc_dev_info_chars[DevInfoSvcGattCharacteristicCount] =
     {[DevInfoSvcGattCharacteristicMfgName] =
          {.name = "Manufacturer Name",
           .data_prop_type = FlipperGattCharacteristicDataFixed,
@@ -84,8 +69,8 @@ static const FlipperGattCharacteristicParams dev_info_svc_chars[DevInfoSvcGattCh
      [DevInfoSvcGattCharacteristicFirmwareRev] =
          {.name = "Firmware Revision",
           .data_prop_type = FlipperGattCharacteristicDataCallback,
-          .data.callback.context = &dev_info_svc,
-          .data.callback.fn = dev_info_char_firmware_rev_callback,
+          .data.callback.context = hardware_revision,
+          .data.callback.fn = dev_info_char_data_callback,
           .uuid.Char_UUID_16 = FIRMWARE_REVISION_UUID,
           .uuid_type = UUID_TYPE_16,
           .char_properties = CHAR_PROP_READ,
@@ -95,8 +80,8 @@ static const FlipperGattCharacteristicParams dev_info_svc_chars[DevInfoSvcGattCh
      [DevInfoSvcGattCharacteristicSoftwareRev] =
          {.name = "Software Revision",
           .data_prop_type = FlipperGattCharacteristicDataCallback,
-          .data.callback.context = &dev_info_svc,
-          .data.callback.fn = dev_info_char_software_rev_callback,
+          .data.callback.context = software_revision,
+          .data.callback.fn = dev_info_char_data_callback,
           .uuid.Char_UUID_16 = SOFTWARE_REVISION_UUID,
           .uuid_type = UUID_TYPE_16,
           .char_properties = CHAR_PROP_READ,
@@ -115,64 +100,52 @@ static const FlipperGattCharacteristicParams dev_info_svc_chars[DevInfoSvcGattCh
          .gatt_evt_mask = GATT_DONT_NOTIFY_EVENTS,
          .is_variable = CHAR_VALUE_LEN_CONSTANT}};
 
-void dev_info_svc_start() {
-    dev_info_svc = malloc(sizeof(DevInfoSvc));
-    dev_info_svc->version_string = furi_string_alloc_printf(
+BleServiceDevInfo* ble_svc_dev_info_start(void) {
+    BleServiceDevInfo* dev_info_svc = malloc(sizeof(BleServiceDevInfo));
+    snprintf(
+        software_revision,
+        sizeof(software_revision),
         "%s %s %s %s",
         version_get_githash(NULL),
         version_get_version(NULL),
         version_get_gitbranchnum(NULL),
         version_get_builddate(NULL));
-    snprintf(
-        dev_info_svc->hardware_revision,
-        sizeof(dev_info_svc->hardware_revision),
-        "%d",
-        version_get_target(NULL));
-    tBleStatus status;
+    snprintf(hardware_revision, sizeof(hardware_revision), "%d", version_get_target(NULL));
 
     // Add Device Information Service
     uint16_t uuid = DEVICE_INFORMATION_SERVICE_UUID;
-    status = aci_gatt_add_service(
-        UUID_TYPE_16,
-        (Service_UUID_t*)&uuid,
-        PRIMARY_SERVICE,
-        1 + 2 * DevInfoSvcGattCharacteristicCount,
-        &dev_info_svc->service_handle);
-    if(status) {
-        FURI_LOG_E(TAG, "Failed to add Device Information Service: %d", status);
+    if(!ble_gatt_service_add(
+           UUID_TYPE_16,
+           (Service_UUID_t*)&uuid,
+           PRIMARY_SERVICE,
+           1 + 2 * DevInfoSvcGattCharacteristicCount,
+           &dev_info_svc->service_handle)) {
+        free(dev_info_svc);
+        return NULL;
     }
 
     for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
-        flipper_gatt_characteristic_init(
+        ble_gatt_characteristic_init(
             dev_info_svc->service_handle,
-            &dev_info_svc_chars[i],
+            &ble_svc_dev_info_chars[i],
             &dev_info_svc->characteristics[i]);
-        flipper_gatt_characteristic_update(
+        ble_gatt_characteristic_update(
             dev_info_svc->service_handle, &dev_info_svc->characteristics[i], NULL);
     }
+
+    return dev_info_svc;
 }
 
-void dev_info_svc_stop() {
-    tBleStatus status;
-    if(dev_info_svc) {
-        // Delete service characteristics
-        for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
-            flipper_gatt_characteristic_delete(
-                dev_info_svc->service_handle, &dev_info_svc->characteristics[i]);
-        }
-
-        // Delete service
-        status = aci_gatt_del_service(dev_info_svc->service_handle);
-        if(status) {
-            FURI_LOG_E(TAG, "Failed to delete device info service: %d", status);
-        }
-
-        furi_string_free(dev_info_svc->version_string);
-        free(dev_info_svc);
-        dev_info_svc = NULL;
+void ble_svc_dev_info_stop(BleServiceDevInfo* dev_info_svc) {
+    furi_assert(dev_info_svc);
+    /* Delete service characteristics */
+    for(size_t i = 0; i < DevInfoSvcGattCharacteristicCount; i++) {
+        ble_gatt_characteristic_delete(
+            dev_info_svc->service_handle, &dev_info_svc->characteristics[i]);
     }
-}
 
-bool dev_info_svc_is_started() {
-    return dev_info_svc != NULL;
+    /* Delete service */
+    ble_gatt_service_delete(dev_info_svc->service_handle);
+
+    free(dev_info_svc);
 }