itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-09-30 13:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

otg: improve trace logging, print bytes as hex.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2024-11-23 00:13:15 +01:00
parent 1ca53e286b
commit 4f459bb918
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embassy-stm32/src/usb/otg.rs
View File

@ -24,7 +24,6 @@ pub struct InterruptHandler<T: Instance> {
impl<T: Instance> interrupt::typelevel::Handler<T::Interrupt> for InterruptHandler<T> { impl<T: Instance> interrupt::typelevel::Handler<T::Interrupt> for InterruptHandler<T> {
unsafe fn on_interrupt() { unsafe fn on_interrupt() {
trace!("irq");
let r = T::regs(); let r = T::regs();
let state = T::state(); let state = T::state();

12
embassy-usb-synopsys-otg/src/lib.rs
View File

@ -18,6 +18,8 @@ use embassy_usb_driver::{
EndpointType, Event, Unsupported, EndpointType, Event, Unsupported,
}; };
use crate::fmt::Bytes;
pub mod otg_v1; pub mod otg_v1;
use otg_v1::{regs, vals, Otg}; use otg_v1::{regs, vals, Otg};
@ -29,6 +31,8 @@ pub unsafe fn on_interrupt<const MAX_EP_COUNT: usize>(
ep_count: usize, ep_count: usize,
quirk_setup_late_cnak: bool, quirk_setup_late_cnak: bool,
) { ) {
trace!("irq");
let ints = r.gintsts().read(); let ints = r.gintsts().read();
if ints.wkupint() || ints.usbsusp() || ints.usbrst() || ints.enumdne() || ints.otgint() || ints.srqint() { if ints.wkupint() || ints.usbsusp() || ints.usbrst() || ints.enumdne() || ints.otgint() || ints.srqint() {
// Mask interrupts and notify `Bus` to process them // Mask interrupts and notify `Bus` to process them
@ -1126,7 +1130,7 @@ impl<'d> embassy_usb_driver::EndpointOut for Endpoint<'d, Out> {
impl<'d> embassy_usb_driver::EndpointIn for Endpoint<'d, In> { impl<'d> embassy_usb_driver::EndpointIn for Endpoint<'d, In> {
async fn write(&mut self, buf: &[u8]) -> Result<(), EndpointError> { async fn write(&mut self, buf: &[u8]) -> Result<(), EndpointError> {
trace!("write ep={:?} data={:?}", self.info.addr, buf); trace!("write ep={:?} data={:?}", self.info.addr, Bytes(buf));
if buf.len() > self.info.max_packet_size as usize { if buf.len() > self.info.max_packet_size as usize {
return Err(EndpointError::BufferOverflow); return Err(EndpointError::BufferOverflow);
@ -1267,7 +1271,7 @@ impl<'d> embassy_usb_driver::ControlPipe for ControlPipe<'d> {
.modify(|w| w.set_cnak(true)); .modify(|w| w.set_cnak(true));
} }
trace!("SETUP received: {:?}", data); trace!("SETUP received: {:?}", Bytes(&data));
Poll::Ready(data) Poll::Ready(data)
} else { } else {
trace!("SETUP waiting"); trace!("SETUP waiting");
@ -1280,12 +1284,12 @@ impl<'d> embassy_usb_driver::ControlPipe for ControlPipe<'d> {
async fn data_out(&mut self, buf: &mut [u8], _first: bool, _last: bool) -> Result<usize, EndpointError> { async fn data_out(&mut self, buf: &mut [u8], _first: bool, _last: bool) -> Result<usize, EndpointError> {
trace!("control: data_out"); trace!("control: data_out");
let len = self.ep_out.read(buf).await?; let len = self.ep_out.read(buf).await?;
trace!("control: data_out read: {:?}", &buf[..len]); trace!("control: data_out read: {:?}", Bytes(&buf[..len]));
Ok(len) Ok(len)
} }
async fn data_in(&mut self, data: &[u8], _first: bool, last: bool) -> Result<(), EndpointError> { async fn data_in(&mut self, data: &[u8], _first: bool, last: bool) -> Result<(), EndpointError> {
trace!("control: data_in write: {:?}", data); trace!("control: data_in write: {:?}", Bytes(data));
self.ep_in.write(data).await?; self.ep_in.write(data).await?;
// wait for status response from host after sending the last packet // wait for status response from host after sending the last packet