PLDM File Transfer protocol implementation

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = [ "mctp-usb-embassy", "pldm-fw-cli", "standalone" ]
+members = [ "mctp-usb-embassy", "pldm-file", "pldm-fw-cli", "pldm-platform", "pldm-platform-util", "standalone" ]
 resolver = "2"
 
 [workspace.package]
@@ -13,6 +13,7 @@ argh = "0.1.12"
 chrono = { version = "0.4", default-features = false }
 crc = "3.0"
 defmt = "0.3"
+deku = { git = "https://github.com/CodeConstruct/deku.git", tag = "cc/deku-v0.19.1/no-alloc-3", default-features = false }
 embedded-io-adapters = { version = "0.6", features = ["std", "futures-03"] }
 embedded-io-async = "0.6"
 enumset = "1.1"
@@ -25,6 +26,7 @@ mctp = { version = "0.2", path = "mctp", default-features = false }
 num-derive = { version = "0.4", default-features = false }
 num-traits = { version = "0.2", default-features = false }
 pldm-fw = { version = "0.2", path = "pldm-fw", default-features = false }
+pldm-platform = { path = "pldm-platform", default-features = false }
 pldm = { version = "0.2", path = "pldm", default-features = false }
 proptest = "1.0.0"
 simplelog = "0.12"

ci/runtests.sh

@@ -22,11 +22,18 @@ cargo build --release
 cargo test
 
 # stable, no_std
-NOSTD_CRATES="mctp pldm pldm-fw"
+NOSTD_CRATES="mctp pldm pldm-fw pldm-platform pldm-file"
 for c in $NOSTD_CRATES; do
     (
     cd $c
-    cargo build --target thumbv7em-none-eabihf --no-default-features --release
+    cargo build --target thumbv7em-none-eabihf --no-default-features
+    )
+done
+ALLOC_CRATES="pldm pldm-platform pldm-file"
+for c in $ALLOC_CRATES; do
+    (
+    cd $c
+    cargo build --target thumbv7em-none-eabihf --no-default-features --features alloc
     )
 done
 

mctp-estack/src/control.rs

@@ -515,7 +515,7 @@ impl<'a> MctpControl<'a> {
                 let res = self.router.set_eid(eid).await;
                 let present_eid = self.router.get_eid().await;
 
-                if res.is_ok() && old != present_eid {
+                if res.is_ok() {
                     event = Some(ControlEvent::SetEndpointId {
                         old,
                         new: present_eid,
@@ -550,9 +550,12 @@ impl<'a> MctpControl<'a> {
 
 /// An MCTP control handler event
 pub enum ControlEvent {
-    /// Set Endpoint ID changed EID
+    /// Set Endpoint ID received.
+    ///
+    /// Note that the EID may be unchanged.
     SetEndpointId {
-        /// Previous EID
+        /// Previous EID.
+        ///
         old: Eid,
         /// New EID
         new: Eid,

mctp-estack/src/lib.rs

@@ -25,14 +25,18 @@
 //! `mctp-estack` uses fixed sizes to be suitable on no-alloc platforms.
 //! These can be configured at build time, see [`config`]
 
-#![cfg_attr(not(any(feature = "std", test)), no_std)]
+#![cfg_attr(not(feature = "std"), no_std)]
 #![forbid(unsafe_code)]
 #![allow(clippy::int_plus_one)]
 #![allow(clippy::too_many_arguments)]
 // defmt does not currently allow inline format arguments, so we don't want
 // those reworked when using the log crate either.
 #![allow(clippy::uninlined_format_args)]
 
+#[cfg(test)]
+#[macro_use]
+extern crate std;
+
 /// Re-exported so that callers can use the same `heapless` version.
 ///
 /// `heapless::Vec` is currently an argument of `send_fill()` in transports.
@@ -581,16 +585,21 @@ impl Stack {
         trace!("set flow {}", peer);
 
         if let Some(tv) = tag {
+            if flow_expires {
+                trace!("Can't specify a tag with tag_expires");
+                return Err(Error::BadArgument);
+            }
+
+            // Compare with any existing flow
             if let Some(f) = self.flows.get_mut(&(peer, tv)) {
-                if f.expiry_stamp.is_some() {
-                    // An Owned tag given to start_send() must have been initially created
-                    // tag_expires=false.
-                    trace!("Can't specify an owned tag that didn't have tag_expires=false");
+                if flow_expires != f.expiry_stamp.is_some() {
+                    trace!("varying slow_expires for flow");
                     return Err(Error::BadArgument);
                 }
 
                 if f.cookie != cookie {
-                    trace!("varying app for flow");
+                    trace!("varying cookie for flow");
+                    return Err(Error::BadArgument);
                 }
                 return Ok(tv);
             }