chore: SDIO conversion to HAL

EdgeTX · Aug 12, 2023 · 1d2389a · 1d2389a
1 parent f1968f9
commit 1d2389a
Show file tree

Hide file tree

Showing 29 changed files with 514 additions and 2,630 deletions.
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
@@ -1259,6 +1259,10 @@ void printAudioVars()
 
 #include "hal/switch_driver.h"
 
+#if defined(DISK_CACHE)
+#include "disk_cache.h"
+#endif
+
 int cliDisplay(const char ** argv)
 {
   long long int address = 0;

diff --git a/radio/src/disk_cache.cpp b/radio/src/disk_cache.cpp
@@ -19,22 +19,48 @@
  * GNU General Public License for more details.
  */
 
+#include "disk_cache.h"
+#include "sdcard.h"
+
 #include <string.h>
-#include "opentx.h"
 
 #if defined(SIMU) && !defined(SIMU_DISKIO)
   #define __disk_read(...)    (RES_OK)
   #define __disk_write(...)   (RES_OK)
 #endif
 
-#if 0     // set to 1 to enable traces
+#if 0  // set to 1 to enable traces
+  #include "debug.h"
   #define TRACE_DISK_CACHE(...)   TRACE(__VA_ARGS__)
 #else
   #define TRACE_DISK_CACHE(...)
 #endif
 
+#if FF_MAX_SS != FF_MIN_SS
+#error "Variable sector size is not supported"
+#endif
+
+#define BLOCK_SIZE FF_MAX_SS
+#define DISK_CACHE_BLOCK_SIZE (DISK_CACHE_BLOCK_SECTORS * BLOCK_SIZE)
+
 DiskCache diskCache;
 
+class DiskCacheBlock
+{
+public:
+  DiskCacheBlock();
+  bool read(BYTE* buff, DWORD sector, UINT count);
+  DRESULT fill(BYTE drv, BYTE* buff, DWORD sector, UINT count);
+  void free(DWORD sector, UINT count);
+  void free();
+  bool empty() const;
+
+private:
+  uint8_t data[DISK_CACHE_BLOCK_SIZE];
+  DWORD startSector;
+  DWORD endSector;
+};
+
 DiskCacheBlock::DiskCacheBlock():
   startSector(0),
   endSector(0) 
@@ -97,7 +123,7 @@ void DiskCache::clear()
   stats.noHits = 0;
   stats.noMisses = 0;
   stats.noWrites = 0;
-  for (int n=0; n<DISK_CACHE_BLOCKS_NUM; ++n) {
+  for (int n = 0; n < DISK_CACHE_BLOCKS_NUM; ++n) {
     blocks[n].free();
   }
 }
@@ -117,12 +143,12 @@ DRESULT DiskCache::read(BYTE drv, BYTE * buff, DWORD sector, UINT count)
   }
 
   // if block + cache block size is beyond the end of the disk, then read it directly without using cache
