move shared code for blocking & async to new module

src/common/filesystem/mod.rs

@@ -0,0 +1,3 @@
+pub(crate) mod attributes;
+pub(crate) mod cluster;
+pub(crate) mod timestamp;

src/common/mod.rs

@@ -0,0 +1,4 @@
+//! Common modules that have no difference between blocking and asynchronous code
+
+pub(crate) mod filesystem;
+pub(crate) mod sdcard;

src/common/sdcard/mod.rs

@@ -0,0 +1 @@
+pub mod proto;

src/inner/filesystem/mod.rs

@@ -6,21 +6,18 @@
 /// Maximum file size supported by this library
 pub const MAX_FILE_SIZE: u32 = u32::MAX;
 
-mod attributes;
-mod cluster;
 mod directory;
 mod filename;
 mod files;
 mod handles;
-mod timestamp;
 
-pub use self::attributes::Attributes;
-pub use self::cluster::ClusterId;
+pub use crate::common::filesystem::attributes::Attributes;
+pub use crate::common::filesystem::cluster::ClusterId;
 pub use self::directory::{DirEntry, Directory, RawDirectory};
 pub use self::filename::{FilenameError, LfnBuffer, ShortFileName, ToShortFileName};
 pub use self::files::{File, FileError, Mode, RawFile};
 pub use self::handles::{Handle, HandleGenerator};
-pub use self::timestamp::{TimeSource, Timestamp};
+pub use crate::common::filesystem::timestamp::{TimeSource, Timestamp};
 
 pub(crate) use self::directory::DirectoryInfo;
 pub(crate) use self::files::FileInfo;

src/inner/sdcard/mod.rs

@@ -3,7 +3,7 @@
 //! This is currently optimised for readability and debugability, not
 //! performance.
 
-pub mod proto;
+pub use crate::common::sdcard::proto;
 
 use super::super::{bisync, DelayNs, SpiDevice};
 

src/lib.rs

@@ -86,6 +86,8 @@ extern crate hex_literal;
 #[macro_use]
 mod structure;
 
+mod common;
+
 /// Blocking implementation of this crate. Uses traits from embedded_hal & embedded_io crates.
 #[path = "."]
 pub mod blocking {