added full refactorings, but it fails to build for now

Author: cristidragomir97

Arduino_UnifiedStorage_WorkInProgress.ino.elf

@@ -1,4 +1,3 @@
-#include <Arduino.h>
 #include <Arduino_UnifiedStorage.h>
 #include <vector>
 

examples/AdvancedInternalStorage/AdvancedInternalStorage.ino

@@ -2,16 +2,39 @@
 #ifndef UnifiedStorage_H
 #define UnifiedStorage_H
 
+#define HAS_SD defined(ARDUINO_PORTENTA_C33) || defined(ARDUINO_PORTENTA_H7_M7) 
+#define HAS_USB defined(ARDUINO_PORTENTA_C33) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA) 
+#define HAS_QSPI defined(ARDUINO_PORTENTA_C33) || defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA) || defined(ARDUINO_NICLA_VISION)
+
+#define USES_RENESAS_CORE defined(ARDUINO_PORTENTA_C33)
+#define USES_MBED_CORE  defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_OPTA) || defined(ARDUINO_NICLA_VISION)
+
 
 #include "Arduino.h"
 #include "Arduino_POSIXStorage.h"
+#include <vector>
+#include "Types.h"
+#include "Utils.h"
 #include "Folder.h"
 #include "UFile.h"
-#include "Utils.h"
 
 
 
 
+#if defined(HAS_USB)
+    #include "USBStorage.h"
+#endif
+
+#if defined(HAS_SD)
+    #include "SDStorage.h"
+#endif
+
+#if defined(HAS_QSPI)
+    #include "InternalStorage.h"
+#endif
+
+
+
 /**
  * Abstract class representing the common features of the supported storage methods 
  */
@@ -52,14 +75,7 @@ class Arduino_UnifiedStorage {
 };
 
 
-#if defined(ARDUINO_PORTENTA_C33) || defined(ARDUINO_PORTENTA_H7_M7)
-    #include "USBStorage.h"
-    #include "SDStorage.h"
-    #include "InternalStorage.h"
-#elif defined(ARDUINO_OPTA)
-    #include "USBStorage.h"
-    #include "InternalStorage.h"
-#endif
+
 
 
 #endif

src/Arduino_UnifiedStorage.h

@@ -4,6 +4,7 @@
 #include "Arduino_UnifiedStorage.h"
 #include "Partitioning.h"
 #include "Types.h"
+
 /**
  * Represents internal storage using the Arduino Unified Storage library.
  */

src/InternalStorage.h

@@ -1,6 +1,6 @@
 
 #include "Arduino.h"
-#include "Arduino_POSIXStorage.h"
+#include "Arduino_UnifiedStorage.h"
 #include "Types.h"
 #include <vector>
 

src/Partitioning.h

@@ -5,7 +5,6 @@
 
 #include "Arduino_UnifiedStorage.h"
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_C33) || !defined(ARDUINO_OPTA)
 
 /**
  * Represents an SD card storage using the Arduino Unified Storage library.
@@ -59,5 +58,3 @@ class SDStorage: public Arduino_UnifiedStorage  {
 };
 
 #endif
-
-#endif

src/SDStorage.h

@@ -1,4 +1,5 @@
-#if defined(ARDUINO_PORTENTA_C33)
+
+#if defined(USES_RENESAS_CORE)
     #include "BlockDevice.h"
     #include "MBRBlockDevice.h"
     #include "LittleFileSystem.h"
@@ -11,7 +12,7 @@
     typedef LittleFileSystem LittleFileSystemType;
     typedef FileSystem FileSystemType;
 
-#elif defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_OPTA)
+#elif defined(USES_MBED_CORE)
     #include "QSPIFBlockDevice.h"
     #include "MBRBlockDevice.h"
     #include "FATFileSystem.h"

src/Types.h

@@ -7,7 +7,6 @@
 #include "Arduino.h"
 #include "Arduino_POSIXStorage.h"
 #include <iostream>
-#include <vector>