added total filesystem call; size methods now return bytes as uint64

Author: gigapod

src/Flux/flxFS.h

@@ -177,7 +177,7 @@ class flxIFileSystem : public flxDescriptor
 
     virtual bool rmdir(const char *path) = 0;
 
-    virtual uint size(void) = 0;
+    virtual uint64_t size(void) = 0;
 
     virtual const char *type(void) = 0;
 

src/Flux/flxFSSDMMCard.cpp

@@ -231,12 +231,21 @@ bool _flxFSSDMMCard::rmdir(const char *path)
 }
 
 //-----------------------------------------------------------------------
-uint _flxFSSDMMCard::size(void)
+uint64_t _flxFSSDMMCard::size(void)
 {
     if (!_isInitalized)
         return 0;
 
-    return SD_MMC.cardSize() / (1024 * 1024);
+    return SD_MMC.cardSize();
+}
+
+//-----------------------------------------------------------------------
+uint64_t _flxFSSDMMCard::total(void)
+{
+    if (!_isInitalized)
+        return 0;
+
+    return SD_MMC.totalBytes();
 }
 //-----------------------------------------------------------------------
 
@@ -261,12 +270,12 @@ const char *_flxFSSDMMCard::type(void)
     }
 }
 
-uint _flxFSSDMMCard::used(void)
+uint64_t _flxFSSDMMCard::used(void)
 {
     if (!_isInitalized)
         return 0;
 
-    return SD_MMC.usedBytes() / (1024 * 1024);
+    return SD_MMC.usedBytes();
 }
 // -------------------------------------------------------
 // File implementation

src/Flux/flxFSSDMMCard.h

@@ -111,11 +111,13 @@ class _flxFSSDMMCard : public flxIFileSystem
 
     bool rmdir(const char *path);
 
-    uint size(void);
+    uint64_t size(void);
+
+    uint64_t total(void);
 
     const char *type(void);
 
-    uint used(void);
+    uint64_t used(void);
 
     bool enabled(void)
     {
@@ -211,12 +213,17 @@ class flxFSSDMMCard : public flxIFileSystem, public flxSystemType<flxFSSDMMCard>
         return _theSDMMCard.rmdir(path);
     }
 
-    uint size(void)
+    uint64_t size(void)
     {
         return _theSDMMCard.size();
     }
 
-    uint used(void)
+    uint64_t total(void)
+    {
+        return _theSDMMCard.total();
+    }
+
+    uint64_t used(void)
     {
         return _theSDMMCard.used();
     }