diff --git a/services/usb-device-xous/src/api.rs b/services/usb-device-xous/src/api.rs index a8f192af1..77399ea6e 100644 --- a/services/usb-device-xous/src/api.rs +++ b/services/usb-device-xous/src/api.rs @@ -90,7 +90,7 @@ pub(crate) enum Opcode { } // The log crate depends on this API not changing. -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct UsbString { pub s: String, pub sent: Option, @@ -149,9 +149,9 @@ impl TryFrom for UsbDeviceType { pub const SERIAL_ASCII_BUFLEN: usize = 512; pub const SERIAL_BINARY_BUFLEN: usize = 128; -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct UsbSerialAscii { - pub s: String, + pub s: String, pub delimiter: Option, } @@ -183,7 +183,7 @@ pub struct HIDReportMessage { } /// this structure is used to register a USB listener. -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub(crate) struct UsbListenerRegistration { pub server_name: String, pub listener_op_id: usize, diff --git a/services/usb-device-xous/src/lib.rs b/services/usb-device-xous/src/lib.rs index fd91edb7d..410d4b45e 100644 --- a/services/usb-device-xous/src/lib.rs +++ b/services/usb-device-xous/src/lib.rs @@ -7,6 +7,7 @@ pub mod api; pub use api::*; use num_traits::*; use packed_struct::PackedStruct; +use rkyv::option::ArchivedOption; use trng::api::TrngTestMode; pub use usb_device::device::UsbDeviceState; use xous::{send_message, Message, CID}; @@ -319,7 +320,7 @@ impl UsbHid { .or(Err(xous::Error::InternalError)) .expect("Internal error"); let resp = buf.to_original::().unwrap(); - resp.s.to_str().to_string() + resp.s } /// Blocks until enough binary data has been received to fill the buffer @@ -375,10 +376,8 @@ impl UsbHid { } pub fn register_u2f_observer(&self, server_name: &str, action_opcode: usize) { - let kr = UsbListenerRegistration { - server_name: String::from(server_name), - listener_op_id: action_opcode, - }; + let kr = + UsbListenerRegistration { server_name: String::from(server_name), listener_op_id: action_opcode }; let buf = Buffer::into_buf(kr).unwrap(); buf.lend(self.conn, Opcode::RegisterUsbObserver.to_u32().unwrap()) .expect("couldn't register listener"); @@ -428,7 +427,7 @@ impl UsbHid { let report = buf.as_flat::().unwrap(); match &report.data { - rkyv::core_impl::ArchivedOption::Some(data) => { + ArchivedOption::Some(data) => { let mut ret = HIDReport::default(); for (&s, d) in data.0[..data.0.len() as usize].iter().zip(ret.0.iter_mut()) { @@ -437,7 +436,7 @@ impl UsbHid { Ok(ret) } - rkyv::core_impl::ArchivedOption::None => Err(xous::Error::UnknownError), + ArchivedOption::None => Err(xous::Error::UnknownError), } }