Reintroduce logging in the full-speed driver

Author: mciantyre

.gitignore

@@ -1,3 +1,4 @@
 /target
 Cargo.lock
-.vscode/
+.vscode/
+screenlog.*

examples/teensy4/Cargo.toml

@@ -10,7 +10,7 @@ publish = false  # This is an example package
 path = "../../"
 features = [
     "double-instance",  # Required to pair with imxrt-[hal|ral]/imxrt1062
-    # "__log"  # Only for driver development and debugging
+    "__log"  # Only for driver development and debugging
 ]
 
 # Supporting other hardware access, start-up
@@ -51,6 +51,7 @@ version = "0.2"
 # examples
 [dependencies.log]
 version = "0.4"
+features = ["release_max_level_info"]
 
 [[bin]]
 name = "configured"

src/full_speed/bus.rs

@@ -187,7 +187,6 @@ impl UsbBus for BusAdapter {
     fn set_device_address(&self, addr: u8) {
         self.with_usb_mut(|usb| {
             usb.set_address(addr);
-            debug!("ADDRESS {}", addr);
         });
     }
 
@@ -198,7 +197,6 @@ impl UsbBus for BusAdapter {
     fn reset(&self) {
         self.with_usb_mut(|usb| {
             usb.bus_reset();
-            debug!("RESET");
         });
     }
 
@@ -208,13 +206,6 @@ impl UsbBus for BusAdapter {
                 return Err(usb_device::UsbError::InvalidEndpoint);
             }
 
-            debug!(
-                "EP{} {:?} WRITE {}",
-                ep_addr.index(),
-                ep_addr.direction(),
-                buf.len()
-            );
-
             let written = if ep_addr.index() == 0 {
                 usb.ctrl0_write(buf)
             } else {
@@ -240,13 +231,6 @@ impl UsbBus for BusAdapter {
                 return Err(usb_device::UsbError::InvalidEndpoint);
             }
 
-            debug!(
-                "EP{} {:?} READ {}",
-                ep_addr.index(),
-                ep_addr.direction(),
-                buf.len()
-            );
-
             let read = if ep_addr.index() == 0 {
                 usb.ctrl0_read(buf)
             } else {

src/full_speed/driver.rs

@@ -120,6 +120,7 @@ impl FullSpeed {
         // See the "quirk" note in the UsbBus impl. We're using USBADRA to let
         // the hardware set the address before the status phase.
         ral::write_reg!(ral::usb, self.usb, DEVICEADDR, USBADR: address as u32, USBADRA: 1);
+        info!("ADDRESS {}", address);
     }
 
     pub fn attach(&mut self) {
@@ -144,6 +145,7 @@ impl FullSpeed {
             ral::read_reg!(ral::usb, self.usb, PORTSC1, PR == 1),
             "Took too long to handle bus reset"
         );
+        info!("RESET");
     }
 
     /// Check if the endpoint is valid
@@ -164,6 +166,7 @@ impl FullSpeed {
     pub fn ctrl0_read(&mut self, buffer: &mut [u8]) -> Result<usize, Status> {
         let ctrl_out = self.endpoints[0].as_mut().unwrap();
         if ctrl_out.has_setup(&self.usb) && buffer.len() >= 8 {
+            debug!("EP0 Out SETUP");
             let setup = ctrl_out.read_setup(&self.usb);
             buffer[..8].copy_from_slice(&setup.to_le_bytes());
 
@@ -180,6 +183,7 @@ impl FullSpeed {
             ctrl_out.clear_nack(&self.usb);
 
             let read = ctrl_out.read(buffer);
+            debug!("EP0 Out {}", read);
             let max_packet_len = ctrl_out.max_packet_len();
             ctrl_out.schedule_transfer(&self.usb, max_packet_len);
 
@@ -196,6 +200,7 @@ impl FullSpeed {
     /// Panics if EP0 IN isn't allocated, or if EP0 OUT isn't allocated.
     pub fn ctrl0_write(&mut self, buffer: &[u8]) -> Result<usize, Status> {
         let ctrl_in = self.endpoints[1].as_mut().unwrap();
+        debug!("EP1 In {}", buffer.len());
         ctrl_in.check_status()?;
 
         ctrl_in.clear_nack(&self.usb);
@@ -295,7 +300,8 @@ impl FullSpeed {
         let qh = self.qhs[index(addr)].take().unwrap();
         let td = self.tds[index(addr)].take().unwrap();
 
-        qh.set_max_packet_len(buffer.len());
+        let max_packet_size = buffer.len();
+        qh.set_max_packet_len(max_packet_size);
         qh.set_zero_length_termination(false);
         qh.set_interrupt_on_setup(
             EndpointType::Control == kind && addr.direction() == UsbDirection::Out,
@@ -307,6 +313,14 @@ impl FullSpeed {
         let mut ep = Endpoint::new(addr, qh, td, buffer);
         ep.initialize(&self.usb, kind);
         self.endpoints[index(addr)] = Some(ep);
+
+        info!(
+            "ALLOC EP{} {:?} {:?} {}",
+            addr.index(),
+            addr.direction(),
+            kind,
+            max_packet_size
+        );
     }
 
     /// Enable all non-zero endpoints, and schedule OUT transfers

src/log.rs

@@ -3,16 +3,32 @@
 //! Only enable `__log` when debugging, and when you're certain that your
 //! logger isn't using USB!
 
+#![allow(unused)]
+
+macro_rules! trace {
+    ($($args:tt)*) => {
+        #[cfg(feature = "__log")]
+        ::__log::trace!(target: "", $($args)*)
+    };
+}
+
 macro_rules! debug {
     ($($args:tt)*) => {
         #[cfg(feature = "__log")]
-        ::__log::debug!($($args)*)
+        ::__log::debug!(target: "", $($args)*)
+    };
+}
+
+macro_rules! info {
+    ($($args:tt)*) => {
+        #[cfg(feature = "__log")]
+        ::__log::info!(target: "", $($args)*)
     };
 }
 
 macro_rules! warn {
     ($($args:tt)*) => {
         #[cfg(feature = "__log")]
-        ::__log::warn!($($args)*)
+        ::__log::warn!(target: "", $($args)*)
     };
 }