Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ cortex-m-rt = "0.7.5"
critical-section = "1.1"
defmt = "0.3"
embassy-futures = "0.1.2"
embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" }
embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt", tag = "v0.1.0" }
embassy-sync = "0.8"
embassy-time = "0.5.1"
embassy-time-driver = "0.2.2"
embedded-batteries-async = "0.3"
embedded-cfu-protocol = { git = "https://github.com/OpenDevicePartnership/embedded-cfu" }
embedded-cfu-protocol = { git = "https://github.com/OpenDevicePartnership/embedded-cfu", tag = "v0.1.0" }
embedded-hal = "1.0"
embedded-hal-async = "1.0"
embedded-services = { path = "./embedded-service" }
embedded-storage-async = "0.4.1"
embedded-usb-pd = { git = "https://github.com/OpenDevicePartnership/embedded-usb-pd", default-features = false }
mctp-rs = { git = "https://github.com/dymk/mctp-rs" }
embedded-usb-pd = { git = "https://github.com/OpenDevicePartnership/embedded-usb-pd", tag = "v0.1.0" , default-features = false }
mctp-rs = { git = "https://github.com/OpenDevicePartnership/mctp-rs", tag = "v0.1.0" }
Comment thread
jerrysxie marked this conversation as resolved.
num_enum = { version = "0.7.5", default-features = false }
portable-atomic = { version = "1.11", default-features = false }
heapless = "0.9.2"
Expand All @@ -78,6 +78,6 @@ serde = { version = "1.0.*", default-features = false }
static_cell = "2.1.0"
toml = { version = "0.8", default-features = false }
syn = "2.0"
tps6699x = { git = "https://github.com/OpenDevicePartnership/tps6699x" }
tps6699x = { git = "https://github.com/OpenDevicePartnership/tps6699x", tag = "v0.1.0" }
tokio = { version = "1.42.0" }
uuid = { version = "=1.17.0", default-features = false }
22 changes: 17 additions & 5 deletions embedded-service/src/ec_type/protocols/mctp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,10 @@ mod tests {

#[allow(dead_code)]
mod test_util {
use mctp_rs::{MctpMedium, MctpMediumFrame, MctpPacketError, error::MctpPacketResult};
use mctp_rs::{
EncodingDecoder, EncodingEncoder, MctpMedium, MctpMediumFrame, MctpPacketError, PassthroughEncoding,
error::MctpPacketResult,
};

#[derive(Debug, PartialEq, Eq, Copy, Clone)]
pub struct TestMedium {
Expand Down Expand Up @@ -1235,8 +1238,12 @@ mod tests {
type Frame = TestMediumFrame;
type Error = &'static str;
type ReplyContext = ();
type Encoding = PassthroughEncoding;

fn deserialize<'buf>(&self, packet: &'buf [u8]) -> MctpPacketResult<(Self::Frame, &'buf [u8]), Self> {
fn deserialize<'buf>(
&self,
packet: &'buf [u8],
) -> MctpPacketResult<(Self::Frame, EncodingDecoder<'buf, Self::Encoding>), Self> {
let packet_len = packet.len();

// check that header / trailer is present and correct
Expand All @@ -1251,7 +1258,7 @@ mod tests {
}

let packet = &packet[self.header.len()..packet_len - self.trailer.len()];
Ok((TestMediumFrame(packet_len), packet))
Ok((TestMediumFrame(packet_len), EncodingDecoder::new(packet)))
}
fn max_message_body_size(&self) -> usize {
self.mtu
Expand All @@ -1263,7 +1270,7 @@ mod tests {
message_writer: F,
) -> MctpPacketResult<&'buf [u8], Self>
where
F: for<'a> FnOnce(&'a mut [u8]) -> MctpPacketResult<usize, Self>,
F: for<'a> FnOnce(&mut EncodingEncoder<'a, Self::Encoding>) -> MctpPacketResult<(), Self>,
{
let header_len = self.header.len();
let trailer_len = self.trailer.len();
Expand All @@ -1281,7 +1288,12 @@ mod tests {
let max_message_size = max_packet_size - header_len - trailer_len;

buffer[0..header_len].copy_from_slice(self.header);
let size = message_writer(&mut buffer[header_len..header_len + max_message_size])?;
let size = {
let body_buf = &mut buffer[header_len..header_len + max_message_size];
let mut encoder = EncodingEncoder::<Self::Encoding>::new(body_buf);
message_writer(&mut encoder)?;
encoder.wire_position()
};
let len = header_len + size;
buffer[len..len + trailer_len].copy_from_slice(self.trailer);
Ok(&buffer[..len + trailer_len])
Expand Down
Loading
Loading