From 211f3357b7dcc3a3ff1c956f053917c3c69c5ec3 Mon Sep 17 00:00:00 2001 From: Ben Schattinger Date: Tue, 26 Dec 2023 18:22:54 -0500 Subject: [PATCH 1/2] stm32: USB IN endpoints use IN wakers fixes #2360 --- embassy-stm32/src/usb/usb.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embassy-stm32/src/usb/usb.rs b/embassy-stm32/src/usb/usb.rs index a8aebfe1f..39538beb7 100644 --- a/embassy-stm32/src/usb/usb.rs +++ b/embassy-stm32/src/usb/usb.rs @@ -704,7 +704,7 @@ impl<'d, T: Instance> driver::Endpoint for Endpoint<'d, T, In> { trace!("wait_enabled OUT WAITING"); let index = self.info.addr.index(); poll_fn(|cx| { - EP_OUT_WAKERS[index].register(cx.waker()); + EP_IN_WAKERS[index].register(cx.waker()); let regs = T::regs(); if regs.epr(index).read().stat_tx() == Stat::DISABLED { Poll::Pending From 87b23f9037aedb4720ded089d481de1696d91e26 Mon Sep 17 00:00:00 2001 From: Ben Schattinger Date: Tue, 26 Dec 2023 18:26:01 -0500 Subject: [PATCH 2/2] stm32: fix USB wait_enabled IN messages --- embassy-stm32/src/usb/usb.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/embassy-stm32/src/usb/usb.rs b/embassy-stm32/src/usb/usb.rs index 39538beb7..04b1b35e8 100644 --- a/embassy-stm32/src/usb/usb.rs +++ b/embassy-stm32/src/usb/usb.rs @@ -701,7 +701,7 @@ impl<'d, T: Instance> driver::Endpoint for Endpoint<'d, T, In> { } async fn wait_enabled(&mut self) { - trace!("wait_enabled OUT WAITING"); + trace!("wait_enabled IN WAITING"); let index = self.info.addr.index(); poll_fn(|cx| { EP_IN_WAKERS[index].register(cx.waker()); @@ -713,7 +713,7 @@ impl<'d, T: Instance> driver::Endpoint for Endpoint<'d, T, In> { } }) .await; - trace!("wait_enabled OUT OK"); + trace!("wait_enabled IN OK"); } }