max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/usb_otg: implement endpoint wait_enabled

Browse Source
This commit is contained in:
chemicstry 2023-01-18 02:29:49 +02:00
parent 15e3f42b7c
commit d2f2b451d0
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
embassy-stm32/src/usb_otg/usb.rs
View File

@ -791,6 +791,9 @@ impl<'d, T: Instance> embassy_usb_driver::Bus for Bus<'d, T> {
w.set_usbaep(enabled); w.set_usbaep(enabled);
}) })
}); });
// Wake `Endpoint::wait_enabled()`
T::state().ep_out_wakers[ep_addr.index()].wake();
} }
Direction::In => { Direction::In => {
// SAFETY: DIEPCTL is shared with `Endpoint` so critical section is needed for RMW // SAFETY: DIEPCTL is shared with `Endpoint` so critical section is needed for RMW
@ -807,6 +810,9 @@ impl<'d, T: Instance> embassy_usb_driver::Bus for Bus<'d, T> {
w.set_usbaep(enabled); w.set_usbaep(enabled);
}) })
}); });
// Wake `Endpoint::wait_enabled()`
T::state().ep_in_wakers[ep_addr.index()].wake();
} }
} }
} }
@ -1031,7 +1037,21 @@ impl<'d, T: Instance> embassy_usb_driver::Endpoint for Endpoint<'d, T, In> {
&self.info &self.info
} }
async fn wait_enabled(&mut self) {} async fn wait_enabled(&mut self) {
poll_fn(|cx| {
let ep_index = self.info.addr.index();
T::state().ep_in_wakers[ep_index].register(cx.waker());
// SAFETY: atomic read without side effects
if unsafe { T::regs().diepctl(ep_index).read().usbaep() } {
Poll::Ready(())
} else {
Poll::Pending
}
})
.await
}
} }
impl<'d, T: Instance> embassy_usb_driver::Endpoint for Endpoint<'d, T, Out> { impl<'d, T: Instance> embassy_usb_driver::Endpoint for Endpoint<'d, T, Out> {
@ -1039,7 +1059,21 @@ impl<'d, T: Instance> embassy_usb_driver::Endpoint for Endpoint<'d, T, Out> {
&self.info &self.info
} }
async fn wait_enabled(&mut self) {} async fn wait_enabled(&mut self) {
poll_fn(|cx| {
let ep_index = self.info.addr.index();
T::state().ep_out_wakers[ep_index].register(cx.waker());
// SAFETY: atomic read without side effects
if unsafe { T::regs().doepctl(ep_index).read().usbaep() } {
Poll::Ready(())
} else {
Poll::Pending
}
})
.await
}
} }
impl<'d, T: Instance> embassy_usb_driver::EndpointOut for Endpoint<'d, T, Out> { impl<'d, T: Instance> embassy_usb_driver::EndpointOut for Endpoint<'d, T, Out> {