From 5b867227d814eafefc9b374037a13cc1ea303f65 Mon Sep 17 00:00:00 2001
From: Thomas Watson <twatson52@icloud.com>
Date: Sun, 16 Feb 2025 12:41:27 -0600
Subject: [PATCH] AP_Filesystem: littlefs: drop singleton

---
 .../AP_Filesystem_FlashMemory_LittleFS.cpp    | 24 -------------------
 .../AP_Filesystem_FlashMemory_LittleFS.h      | 10 --------
 2 files changed, 34 deletions(-)

diff --git a/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.cpp b/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.cpp
index 15ba808a89c70..eb6e54880d66d 100644
--- a/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.cpp
+++ b/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.cpp
@@ -64,16 +64,6 @@ static int lfs_flags_from_flags(int flags);
 
 const extern AP_HAL::HAL& hal;
 
-AP_Filesystem_FlashMemory_LittleFS* AP_Filesystem_FlashMemory_LittleFS::singleton;
-
-AP_Filesystem_FlashMemory_LittleFS::AP_Filesystem_FlashMemory_LittleFS()
-{
-    if (singleton) {
-        AP_HAL::panic("Too many AP_Filesystem_FlashMemory_LittleFS instances");
-    }
-    singleton = this;
-}
-
 int AP_Filesystem_FlashMemory_LittleFS::open(const char *pathname, int flags, bool allow_absolute_path)
 {
     FS_CHECK_ALLOWED(-1);
@@ -1260,18 +1250,4 @@ static int lfs_flags_from_flags(int flags)
     return outflags;
 }
 
-// get_singleton for access from logging layer
-AP_Filesystem_FlashMemory_LittleFS *AP_Filesystem_FlashMemory_LittleFS::get_singleton(void)
-{
-    return singleton;
-}
-
-namespace AP
-{
-AP_Filesystem_FlashMemory_LittleFS &littlefs()
-{
-    return *AP_Filesystem_FlashMemory_LittleFS::get_singleton();
-}
-}
-
 #endif  // AP_FILESYSTEM_LITTLEFS_ENABLED
diff --git a/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.h b/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.h
index b373169b135aa..089457d065a09 100644
--- a/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.h
+++ b/libraries/AP_Filesystem/AP_Filesystem_FlashMemory_LittleFS.h
@@ -25,7 +25,6 @@
 class AP_Filesystem_FlashMemory_LittleFS : public AP_Filesystem_Backend
 {
 public:
-    AP_Filesystem_FlashMemory_LittleFS();
     // functions that closely match the equivalent posix calls
     int open(const char *fname, int flags, bool allow_absolute_paths = false) override;
     int close(int fd) override;
@@ -63,9 +62,6 @@ class AP_Filesystem_FlashMemory_LittleFS : public AP_Filesystem_Backend
     int _flashmem_erase(lfs_block_t block);
     int _flashmem_sync();
 
-    // get_singleton for scripting
-    static AP_Filesystem_FlashMemory_LittleFS *get_singleton(void);
-
 private:
     // Semaphore to protect against concurrent accesses to fs
     HAL_Semaphore fs_sem;
@@ -108,8 +104,6 @@ class AP_Filesystem_FlashMemory_LittleFS : public AP_Filesystem_Backend
     bool use_32bit_address;
     FormatStatus format_status;
 
-    static AP_Filesystem_FlashMemory_LittleFS* singleton;
-
     int allocate_fd();
     int free_fd(int fd);
     void free_all_fds();
@@ -130,8 +124,4 @@ class AP_Filesystem_FlashMemory_LittleFS : public AP_Filesystem_Backend
     void mark_dead();
 };
 
-namespace AP {
-    AP_Filesystem_FlashMemory_LittleFS &littlefs();
-};
-
 #endif  // #if AP_FILESYSTEM_LITTLEFS_ENABLED