usb: abort control data in/out on reset or when receiving another SETUP.

This removes the horrible timeout hack.

2 files changed, 8 insertions, 2 deletions

diff --git a/embassy-usb/src/control.rs b/embassy-usb/src/control.rs
index b15ba4463..7c46812bd 100644
--- a/embassy-usb/src/control.rs
+++ b/embassy-usb/src/control.rs
@@ -295,7 +295,13 @@ impl<C: driver::ControlPipe> ControlPipe<C> {
             .chain(need_zlp.then(|| -> &[u8] { &[] }));
 
         while let Some(chunk) = chunks.next() {
-            self.control.data_in(chunk, chunks.size_hint().0 == 0).await;
+            match self.control.data_in(chunk, chunks.size_hint().0 == 0).await {
+                Ok(()) => {}
+                Err(e) => {
+                    warn!("control accept_in failed: {:?}", e);
+                    return;
+                }
+            }
         }
     }
 
diff --git a/embassy-usb/src/driver.rs b/embassy-usb/src/driver.rs
index 6eaa40b0d..d3231cb45 100644
--- a/embassy-usb/src/driver.rs
+++ b/embassy-usb/src/driver.rs
@@ -147,7 +147,7 @@ pub trait ControlPipe {
     type DataOutFuture<'a>: Future<Output = Result<usize, ReadError>> + 'a
     where
         Self: 'a;
-    type DataInFuture<'a>: Future<Output = ()> + 'a
+    type DataInFuture<'a>: Future<Output = Result<(), WriteError>> + 'a
     where
         Self: 'a;