Merge pull request #583 from Foundation-Devices/SFT-4402

SFT-4402: Implement erase for simulator flash.

Author: FoundationKen

extmod/foundation-rust/embedded-storage-fs/src/lib.rs

@@ -60,9 +60,15 @@ impl<
     where
         P: AsRef<Path>,
     {
-        let mut file = fs::File::open(&path)?;
         let mut storage = Vec::new();
-        file.read_to_end(&mut storage)?;
+        match fs::File::open(&path) {
+            Ok(mut f) => {
+                f.read_to_end(&mut storage)?;
+            }
+            // If no file is found, the storage will become a new file
+            Err(e) if e.kind() == io::ErrorKind::NotFound => (),
+            Err(e) => Err(e)?,
+        };
 
         // If the file doesn't match the capacity just resize it, it can
         // silently truncate the file or extend it and fill it with blank
@@ -124,7 +130,7 @@ impl<
 
         let from = usize::try_from(from).expect("u32 bigger than usize");
         let to = usize::try_from(to).expect("u32 bigger than usize");
-        self.storage[from..from + to].fill(0xFF);
+        self.storage[from..to].fill(0xFF);
         fs::write(&self.path, &self.storage)?;
         Ok(())
     }

extmod/foundation-rust/src/flash.rs

@@ -143,11 +143,23 @@ pub extern "C" fn write(offset: u32, data: *const u8, len: usize) -> bool {
 /// Erase a sector of the flash storage.
 #[export_name = "foundation_flash_sector_erase"]
 pub extern "C" fn sector_erase(offset: u32) -> bool {
+    let mut flash = unsafe { FLASH.borrow_mut() };
+
     #[cfg(target_arch = "arm")]
     {
-        let mut flash = unsafe { FLASH.borrow_mut() };
+        if flash.as_mut_inner().sector_erase(offset).is_err() {
+            return false;
+        }
+    }
 
-        if let Err(_) = flash.as_mut_inner().sector_erase(offset) {
+    #[cfg(not(target_arch = "arm"))]
+    {
+        // Erase 4 KiB.
+        if flash
+            .as_mut_inner()
+            .erase(offset, offset + (4 * 1024))
+            .is_err()
+        {
             return false;
         }
     }
@@ -158,11 +170,23 @@ pub extern "C" fn sector_erase(offset: u32) -> bool {
 /// Erase a block of the flash storage.
 #[export_name = "foundation_flash_block_erase"]
 pub extern "C" fn block_erase(offset: u32) -> bool {
+    let mut flash = unsafe { FLASH.borrow_mut() };
+
     #[cfg(target_arch = "arm")]
     {
-        let mut flash = unsafe { FLASH.borrow_mut() };
+        if flash.as_mut_inner().block_erase_64kib(offset).is_err() {
+            return false;
+        }
+    }
 
-        if let Err(_) = flash.as_mut_inner().block_erase_64kib(offset) {
+    #[cfg(not(target_arch = "arm"))]
+    {
+        // Erase 64 KiB.
+        if flash
+            .as_mut_inner()
+            .erase(offset, offset + (64 * 1024))
+            .is_err()
+        {
             return false;
         }
     }