SFU: Remove filesystem and block device dependency from download function

Author: pennam

libraries/SFU/src/SFU.cpp

@@ -18,9 +18,6 @@
 */
 
 #include "SFU.h"
-#include <BlockDevice.h>
-#include <MBRBlockDevice.h>
-#include "FATFileSystem.h"
 #include <Arduino_DebugUtils.h>
 #include <WiFiC3.h>
 #include <WiFiSSLClient.h>
@@ -32,10 +29,6 @@ const unsigned char SFU[0x20000] __attribute__ ((section(".second_stage_ota"), u
 	#include "c33.h"
 };
 
-BlockDevice* block_device = BlockDevice::get_default_instance();
-MBRBlockDevice mbr(block_device, 1);
-FATFileSystem fs("ota");
-
 /* Original code: http://stackoverflow.com/questions/2616011/easy-way-to-parse-a-url-in-c-cross-platform */
 #include <string>
 #include <algorithm>
@@ -81,16 +74,10 @@ void URI::parse(const string& url_s)
   query_.assign(query_i, url_s.end());
 }
 
-int SFU::download(const char* ota_url) {
+int SFU::download(const char* ota_path, const char* ota_url) {
   int err = -1;
 
-  if ((err = fs.reformat(&mbr)) != 0)
-  {
-     DEBUG_ERROR("%s: fs.reformat() failed with %d", __FUNCTION__, err);
-     return static_cast<int>(OTAError::PORTENTA_C33_ErrorReformat);
-  }
-
-  FILE * file = fopen("/ota/UPDATE.BIN.OTA", "wb");
+  FILE * file = fopen(ota_path, "wb");
   if (!file)
   {
     DEBUG_ERROR("%s: fopen() failed", __FUNCTION__);
@@ -203,12 +190,5 @@ int SFU::download(const char* ota_url) {
   DEBUG_INFO("%s: %d bytes received", __FUNCTION__, ftell(file));
   fclose(file);
 
-  /* Unmount the filesystem. */
-  if ((err = fs.unmount()) != 0)
-  {
-     DEBUG_ERROR("%s: fs.unmount() failed with %d", __FUNCTION__, err);
-     return static_cast<int>(OTAError::PORTENTA_C33_ErrorUnmount);
-  }
-
   return static_cast<int>(OTAError::None);
 }

libraries/SFU/src/SFU.h

@@ -37,13 +37,12 @@ enum class OTAError : int
   PORTENTA_C33_ErrorParseHttpHeader = PORTENTA_C33_OTA_ERROR_BASE - 6,
   PORTENTA_C33_ErrorFlashInit       = PORTENTA_C33_OTA_ERROR_BASE - 7,
   PORTENTA_C33_ErrorReformat        = PORTENTA_C33_OTA_ERROR_BASE - 8,
-  PORTENTA_C33_ErrorUnmount         = PORTENTA_C33_OTA_ERROR_BASE - 9,
 };
 
 class SFU {
 public:
 	static int begin() {};
-	static int download(const char* url);
+	static int download(const char* ota_path, const char* ota_url);
 	static int apply() { NVIC_SystemReset(); };
 };