-  if (sector+DISK_CACHE_BLOCK_SECTORS >= sdGetNoSectors()) {
+  if (sector + DISK_CACHE_BLOCK_SECTORS >= sdGetNoSectors()) {
     TRACE_DISK_CACHE("\t\t cache would be beyond end of disk %u (%u)", (uint32_t)sector, sdGetNoSectors());
     return __disk_read(drv, buff, sector, count);
   }
 
-  for (int n=0; n<DISK_CACHE_BLOCKS_NUM; ++n) {
+  for (int n = 0; n < DISK_CACHE_BLOCKS_NUM; ++n) {
     if (blocks[n].read(buff, sector, count)) {
       ++stats.noHits;
       return RES_OK;
@@ -132,7 +158,7 @@ DRESULT DiskCache::read(BYTE drv, BYTE * buff, DWORD sector, UINT count)
   ++stats.noMisses;
 
   // find free block
-  for (int n=0; n<DISK_CACHE_BLOCKS_NUM; ++n) {
+  for (int n = 0; n < DISK_CACHE_BLOCKS_NUM; ++n) {
     if (blocks[n].empty()) {
       TRACE_DISK_CACHE("\t\t using free block");
       return blocks[n].fill(drv, buff, sector, count);
@@ -151,7 +177,7 @@ DRESULT DiskCache::read(BYTE drv, BYTE * buff, DWORD sector, UINT count)
 DRESULT DiskCache::write(BYTE drv, const BYTE* buff, DWORD sector, UINT count)
 {
   ++stats.noWrites;
-  for(int n=0; n < DISK_CACHE_BLOCKS_NUM; ++n) {
+  for(int n = 0; n < DISK_CACHE_BLOCKS_NUM; ++n) {
     blocks[n].free(sector, count);
   }
   return __disk_write(drv, buff, sector, count);  

diff --git a/radio/src/disk_cache.h b/radio/src/disk_cache.h
@@ -22,46 +22,33 @@
 #ifndef _DISK_CACHE_H_
 #define _DISK_CACHE_H_
 
-#include "diskio.h"
+#include "FatFs/diskio.h"
 
 // tunable parameters
 #define DISK_CACHE_BLOCKS_NUM      32   // no cache blocks
 #define DISK_CACHE_BLOCK_SECTORS   16   // no sectors
 
-#define DISK_CACHE_BLOCK_SIZE   (DISK_CACHE_BLOCK_SECTORS * BLOCK_SIZE)
-
-class DiskCacheBlock
-{
-public:
-  DiskCacheBlock();
-  bool read(BYTE* buff, DWORD sector, UINT count);
-  DRESULT fill(BYTE drv, BYTE* buff, DWORD sector, UINT count);
-  void free(DWORD sector, UINT count);
-  void free();
-  bool empty() const;
-
-private:
-  uint8_t data[DISK_CACHE_BLOCK_SIZE];
-  DWORD startSector;
-  DWORD endSector;
-};
-
 struct DiskCacheStats
 {
   uint32_t noHits;
   uint32_t noMisses;
   uint32_t noWrites;
 };
 
+class DiskCacheBlock;
+
 class DiskCache
 {
   public:
     DiskCache();
+
+    void clear();
+
     DRESULT read(BYTE drv, BYTE* buff, DWORD sector, UINT count);
     DRESULT write(BYTE drv, const BYTE* buff, DWORD sector, UINT count);
+
     const DiskCacheStats & getStats() const;
     int getHitRate() const;
-    void clear();
 
   private:
     DiskCacheStats stats;

diff --git a/radio/src/gui/screenshot.cpp b/radio/src/gui/screenshot.cpp
@@ -56,7 +56,7 @@ const char * writeScreenshot()
   UINT written;
   char filename[42]; // /SCREENSHOTS/screen-2013-01-01-123540.bmp
 
-  if (IS_SDCARD_FULL()) {
+  if (sdIsFull()) {
     POPUP_WARNING(STR_SDCARD_FULL_EXT);
     return STR_SDCARD_FULL_EXT;
   }

diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
@@ -280,7 +280,7 @@ void logsWrite()
     {
     #endif
 
-      bool sdCardFull = IS_SDCARD_FULL();
+      bool sdCardFull = sdIsFull();
 
       // check if file needs to be opened
       if (!g_oLogFile.obj.fs) {

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
@@ -645,8 +645,9 @@ static void checkRTCBattery()
 }
 
 void checkSDfreeStorage() {
-  if(IS_SDCARD_FULL())
+  if(sdIsFull()) {
     ALERT(STR_SD_CARD, STR_SDCARD_FULL, AU_ERROR);
+  }
 }
 
 #if defined(PCBFRSKY) || defined(PCBFLYSKY)

diff --git a/radio/src/opentx.h b/radio/src/opentx.h
@@ -246,9 +246,6 @@ enum RotaryEncoderMode {
 #define CASE_JACK_DETECT(x)
 #endif
 
-#if defined(DISK_CACHE)
-  #include "disk_cache.h"
-#endif
 
 #include "debug.h"
 
@@ -1052,10 +1049,6 @@ inline bool IS_TXBATT_WARNING()
   return g_vbat100mV <= g_eeGeneral.vBatWarn;
 }
 
-inline bool IS_SDCARD_FULL() {
-  return sdGetFreeSectors() < ((50 *1024*1024) / BLOCK_SIZE); // 50MB safety margin
-}
-
 enum TelemetryViews {
   TELEMETRY_CUSTOM_SCREEN_1,
   TELEMETRY_CUSTOM_SCREEN_2,

diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
+
 #include "opentx.h"
 #include "diskio.h"
 
@@ -30,6 +31,12 @@
   #include "libopenui/src/libopenui_file.h"
 #endif
 
+#if FF_MAX_SS != FF_MIN_SS
+#error "Variable sector size is not supported"
+#endif
+
+#define BLOCK_SIZE FF_MAX_SS
+
 #define SDCARD_MIN_FREE_SPACE_MB 50 // Maintain a 50MB free space buffer to prevent crashes
 
 const char * sdCheckAndCreateDirectory(const char * path)
@@ -451,6 +458,13 @@ uint32_t sdGetFreeSectors()
   return nofree * fat->csize;
 }
 
+uint32_t sdGetFreeKB()
+{
+  return sdGetFreeSectors() * (1024 / BLOCK_SIZE);
+}
+
+bool sdIsFull() { return sdGetFreeKB() < SDCARD_MIN_FREE_SPACE_MB * 1024; }
+
 #else  // #if !defined(SIMU) || defined(SIMU_DISKIO)
 
 uint32_t sdGetNoSectors()
@@ -468,4 +482,7 @@ uint32_t sdGetFreeSectors()
   return ((SDCARD_MIN_FREE_SPACE_MB*1024*1024)/BLOCK_SIZE)+1;    // SIMU SD card is always above threshold
 }
 
+uint32_t sdGetFreeKB() { return SDCARD_MIN_FREE_SPACE_MB * 1024 + 1; }
+bool sdIsFull() { return false; }
+
 #endif  // #if !defined(SIMU) || defined(SIMU_DISKIO)
diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h
@@ -127,6 +127,9 @@ void logsWrite();
 uint32_t sdGetNoSectors();
 uint32_t sdGetSize();
 uint32_t sdGetFreeSectors();
+uint32_t sdGetFreeKB();
+bool sdIsFull();
+
 const char * sdCheckAndCreateDirectory(const char * path);
 
 #if !defined(BOOT)

diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt
@@ -308,7 +308,6 @@ set(SRC
 set(FIRMWARE_TARGET_SRC
   ${FIRMWARE_TARGET_SRC}
   # keys_driver.cpp
-  diskio.cpp
   # telemetry_driver.cpp
 )
 

diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -25,7 +25,6 @@ set(BOOTLOADER_SRC
   ../../../../../${FATFS_DIR}/ffunicode.c
   ../../../../../targets/${TARGET_DIR}/${LCD_DRIVER}
   ../../../../../targets/${TARGET_DIR}/backlight_driver.cpp
-  ../../../../../targets/${TARGET_DIR}/diskio.cpp
   ../../../../../targets/${TARGET_DIR}/board.cpp
   ../../../../../targets/${TARGET_DIR}/bootloader/boot_menu.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/hal_keys.inc
@@ -77,7 +76,8 @@ if(PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14)
     ../../../../../fonts/lvgl/lv_font_roboto_bl_16.c
     ../../../../../thirdparty/libopenui/src/bitmapbuffer.cpp
     ../../../../../thirdparty/libopenui/thirdparty/lz4/lz4.c
-    ../../../../../targets/common/arm/stm32/sdio_sd.c
+    ../../../../../targets/common/arm/stm32/sdio_sd.cpp
+    ../../../../../targets/common/arm/stm32/diskio_sdio.cpp
     ../../../../../targets/common/arm/stm32/rtc_driver.cpp
     ../../../../../targets/${TARGET_DIR}/sdram_driver.c
     ../../../../../targets/${TARGET_DIR}/haptic_driver.cpp
@@ -119,6 +119,7 @@ else()
     ../../../../../gui/common/stdlcd/fonts.cpp
     ../../../../../gui/common/stdlcd/utf8.cpp
     ../../../../../targets/${TARGET_DIR}/eeprom_driver.cpp
+    ../../../../../targets/${TARGET_DIR}/diskio.cpp
     )
   remove_definitions(-DDEBUG)
 endif()

diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
@@ -94,9 +94,12 @@ uint32_t eepromWritten = 0;
 FlashCheckRes valid;
 MemoryType memoryType;
 uint32_t unlocked = 0;
+uint32_t timer10MsCount;
+
 
 void interrupt10ms()
 {
+  timer10MsCount++;
   tenms |= 1u; // 10 mS has passed
   g_tmr10ms++;
 
@@ -116,6 +119,7 @@ void interrupt10ms()
 
 void init10msTimer()
 {
+  timer10MsCount = 0;
   INTERRUPT_xMS_TIMER->ARR = 9999;  // 10mS in uS
   INTERRUPT_xMS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1; // 1uS
   INTERRUPT_xMS_TIMER->CCER = 0;
@@ -126,6 +130,11 @@ void init10msTimer()
   NVIC_EnableIRQ(INTERRUPT_xMS_IRQn);
 }
 
+extern "C" uint32_t HAL_GetTick(void)
+{
+    return timer10MsCount*10;
+}
+
 #if !defined(SIMU)
 extern "C" void INTERRUPT_xMS_IRQHandler()
 {