fmt code

Author: ZR233

usb-host/src/host/xhci/device.rs

@@ -155,7 +155,7 @@ impl usb_if::host::Device for Device {
     {
         async move {
             trace!("Claiming interface {interface}, alternate {alternate}");
-            self.set_interface(interface, alternate);
+            self.set_interface(interface, alternate).await?;
             let ep_map = self.set_interface(interface, alternate).await?;
             let desc = self.find_interface_desc(interface, alternate)?;
             let interface = Interface::new(desc, ep_map, self.ctrl_ep.clone());
@@ -583,31 +583,6 @@ impl Device {
         Err(USBError::NotFound)
     }
 
-    // pub async fn claim_interface(
-    //     &mut self,
-    //     interface: u8,
-    //     alternate: u8,
-    // ) -> Result<Interface, USBError> {
-    //     trace!("Claiming interface {interface}, alternate {alternate}");
-    //     let config = self.find_interface_config(interface)?;
-    //     self.set_configuration(config.configuration_value).await?;
-    //     let ep_map = self.set_interface(interface, alternate).await?;
-    //     let desc = self.find_interface_desc(interface, alternate)?;
-    //     let interface = Interface::new(desc, ep_map);
-    //     Ok(interface)
-    // }
-
-    fn find_interface_config(&self, interface: u8) -> Result<&ConfigurationDescriptor, USBError> {
-        for config in &self.config_desc {
-            for iface in &config.interfaces {
-                if iface.interface_number == interface {
-                    return Ok(config);
-                }
-            }
-        }
-        Err(USBError::NotFound)
-    }
-
     fn find_interface_desc(
         &self,
         interface: u8,

usb-host/src/host/xhci/endpoint.rs

@@ -1,15 +1,14 @@
-use alloc::{boxed::Box, string::ToString, sync::Arc, vec::Vec};
-use core::pin::Pin;
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
 
 use dma_api::{DSlice, DSliceMut};
 use futures::{FutureExt, future::BoxFuture};
-use log::{info, trace};
+use log::trace;
 use mbarrier::mb;
 use spin::Mutex;
 use usb_if::{
     descriptor::{self, EndpointDescriptor, EndpointType},
     err::TransferError,
-    host::{BoxTransfer, ControlSetup, ResultTransfer, Transfer},
+    host::{ControlSetup, ResultTransfer, Transfer},
     transfer::{BmRequestType, Direction},
 };
 use xhci::{

usb-host/src/host/xhci/interface.rs

@@ -49,7 +49,7 @@ impl Interface {
 }
 
 impl usb_if::host::Interface for Interface {
-    fn set_alt_setting(&mut self, alt_setting: u8) -> Result<(), USBError> {
+    fn set_alt_setting(&mut self, _alt_setting: u8) -> Result<(), USBError> {
         todo!()
     }
 

usb-host/src/host/xhci/mod.rs

@@ -7,7 +7,6 @@ use xhci::{
     ExtendedCapability,
     accessor::Mapper,
     extended_capabilities::{self, usb_legacy_support_capability::UsbLegacySupport},
-    ring::trb::{command, event::CommandCompletion},
 };
 
 mod context;
@@ -245,11 +244,6 @@ impl Xhci {
         max_slots
     }
 
-    async fn post_cmd(&mut self, trb: command::Allowed) -> Result<CommandCompletion> {
-        let res = self.root()?.post_cmd(trb).await?;
-        Ok(res)
-    }
-
     fn extended_capabilities(&self) -> Vec<ExtendedCapability<MemMapper>> {
         let hccparams1 = self.reg.capability.hccparams1.read_volatile();
         let mapper = MemMapper {};

usb-host/src/lib.rs

@@ -10,7 +10,6 @@ mod _macros;
 
 pub mod err;
 mod host;
-pub mod standard;
 mod sync;
 pub(crate) mod wait;