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

Make Driver::disable async and fix comment

Browse Source
This commit is contained in:
alexmoon 2022-04-12 17:51:50 -04:00
parent 7fde3abd5d
commit 2915e858ba
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embassy-nrf/src/usb.rs
View File

@ -208,6 +208,7 @@ pub struct Bus<'d, T: Instance> {
impl<'d, T: Instance> driver::Bus for Bus<'d, T> {
type EnableFuture<'a> = impl Future<Output = ()> + 'a where Self: 'a;
type DisableFuture<'a> = impl Future<Output = ()> + 'a where Self: 'a;
type PollFuture<'a> = impl Future<Output = Event> + 'a where Self: 'a;
type RemoteWakeupFuture<'a> = impl Future<Output = Result<(), Unsupported>> + 'a where Self: 'a;
@ -248,10 +249,12 @@ impl<'d, T: Instance> driver::Bus for Bus<'d, T> {
}
}
fn disable(&mut self) {
fn disable(&mut self) -> Self::DisableFuture<'_> {
async move {
let regs = T::regs();
regs.enable.write(|x| x.enable().disabled());
}
}
fn poll<'a>(&'a mut self) -> Self::PollFuture<'a> {
poll_fn(move |cx| {

7
embassy-usb/src/driver.rs
View File

@ -57,6 +57,9 @@ pub trait Driver<'a> {
pub trait Bus {
type EnableFuture<'a>: Future<Output = ()> + 'a
where
Self: 'a;
type DisableFuture<'a>: Future<Output = ()> + 'a
where
Self: 'a;
type PollFuture<'a>: Future<Output = Event> + 'a
@ -71,7 +74,7 @@ pub trait Bus {
fn enable(&mut self) -> Self::EnableFuture<'_>;
/// Disables and powers down the USB peripheral.
fn disable(&mut self);
fn disable(&mut self) -> Self::DisableFuture<'_>;
fn poll<'a>(&'a mut self) -> Self::PollFuture<'a>;
@ -103,8 +106,6 @@ pub trait Bus {
/// Initiates a remote wakeup of the host by the device.
///
/// The default implementation just returns `Unsupported`.
///
/// # Errors
///
/// * [`Unsupported`](crate::UsbError::Unsupported) - This UsbBus implementation doesn't support

2
embassy-usb/src/lib.rs
View File

@ -198,7 +198,7 @@ impl<'d, D: Driver<'d>, M: RawMutex> UsbDevice<'d, D, M> {
DeviceCommand::Enable => warn!("usb: Enable command received while enabled."),
DeviceCommand::Disable => {
trace!("usb: disable");
self.bus.disable();
self.bus.disable().await;
self.device_state = UsbDeviceState::Disabled;
if let Some(h) = &self.handler {
h.disabled();