diff --git a/services/usb-device-xous/src/api.rs b/services/usb-device-xous/src/api.rs index ad571da64..f73440393 100644 --- a/services/usb-device-xous/src/api.rs +++ b/services/usb-device-xous/src/api.rs @@ -174,6 +174,5 @@ impl Default for HIDReport { #[derive(Debug, Default, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] pub struct HIDReportMessage { - pub data: HIDReport, - pub has_data: bool, + pub data: Option, } \ No newline at end of file diff --git a/services/usb-device-xous/src/main_hw.rs b/services/usb-device-xous/src/main_hw.rs index b8045b362..abca01897 100644 --- a/services/usb-device-xous/src/main_hw.rs +++ b/services/usb-device-xous/src/main_hw.rs @@ -1463,7 +1463,9 @@ pub(crate) fn main_hw() -> ! { }; let data = buffer.to_original::().unwrap(); - // TODO(gsora): do something with the error + // This branch can only error if data.descriptor is longer than the + // expected maximum. + // The userland library checks this for us already. match hidv2.set_device_report(Vec::from(&data.descriptor[..data.len])) { Ok(_) => (), Err(error) => { @@ -1472,31 +1474,24 @@ pub(crate) fn main_hw() -> ! { } } Some(Opcode::HIDUnsetDescriptor) => { - // TODO(gsora): do something with the error match hidv2.reset_device_report() { Ok(_) => (), Err(error) => log::error!("cannot reset hidv2 device report: {:?}", error), } } Some(Opcode::HIDReadReport) => { + if !hidv2.descriptor_set() { + log::warn!("trying to read a HID report with no descriptor set!"); + continue + } + let mut buffer = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; let mut data = buffer.to_original::().unwrap(); - if !hidv2.descriptor_set() { - buffer.replace(HIDReportMessage::default()).expect("couldn't serialize return"); - continue - } else { - match hidv2.read_report() { - Some(report) => { - data.data = report; - data.has_data = true; - } - _ => () - } - } + data.data = hidv2.read_report(); buffer.replace(data).expect("couldn't serialize return"); },