Add spi flash storage

Author: fangpenlin

src/config.rs

@@ -1,4 +1,3 @@
-use anyhow::Debug;
 use serde::Deserialize;
 use std::fmt::{Debug, Formatter};
 
@@ -40,10 +39,15 @@ struct Api {
 
 #[derive(Debug, Default, Deserialize)]
 struct Usb {
-    #[derivative(Default(value = "true"))]
     high_speed: bool,
 }
 
+impl Default for Usb {
+    fn default() -> Self {
+        Self { high_speed: true }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 struct Config {
     wifi: Wifi,

src/main.rs

@@ -2,6 +2,7 @@ mod api;
 mod usb;
 mod wifi;
 mod config;
+mod storage;
 
 use crate::api::processor::{process_events, DeviceInfo, DeviceInfoProducer};
 use crate::api::websocket::{ConnectionState, SessionEvent, WebSocketSession};

src/storage.rs

@@ -0,0 +1,2 @@
+pub mod spiflash;
+pub mod traits;

src/storage/spiflash.rs

@@ -0,0 +1,48 @@
+use anyhow::{bail, Context};
+use esp_idf_svc::partition::{EspPartition, EspWlPartition};
+
+#[derive(Debug, Clone)]
+pub struct SPIFlashConfig {
+    pub partition_label: String,
+    pub mount_path: String,
+}
+
+pub struct SPIFlashStorage {
+    config: SPIFlashConfig,
+    wl_partition: Option<EspWlPartition<EspPartition>>,
+}
+
+impl SPIFlashStorage {
+    pub fn new(config: &SPIFlashConfig) -> Self {
+        Self {
+            config: config.clone(),
+            wl_partition: None,
+        }
+    }
+
+    pub fn install(&mut self) -> anyhow::Result<()> {
+        if self.wl_partition.is_some() {
+            bail!("Already installed");
+        }
+        let partition = Some(
+            unsafe { EspPartition::new(&self.config.partition_label) }?.ok_or_else(|| {
+                anyhow::anyhow!(
+                    "Failed to find partition with label {:#?}",
+                    self.config.partition_label
+                )
+            })?,
+        );
+        self.wl_partition = Some(EspWlPartition::new(partition.unwrap()).with_context(|| {
+            format!(
+                "Failed to mount partition {} at {}",
+                self.config.partition_label, self.config.mount_path
+            )
+        })?);
+        log::info!(
+            "Mount SPI Flash storage with label {} at {}",
+            self.config.partition_label,
+            self.config.mount_path
+        );
+        Ok(())
+    }
+}

src/storage/traits.rs

@@ -0,0 +1 @@
+pub trait Storage {}

src/usb.rs

@@ -1 +1 @@
-pub mod msc_device;
+pub mod msc_device;

src/usb/msc_device.rs

@@ -80,10 +80,6 @@ impl MSCDevice {
         esp!(unsafe { tinyusb_msc_storage_init_spiflash(&config_spi) })
             .with_context(|| "Failed to initialize spiflash")?;
 
-        let base_path_c_str = CString::new(self.mount_path.as_bytes()).unwrap();
-        esp!(unsafe { tinyusb_msc_storage_mount(base_path_c_str.as_ptr()) })
-            .with_context(|| format!("Failed to mount storage at {}", self.mount_path))?;
-
         let mut tusb_cfg = tinyusb_config_t::default();
         if self.high_speed {
             // TODO:
@@ -93,7 +89,6 @@ impl MSCDevice {
 
         log::info!("TinyUSB driver installed.");
 
-        self.mount_path_c_str = base_path_c_str;
         self.wl_partition = wl_partition;
         Ok(())
     }