diff --git a/services/usb-device-xous/src/hw.rs b/services/usb-device-xous/src/hw.rs index 63e9b8b5f..d4560404a 100644 --- a/services/usb-device-xous/src/hw.rs +++ b/services/usb-device-xous/src/hw.rs @@ -55,12 +55,12 @@ impl SpinalUsbMgmt { assert!(4096 == self.regs.ramsize(), "hardware ramsize parameter does not match our expectations"); } pub fn connect_device_core(&mut self, state: bool) { - log::info!("previous state: {}", self.csr.rf(utra::usbdev::USBSELECT_USBSELECT)); + log::trace!("previous state: {}", self.csr.rf(utra::usbdev::USBSELECT_USBSELECT)); if state { - log::info!("connecting USB device core"); + log::trace!("connecting USB device core"); self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 1); } else { - log::info!("connecting USB debug core"); + log::trace!("connecting USB debug core"); self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 0); } } @@ -773,8 +773,8 @@ impl UsbBus for SpinalUsbDevice { //log::info!("ep{} read: {:x?} (len {} into buf of {})", ep_addr.index(), &buf[..len], len, buf.len()); let epcheck = self.status_read_volatile(ep_addr.index()); let descheck = self.descriptor_from_status(&epcheck); - log::info!("RD status{} [{:x}]: {:?}", ep_addr.index(), epcheck.0, epcheck); - log::info!("RD desc{} [{:x},{:x},{:x}]: {:?}", ep_addr.index(), descheck.read(0), descheck.read(1), descheck.read(2), descheck); + log::debug!("RD status{} [{:x}]: {:?}", ep_addr.index(), epcheck.0, epcheck); + log::debug!("RD desc{} [{:x},{:x},{:x}]: {:?}", ep_addr.index(), descheck.read(0), descheck.read(1), descheck.read(2), descheck); #[cfg(feature="mjolnir")] if ep_addr.index() == 2 { // mjolnir should be use selectively on EPs that require debugging, lest the weilder be overwhelmed by its spew. self.ll_debug(); @@ -895,13 +895,13 @@ impl UsbBus for SpinalUsbDevice { if false { // full low-level readback if bit != 0 { - log::info!("status{}: {:?}", bit, self.status_read_volatile(bit)); - log::info!("desc{}: {:?}", bit, self.descriptor_from_status(&self.status_read_volatile(bit))); + log::debug!("status{}: {:?}", bit, self.status_read_volatile(bit)); + log::debug!("desc{}: {:?}", bit, self.descriptor_from_status(&self.status_read_volatile(bit))); } } else { // as processed if bit != 0 { - log::info!("PL status{}: {:?}", bit, ep_status); - log::info!("PL desc{}: {:?}", bit, descriptor); + log::debug!("PL status{}: {:?}", bit, ep_status); + log::debug!("PL desc{}: {:?}", bit, descriptor); } } } diff --git a/services/usb-device-xous/src/main.rs b/services/usb-device-xous/src/main.rs index 26101555f..b6274dd20 100644 --- a/services/usb-device-xous/src/main.rs +++ b/services/usb-device-xous/src/main.rs @@ -201,7 +201,7 @@ fn main() -> ! { if fido_listener_pid == msg.sender.pid() { // preferentially pull from the rx queue if it has elements if let Some(data) = fido_rx_queue.pop_front() { - log::info!("returning queued data: {:?}", &data); + log::debug!("no deferral: ret queued data: {:?} queue len: {}", &data[..8], fido_rx_queue.len() + 1); let mut response = unsafe { Buffer::from_memory_message_mut(msg.body.memory_message_mut().unwrap()) }; @@ -214,7 +214,7 @@ fn main() -> ! { { let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let u2f_ipc = buffer.to_original::().unwrap(); - log::info!("registering listener: {:?}", u2f_ipc); + log::trace!("registering deferred listener"); } fido_listener = Some(msg); } @@ -240,7 +240,7 @@ fn main() -> ! { let u2f = composite.interface::, _>(); #[cfg(any(target_os = "none", target_os = "xous"))] u2f.write_report(&u2f_msg).ok(); - log::info!("sent U2F packet {:x?}", u2f_ipc.data); + log::debug!("sent U2F packet {:x?}", u2f_ipc.data); u2f_ipc.code = U2fCode::TxAck; } else { u2f_ipc.code = U2fCode::Denied; @@ -263,7 +263,6 @@ fn main() -> ! { let u2f = composite.interface::, _>(); match u2f.read_report() { Ok(u2f_report) => { - log::info!("got U2F packet {:x?}", u2f_report); if let Some(mut listener) = fido_listener.take() { let mut response = unsafe { Buffer::from_memory_message_mut(listener.body.memory_message_mut().unwrap()) @@ -271,6 +270,7 @@ fn main() -> ! { let mut buf = response.to_original::().unwrap(); assert_eq!(buf.code, U2fCode::RxWait, "Expected U2fcode::RxWait in wrapper"); buf.data.copy_from_slice(&u2f_report.packet); + log::trace!("ret deferred data {:x?}", &u2f_report.packet[..8]); buf.code = U2fCode::RxAck; response.replace(buf).unwrap(); } else {