Last merge of 9e and openprot branches.

Author: CourtneyDrant

Cargo.lock

@@ -2,8 +2,25 @@
 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",
+    "pldm-interface"
+]
+
+[workspace.package]
+version = "0.1.0"
+authors = ["Caliptra contributors", "OpenPRoT contributors"]
+edition = "2021"
+
+[workspace.dependencies]
+pldm-common = { path = "pldm-common" }
+pldm-interface = { path = "pldm-interface" }
 bitfield = "0.14.0"
+zerocopy = { version = "0.8.17", features = ["derive"] }
+
+[dependencies]
+pldm-common.workspace = true
+pldm-interface.workspace = true

Cargo.toml

@@ -1,6 +1,12 @@
+# Licensed under the Apache-2.0 license
+
 [package]
 name = "pldm-common"
-version = "0.1.0"
-edition = "2024"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 
 [dependencies]
+zerocopy.workspace = true
+bitfield.workspace = true
+

pldm-common/Cargo.toml

@@ -1,14 +1,21 @@
-pub fn add(left: u64, right: u64) -> u64 {
-    left + right
-}
+// Copyright 2025
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-#[cfg(test)]
-mod tests {
-    use super::*;
+#![no_std]
 
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
+pub mod codec;
+pub mod error;
+pub mod message;
+pub mod protocol;
+pub mod util;

src/codec.rs pldm-common/src/codec.rssrc/codec.rs renamed to pldm-common/src/codec.rs

@@ -14,8 +14,8 @@
 
 use crate::error::PldmError;
 use crate::protocol::base::{
-    InstanceId, PLDM_MSG_HEADER_LEN, PldmControlCmd, PldmMsgHeader, PldmMsgType, PldmSupportedType,
-    TransferOperationFlag, TransferRespFlag,
+    InstanceId, PldmControlCmd, PldmMsgHeader, PldmMsgType, PldmSupportedType,
+    TransferOperationFlag, TransferRespFlag, PLDM_MSG_HEADER_LEN,
 };
 use crate::protocol::version::{PldmVersion, ProtocolVersionStr, Ver32};
 use zerocopy::{FromBytes, Immutable, IntoBytes};

src/error.rs pldm-common/src/error.rssrc/error.rs renamed to pldm-common/src/error.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::protocol::base::{
-    InstanceId, PLDM_MSG_HEADER_LEN, PldmMsgHeader, PldmMsgType, PldmSupportedType,
+    InstanceId, PldmMsgHeader, PldmMsgType, PldmSupportedType, PLDM_MSG_HEADER_LEN,
 };
 use crate::protocol::firmware_update::FwUpdateCmd;
 use zerocopy::{FromBytes, Immutable, IntoBytes};

pldm-common/src/lib.rs

@@ -14,7 +14,7 @@
 
 use crate::error::PldmError;
 use crate::protocol::base::{
-    InstanceId, PLDM_MSG_HEADER_LEN, PldmMsgHeader, PldmMsgType, PldmSupportedType,
+    InstanceId, PldmMsgHeader, PldmMsgType, PldmSupportedType, PLDM_MSG_HEADER_LEN,
 };
 use crate::protocol::firmware_update::{ComponentActivationMethods, FwUpdateCmd};
 use zerocopy::{FromBytes, Immutable, IntoBytes};

src/message/control.rs pldm-common/src/message/control.rssrc/message/control.rs renamed to pldm-common/src/message/control.rs

@@ -14,11 +14,11 @@
 
 use crate::codec::{PldmCodec, PldmCodecError};
 use crate::protocol::base::{
-    InstanceId, PLDM_MSG_HEADER_LEN, PldmMsgHeader, PldmMsgType, PldmSupportedType,
+    InstanceId, PldmMsgHeader, PldmMsgType, PldmSupportedType, PLDM_MSG_HEADER_LEN,
 };
 use crate::protocol::firmware_update::{
-    ComponentParameterEntry, FirmwareDeviceCapability, FwUpdateCmd, MAX_COMPONENT_COUNT,
-    PLDM_FWUP_IMAGE_SET_VER_STR_MAX_LEN, PldmFirmwareString,
+    ComponentParameterEntry, FirmwareDeviceCapability, FwUpdateCmd, PldmFirmwareString,
+    MAX_COMPONENT_COUNT, PLDM_FWUP_IMAGE_SET_VER_STR_MAX_LEN,
 };
 use zerocopy::{FromBytes, Immutable, IntoBytes};