Run clang-format

aaronjamt · aaronjamt · commit b16559952e2c · 2025-12-04T18:59:23.000-07:00
diff --git a/sd_mounter.c b/sd_mounter.c
@@ -14,39 +14,41 @@
 #define TAG "SDMounter"
 
 Storage* storage;
-FuriThreadId *storage_thread;
+FuriThreadId* storage_thread;
 
 bool find_storage_thread();
 void do_mass_storage(FuriHalSdInfo card_info);
 int32_t sd_mounter_app(void* p);
 void cleanup();
 
 bool find_storage_thread() {
-    FuriThreadList *threads = furi_thread_list_alloc();
+    FuriThreadList* threads = furi_thread_list_alloc();
     furi_thread_enumerate(threads);
 
-    FuriThread *result = NULL;
+    FuriThread* result = NULL;
 
     for(size_t i = 0; i < furi_thread_list_size(threads); i++) {
         const FuriThreadListItem* item = furi_thread_list_get_at(threads, i);
-        
-        if (strcmp(item->app_id, "storage") == 0) {
-            if (result == NULL) {
+
+        if(strcmp(item->app_id, "storage") == 0) {
+            if(result == NULL) {
                 result = item->thread;
             } else {
-                show_error_and_wait("More than one storage thread!\nPlease report this error to the\napplication developer.", &I_Error_62x31, 62);
+                show_error_and_wait(
+                    "More than one storage thread!\nPlease report this error to the\napplication developer.",
+                    &I_Error_62x31,
+                    62);
                 return false;
             }
         }
 
-        if (strcmp(item->name, "MassStorageUsb") == 0 || strcmp(item->name, "SD Card Mounter") == 0) {
-            FURI_LOG_E("DBG","%-20s -> ID %p",
-                item->name,
-                furi_thread_get_id(item->thread));
+        if(strcmp(item->name, "MassStorageUsb") == 0 ||
+           strcmp(item->name, "SD Card Mounter") == 0) {
+            FURI_LOG_E("DBG", "%-20s -> ID %p", item->name, furi_thread_get_id(item->thread));
         }
     }
 
-    if (result != NULL) {
+    if(result != NULL) {
         storage_thread = furi_thread_get_id(result);
         return storage_thread != NULL;
     }
@@ -79,9 +81,12 @@ void do_mass_storage(FuriHalSdInfo card_info) {
     };
     furi_hal_usb_unlock();
 
-    MassStorageUsb *usb = mass_storage_usb_start(card_desc, fn);
-    if (usb == NULL) {
-        show_error_and_wait("Unable to connect to computer.\nPlease try again.", &I_SDQuestion_35x43, 35); // TODO: Diff icon?
+    MassStorageUsb* usb = mass_storage_usb_start(card_desc, fn);
+    if(usb == NULL) {
+        show_error_and_wait(
+            "Unable to connect to computer.\nPlease try again.",
+            &I_SDQuestion_35x43,
+            35); // TODO: Diff icon?
         return;
     }
 
@@ -90,8 +95,8 @@ void do_mass_storage(FuriHalSdInfo card_info) {
     uint64_t last_read = 0;
 
     // Wait for the card to be ejected
-    FuriString *message = furi_string_alloc();
-    while (1) {
+    FuriString* message = furi_string_alloc();
+    while(1) {
         // Update bytes counter
         furi_string_printf(
             message,
@@ -103,7 +108,7 @@ void do_mass_storage(FuriHalSdInfo card_info) {
             ctx.bytes_written / 1024);
         update_existing_popup(furi_string_get_cstr(message));
 
-        if (last_read != ctx.bytes_read) {
+        if(last_read != ctx.bytes_read) {
             last_read = ctx.bytes_read;
             notify(NULL);
             furi_delay_ms(2);
@@ -112,11 +117,12 @@ void do_mass_storage(FuriHalSdInfo card_info) {
         }
 
         // Quit if the card is removed
-        if (!furi_hal_sd_is_present()) break;
+        if(!furi_hal_sd_is_present()) break;
 
         // Stop if the card is ejected (from the computer) or the back button is pressed
-        uint32_t flags = furi_thread_flags_wait(FlagEject | FlagBackButtonPressed, FuriFlagNoClear, 50);
-        if (flags != FuriFlagErrorTimeout) break;
+        uint32_t flags =
+            furi_thread_flags_wait(FlagEject | FlagBackButtonPressed, FuriFlagNoClear, 50);
+        if(flags != FuriFlagErrorTimeout) break;
     }
 
     update_existing_popup("Ejecting card, please wait...");
@@ -129,31 +135,40 @@ int32_t sd_mounter_app(void* p) {
     UNUSED(p);
 
     ui_init();
-            
+
     /*
     * Initialize Storage
     * Unmounts SD card and suspends the Storage thred
     */
     storage = furi_record_open(RECORD_STORAGE);
     FS_Error error = storage_sd_unmount(storage);
-    switch (error) {
-        case FSE_OK:        // Success
-        case FSE_NOT_READY: // Already unmounted
-            break;
-
-        case FSE_DENIED:    // Can't unmount, open files
-            show_error_and_wait("Can't unmount SD\ncard. Please close all\nopen files.", &I_SDQuestion_35x43, 35); // TODO: Diff icon?
-            cleanup();
-            return -1;
-            
-        default:
-            show_error_and_wait("Can't unmount SD\ncard due to an\nunknown error", &I_SDQuestion_35x43, 35); // TODO: Diff icon?
-            cleanup();
-            return -1;
+    switch(error) {
+    case FSE_OK: // Success
+    case FSE_NOT_READY: // Already unmounted
+        break;
+
+    case FSE_DENIED: // Can't unmount, open files
+        show_error_and_wait(
+            "Can't unmount SD\ncard. Please close all\nopen files.",
+            &I_SDQuestion_35x43,
+            35); // TODO: Diff icon?
+        cleanup();
+        return -1;
+
+    default:
+        show_error_and_wait(
+            "Can't unmount SD\ncard due to an\nunknown error",
+            &I_SDQuestion_35x43,
+            35); // TODO: Diff icon?
+        cleanup();
+        return -1;
     }
 
-    if (!find_storage_thread()) {
-        show_error_and_wait("Unable to find storage thread!\nPlease report this error to the\napplication developer.", &I_Error_62x31, 62);
+    if(!find_storage_thread()) {
+        show_error_and_wait(
+            "Unable to find storage thread!\nPlease report this error to the\napplication developer.",
+            &I_Error_62x31,
+            62);
         cleanup();
         return -1;
     }
@@ -168,49 +183,52 @@ int32_t sd_mounter_app(void* p) {
     * Stores infomation about the current SD card, to check whether it has been reinserted
     */
 
-    FuriHalSdInfo *target_card_info = NULL;
+    FuriHalSdInfo* target_card_info = NULL;
     show("Scanning card, please wait...\nDO NOT REMOVE CARD!");
     target_card_info = try_get_sd_info();
-    if (target_card_info == NULL) {
-        show_error_and_wait("Error getting SD card\ninformation!", &I_SDQuestion_35x43, 35); // TODO: Diff icon?
+    if(target_card_info == NULL) {
+        show_error_and_wait(
+            "Error getting SD card\ninformation!", &I_SDQuestion_35x43, 35); // TODO: Diff icon?
         cleanup();
         return -1;
     }
-    FuriString *original_card_desc = get_card_desc(*target_card_info);
+    FuriString* original_card_desc = get_card_desc(*target_card_info);
 
     FURI_LOG_D(TAG, "Original card info: '%s'", furi_string_get_cstr(original_card_desc));
-    
+
     /*
     * Main Loop
     * This loop runs until the user presses the Back button
     */
-    FuriHalSdInfo *card_info = NULL;
-    FuriString *card_desc = NULL;
-    while (!back_button_was_pressed(true)) {
+    FuriHalSdInfo* card_info = NULL;
+    FuriString* card_desc = NULL;
+    while(!back_button_was_pressed(true)) {
         show("Insert an SD card or\npress Back to exit.");
         // Wait for the card to be inserted or the back button to be pressed
         notify(&led_blink_cyan);
-        while (!furi_hal_sd_is_present() && !back_button_was_pressed(false)) furi_thread_yield();
+        while(!furi_hal_sd_is_present() && !back_button_was_pressed(false))
+            furi_thread_yield();
 
         // If the back button was pressed, attempt to quit the app
-        if (back_button_was_pressed(true)) break;
+        if(back_button_was_pressed(true)) break;
 
         show("Scanning card, please wait...\nDO NOT REMOVE CARD!");
 
         // Try to fetch the card info
         card_info = try_get_sd_info();
 
         // Fetching the card info can take a while so check again if the back button was pressed
-        if (back_button_was_pressed(true)) break;
+        if(back_button_was_pressed(true)) break;
 
-        if (card_info == NULL) {
+        if(card_info == NULL) {
             show("Failed to get card info!\nRemove card and try again.");
             // Wait for card to be removed before continuing
             notify(&led_red);
-            while (furi_hal_sd_is_present()) furi_thread_yield();
+            while(furi_hal_sd_is_present())
+                furi_thread_yield();
             continue;
         }
-        
+
         card_desc = get_card_desc(*card_info);
         notify(&led_green);
 
@@ -222,7 +240,8 @@ int32_t sd_mounter_app(void* p) {
         // Card ejected, wait for it to be removed
         show("SD Card ejected,\nplease remove it.\nPress Back to exit.");
         notify(&led_blink_yellow_slow);
-        while (furi_hal_sd_is_present() && !back_button_was_pressed(false)) furi_thread_yield();
+        while(furi_hal_sd_is_present() && !back_button_was_pressed(false))
+            furi_thread_yield();
     };
 
     /*
@@ -231,35 +250,36 @@ int32_t sd_mounter_app(void* p) {
     card_info = NULL;
     card_desc = NULL;
     notify(&led_blink_cyan);
-    while (1) {
+    while(1) {
         show("Please reinsert the\nFlipper's original SD\ncard to exit this app.");
-        if (furi_hal_sd_is_present()) {
+        if(furi_hal_sd_is_present()) {
             show("Scanning card, please wait...\nDO NOT REMOVE CARD!");
             card_info = try_get_sd_info();
-            if (card_info != NULL) {
+            if(card_info != NULL) {
                 card_desc = get_card_desc(*card_info);
             }
-            
+
             // If the card is the correct one, exit the loop
-            if (card_info != NULL && card_desc != NULL) {
-                if (furi_string_equal(card_desc, original_card_desc)) {
+            if(card_info != NULL && card_desc != NULL) {
+                if(furi_string_equal(card_desc, original_card_desc)) {
                     notify(&led_green);
                     break;
                 }
             }
-                
+
             // Otherwise, show a message and wait for the card to be removed
             notify(&led_red);
             show("Wrong SD card. Reinsert\nthe Flipper's original SD\ncard to exit this app.");
-            while (furi_hal_sd_is_present()) furi_thread_yield();
+            while(furi_hal_sd_is_present())
+                furi_thread_yield();
             notify(&led_blink_cyan);
         }
     }
 
     notify(NULL);
     show("Flipper card detected.\nGoodbye!");
     furi_delay_ms(500);
-    
+
     cleanup();
     return 0;
 }
@@ -274,16 +294,16 @@ void cleanup() {
     sd_init();
 
     // If the storage thread was found, resume it
-    if (storage_thread != NULL) {
+    if(storage_thread != NULL) {
         furi_thread_resume(storage_thread);
     }
 
     // Make sure the SD card is mounted before exiting
     storage_sd_mount(storage);
-    
-    if (storage != NULL) {
+
+    if(storage != NULL) {
         furi_record_close(RECORD_STORAGE);
     }
 
     ui_cleanup();
-}
+}
diff --git a/sd_mounter.h b/sd_mounter.h
@@ -2,15 +2,15 @@
 #include <furi.h>
 
 enum {
-    FlagEject             = 1 << 5,
+    FlagEject = 1 << 5,
     FlagBackButtonPressed = 1 << 4,
 };
 
 typedef struct {
-    FuriThreadId *thread_id;
+    FuriThreadId* thread_id;
     uint64_t card_size_in_blocks;
     uint32_t logical_block_size;
 
     uint64_t bytes_read;
     uint64_t bytes_written;
-} Context;
+} Context;
diff --git a/ui.c b/ui.c
