From 1cf9ee4336d69f28ba55d88023011f731fa42fac Mon Sep 17 00:00:00 2001
From: 3djc <3djc@gh.com>
Date: Sun, 30 Jun 2024 12:09:42 +0200
Subject: [PATCH] fix: sdmount fail after USB storage

---
 radio/src/gui/colorlcd/lcd.cpp | 39 +++++++++++++++++-----------------
 radio/src/hal/fatfs_diskio.cpp |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/radio/src/gui/colorlcd/lcd.cpp b/radio/src/gui/colorlcd/lcd.cpp
index 8b11d080f05..5a7485a7079 100644
--- a/radio/src/gui/colorlcd/lcd.cpp
+++ b/radio/src/gui/colorlcd/lcd.cpp
@@ -104,25 +104,26 @@ static void flushLcd(lv_disp_drv_t* disp_drv, const lv_area_t* area,
 #if defined(RADIO_F16)
   if (hardwareOptions.pcbrev > 0)
 #endif
-{
-    uint16_t* src = (uint16_t*)color_p;
-    uint16_t* dst = nullptr;
-    if ((uint16_t*)color_p == LCD_FIRST_FRAME_BUFFER)
-      dst = LCD_SECOND_FRAME_BUFFER;
-    else
-      dst = LCD_FIRST_FRAME_BUFFER;
-
-    lv_disp_t* disp = _lv_refr_get_disp_refreshing();
-    for (int i = 0; i < disp->inv_p; i++) {
-      if (disp->inv_area_joined[i]) continue;
-
-      const lv_area_t& refr_area = disp->inv_areas[i];
-
-      auto area_w = refr_area.x2 - refr_area.x1 + 1;
-      auto area_h = refr_area.y2 - refr_area.y1 + 1;
-
-      DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1, src, LCD_W,
-                    LCD_H, refr_area.x1, refr_area.y1, area_w, area_h);
+    {
+      uint16_t *src = (uint16_t *) color_p;
+      uint16_t *dst = nullptr;
+      if ((uint16_t *) color_p == LCD_FIRST_FRAME_BUFFER)
+        dst = LCD_SECOND_FRAME_BUFFER;
+      else
+        dst = LCD_FIRST_FRAME_BUFFER;
+
+      lv_disp_t *disp = _lv_refr_get_disp_refreshing();
+      for (int i = 0; i < disp->inv_p; i++) {
+        if (disp->inv_area_joined[i]) continue;
+
+        const lv_area_t &refr_area = disp->inv_areas[i];
+
+        auto area_w = refr_area.x2 - refr_area.x1 + 1;
+        auto area_h = refr_area.y2 - refr_area.y1 + 1;
+
+        DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1, src, LCD_W,
+                      LCD_H, refr_area.x1, refr_area.y1, area_w, area_h);
+      }
     }
 #endif
   }
diff --git a/radio/src/hal/fatfs_diskio.cpp b/radio/src/hal/fatfs_diskio.cpp
index b9e8c58d6fa..e5b62fd456b 100644
--- a/radio/src/hal/fatfs_diskio.cpp
+++ b/radio/src/hal/fatfs_diskio.cpp
@@ -112,7 +112,7 @@ void ff_mutex_delete(int vol) { }
 DSTATUS disk_initialize(BYTE pdrv)
 {
   if (pdrv >= _fatfs_n_drives) {
-    return STA_NOINIT;
+    return STA_NODISK;
   }
 
   DSTATUS stat = RES_OK;