OpenPRoT · CourtneyDrant · Jul 17, 2025 · Sep 23, 2025 · Sep 30, 2025 · Oct 8, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,8 +2,22 @@
 name = "pldm-lib"
 version = "0.1.0"
 authors = ["Caliptra contributors", "OpenPRoT contributors"]
-edition = "2024"
+edition = "2021"
 
-[dependencies]
-zerocopy = {version = "0.8.17", features = ["derive"]}
+[workspace]
+members = [
+    "pldm-common" 
+]
+
+[workspace.package]
+version = "0.1.0"
+authors = ["Caliptra contributors", "OpenPRoT contributors"]
+edition = "2021"
+
+[workspace.dependencies]
+pldm-common = { path = "pldm-common" }
 bitfield = "0.14.0"
+zerocopy = { version = "0.8.17", features = ["derive"] }
+
+[dependencies]
+pldm-common.workspace = true
diff --git a/pldm-common/Cargo.toml b/pldm-common/Cargo.toml
@@ -0,0 +1,12 @@
+# Licensed under the Apache-2.0 license
+
+[package]
+name = "pldm-common"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
+[dependencies]
+zerocopy.workspace = true
+bitfield.workspace = true
+
diff --git a/src/codec.rs → pldm-common/src/codec.rs b/src/codec.rs → pldm-common/src/codec.rs
diff --git a/pldm-common/src/error.rs b/pldm-common/src/error.rs
@@ -0,0 +1,36 @@
+// Licensed under the Apache-2.0 license
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum PldmError {
+    InvalidData,
+    InvalidLength,
+    InvalidMsgType,
+    InvalidProtocolVersion,
+    UnsupportedCmd,
+    UnsupportedPldmType,
+    InvalidCompletionCode,
+    InvalidTransferOpFlag,
+    InvalidTransferRespFlag,
+
+    InvalidVersionStringType,
+    InvalidVersionStringLength,
+    InvalidFdState,
+    InvalidDescriptorType,
+    InvalidDescriptorLength,
+    InvalidDescriptorCount,
+    InvalidComponentClassification,
+    InvalidComponentResponseCode,
+    InvalidComponentCompatibilityResponse,
+    InvalidComponentCompatibilityResponseCode,
+    InvalidTransferResult,
+    InvalidVerifyResult,
+    InvalidApplyResult,
+    InvalidGetStatusReasonCode,
+    InvalidAuxStateStatus,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum UtilError {
+    InvalidMctpPayloadLength,
+    InvalidMctpMsgType,
+}
diff --git a/pldm-common/src/lib.rs b/pldm-common/src/lib.rs
@@ -0,0 +1,16 @@
+#![no_std]
+
+// Re-export core types for no_std compatibility
+pub use core::{
+    option::Option::{self, Some, None},
+    result::Result::{self, Ok, Err},
+};
+
+// Licensed under the Apache-2.0 license
+
+
+pub mod codec;
+pub mod error;
+pub mod message;
+pub mod protocol;
+pub mod util;
diff --git a/src/message/control.rs → pldm-common/src/message/control.rs b/src/message/control.rs → pldm-common/src/message/control.rs
diff --git a/src/message/firmware_update/activate_fw.rs → ...rc/message/firmware_update/activate_fw.rs b/src/message/firmware_update/activate_fw.rs → ...rc/message/firmware_update/activate_fw.rs
diff --git a/...message/firmware_update/apply_complete.rs → ...message/firmware_update/apply_complete.rs b/...message/firmware_update/apply_complete.rs → ...message/firmware_update/apply_complete.rs
diff --git a/src/message/firmware_update/get_fw_params.rs → .../message/firmware_update/get_fw_params.rs b/src/message/firmware_update/get_fw_params.rs → .../message/firmware_update/get_fw_params.rs
diff --git a/src/message/firmware_update/get_status.rs → ...src/message/firmware_update/get_status.rs b/src/message/firmware_update/get_status.rs → ...src/message/firmware_update/get_status.rs
diff --git a/src/message/firmware_update/mod.rs → ...common/src/message/firmware_update/mod.rs b/src/message/firmware_update/mod.rs → ...common/src/message/firmware_update/mod.rs
diff --git a/...message/firmware_update/pass_component.rs → ...message/firmware_update/pass_component.rs b/...message/firmware_update/pass_component.rs → ...message/firmware_update/pass_component.rs
diff --git a/src/message/firmware_update/query_devid.rs → ...rc/message/firmware_update/query_devid.rs b/src/message/firmware_update/query_devid.rs → ...rc/message/firmware_update/query_devid.rs
diff --git a/...message/firmware_update/request_cancel.rs → ...message/firmware_update/request_cancel.rs b/...message/firmware_update/request_cancel.rs → ...message/firmware_update/request_cancel.rs
diff --git a/...essage/firmware_update/request_fw_data.rs → ...essage/firmware_update/request_fw_data.rs b/...essage/firmware_update/request_fw_data.rs → ...essage/firmware_update/request_fw_data.rs
diff --git a/...message/firmware_update/request_update.rs → ...message/firmware_update/request_update.rs b/...message/firmware_update/request_update.rs → ...message/firmware_update/request_update.rs
diff --git a/...sage/firmware_update/transfer_complete.rs → ...sage/firmware_update/transfer_complete.rs b/...sage/firmware_update/transfer_complete.rs → ...sage/firmware_update/transfer_complete.rs
diff --git a/...ssage/firmware_update/update_component.rs → ...ssage/firmware_update/update_component.rs b/...ssage/firmware_update/update_component.rs → ...ssage/firmware_update/update_component.rs
diff --git a/...essage/firmware_update/verify_complete.rs → ...essage/firmware_update/verify_complete.rs b/...essage/firmware_update/verify_complete.rs → ...essage/firmware_update/verify_complete.rs
diff --git a/src/message/mod.rs → pldm-common/src/message/mod.rs b/src/message/mod.rs → pldm-common/src/message/mod.rs
diff --git a/src/protocol/base.rs → pldm-common/src/protocol/base.rs b/src/protocol/base.rs → pldm-common/src/protocol/base.rs
diff --git a/src/protocol/firmware_update.rs → pldm-common/src/protocol/firmware_update.rs b/src/protocol/firmware_update.rs → pldm-common/src/protocol/firmware_update.rs
@@ -268,7 +268,8 @@ pub fn get_descriptor_length(descriptor_type: DescriptorType) -> usize {
 }
 
 #[derive(Debug, Copy, Clone, PartialEq)]
-#[repr(C)]
+#[derive(FromBytes, IntoBytes)]
+//#[repr(C)]
 pub struct Descriptor {
     pub descriptor_type: u16,
     pub descriptor_length: u16,

diff --git a/src/protocol/mod.rs → pldm-common/src/protocol/mod.rs b/src/protocol/mod.rs → pldm-common/src/protocol/mod.rs
diff --git a/src/protocol/version.rs → pldm-common/src/protocol/version.rs b/src/protocol/version.rs → pldm-common/src/protocol/version.rs
diff --git a/src/util/fw_component.rs → pldm-common/src/util/fw_component.rs b/src/util/fw_component.rs → pldm-common/src/util/fw_component.rs
diff --git a/src/util/mctp_transport.rs → pldm-common/src/util/mctp_transport.rs b/src/util/mctp_transport.rs → pldm-common/src/util/mctp_transport.rs
diff --git a/src/util/mod.rs → pldm-common/src/util/mod.rs b/src/util/mod.rs → pldm-common/src/util/mod.rs
diff --git a/src/Cargo.toml b/src/Cargo.toml
@@ -0,0 +1,12 @@
+# Licensed under the Apache-2.0 license
+
+[package]
+name = "pldm-service"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
+[dependencies]
+zerocopy.workspace = true
+bitfield.workspace = true
+pldm-common.workspace = true