Merge branch 'develop' into fix/multiblock-writes

Author: elpiel

Cargo.toml

@@ -14,6 +14,7 @@ version = "0.5.0"
 byteorder = {version = "1", default-features = false}
 defmt = {version = "0.3", optional = true}
 embedded-hal = "0.2.3"
+heapless = "0.7"
 log = {version = "0.4", default-features = false, optional = true}
 
 [dev-dependencies]

src/filesystem/directory.rs

@@ -2,7 +2,7 @@ use core::convert::TryFrom;
 
 use crate::blockdevice::BlockIdx;
 use crate::fat::{FatType, OnDiskDirEntry};
-use crate::filesystem::{Attributes, Cluster, ShortFileName, Timestamp};
+use crate::filesystem::{Attributes, Cluster, SearchId, ShortFileName, Timestamp};
 
 /// Represents a directory entry, which tells you about
 /// other files and directories.
@@ -33,8 +33,8 @@ pub struct DirEntry {
 pub struct Directory {
     /// The starting point of the directory listing.
     pub(crate) cluster: Cluster,
-    /// Dir Entry of this directory, None for the root directory
-    pub(crate) entry: Option<DirEntry>,
+    /// Search ID for this directory.
+    pub(crate) search_id: SearchId,
 }
 
 impl DirEntry {

src/filesystem/files.rs

@@ -1,4 +1,4 @@
-use crate::filesystem::{Cluster, DirEntry};
+use crate::filesystem::{Cluster, DirEntry, SearchId};
 
 /// Represents an open file on disk.
 #[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
@@ -16,6 +16,8 @@ pub struct File {
     pub(crate) mode: Mode,
     /// DirEntry of this file
     pub(crate) entry: DirEntry,
+    /// Search ID for this file
+    pub(crate) search_id: SearchId,
 }
 
 /// Errors related to file operations

src/filesystem/mod.rs

@@ -11,11 +11,13 @@ mod cluster;
 mod directory;
 mod filename;
 mod files;
+mod search_id;
 mod timestamp;
 
 pub use self::attributes::Attributes;
 pub use self::cluster::Cluster;
 pub use self::directory::{DirEntry, Directory};
 pub use self::filename::{FilenameError, ShortFileName};
 pub use self::files::{File, FileError, Mode};
+pub use self::search_id::{IdGenerator, SearchId};
 pub use self::timestamp::{TimeSource, Timestamp};

src/filesystem/search_id.rs

@@ -0,0 +1,29 @@
+use core::num::Wrapping;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
+/// Unique ID used to search for files and directories in the open File/Directory lists
+pub struct SearchId(pub(crate) u32);
+
+/// ID generator intented to be used in a static context.
+///
+/// This object will always return a different ID.
+pub struct IdGenerator {
+    next_id: Wrapping<u32>,
+}
+
+impl IdGenerator {
+    /// Create a new [`IdGenerator`].
+    pub const fn new() -> Self {
+        Self {
+            next_id: Wrapping(0),
+        }
+    }
+
+    /// Generate a new, unique [`SearchId`].
+    pub fn get(&mut self) -> SearchId {
+        let id = self.next_id;
+        self.next_id += 1;
+        SearchId(id.0)
+    }
+}

src/sdcard/mod.rs

@@ -408,7 +408,7 @@ where
             // Assert CS
             s.cs_low()?;
             // Enter SPI mode.
-            let mut delay = Delay::new_command();
+            let mut delay = Delay::new(s.options.acquire_retries);
             for attempts in 1.. {
                 trace!("Enter SPI mode, attempt: {}..", attempts);
                 match s.card_command(CMD0, 0) {
@@ -593,11 +593,18 @@ pub struct AcquireOpts {
     /// On by default because without it you might get silent data corruption on
     /// your card.
     pub use_crc: bool,
+
+    /// Sets the number of times we will retry to acquire the card before giving up and returning
+    /// `Err(Error::CardNotFound)`. By default, card acquisition will be retried 50 times.
+    pub acquire_retries: u32,
 }
 
 impl Default for AcquireOpts {
     fn default() -> Self {
-        AcquireOpts { use_crc: true }
+        AcquireOpts {
+            use_crc: true,
+            acquire_retries: 50,
+        }
     }
 }