From e68fde8e2b5d5f60270606335c64e59818574093 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 23 Sep 2024 22:42:24 +0800 Subject: [PATCH] update to use new flat-ipc API --- Cargo.lock | 2 +- services/trng/src/lib.rs | 4 +--- services/trng/src/main.rs | 8 ++------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0d7d8c90..eb43295e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1898,7 +1898,7 @@ dependencies = [ [[package]] name = "flatipc-derive" -version = "0.1.0" +version = "0.1.2" dependencies = [ "proc-macro2", "quote", diff --git a/services/trng/src/lib.rs b/services/trng/src/lib.rs index 82d1e924c..c7fa7bfa3 100644 --- a/services/trng/src/lib.rs +++ b/services/trng/src/lib.rs @@ -72,9 +72,7 @@ impl Trng { if buf.len as usize != data.len() { return Err(xous::Error::InternalError); } - for (&src, dst) in buf.data.iter().zip(data.iter_mut()) { - *dst = src; - } + data.copy_from_slice(&buf.data[..data.len()]); Ok(()) } diff --git a/services/trng/src/main.rs b/services/trng/src/main.rs index 99e11952c..0c42cb951 100644 --- a/services/trng/src/main.rs +++ b/services/trng/src/main.rs @@ -698,12 +698,8 @@ fn main() -> ! { } Some(api::Opcode::FillTrng) => { let mm = msg.body.memory_message_mut().unwrap(); - // safety: the slice is `u8` and all values are representable - let buffer = trng::api::IpcTrngBuf::from_slice_mut( - unsafe { mm.buf.as_slice_mut() }, - mm.offset.unwrap().get(), - ) - .expect("couldn't unpack FillTrng buffer"); + let buffer = trng::api::IpcTrngBuf::from_memory_message_mut(mm) + .expect("couldn't unpack FillTrng buffer"); trng.get_buf(buffer); } Some(api::Opcode::TestSetMode) => xous::msg_blocking_scalar_unpack!(msg, mode_code, _, _, _, {