diff options
author | alexmoon <alex.r.moon@gmail.com> | 2022-04-13 16:04:31 -0400 |
---|---|---|
committer | alexmoon <alex.r.moon@gmail.com> | 2022-04-13 16:04:31 -0400 |
commit | b0725c14d36cb9c508cb9fcec5b92ca9e0148583 (patch) | |
tree | 1faa806fdba3ee023b4a5f31b3065aff5c9d51c8 /embassy-usb | |
parent | ff7c6b350e2338a0b1e4327f4b2eb0435468f313 (diff) | |
download | embassy-b0725c14d36cb9c508cb9fcec5b92ca9e0148583.zip |
Split UsbDevice::run into run and run_until_suspend
Diffstat (limited to 'embassy-usb')
-rw-r--r-- | embassy-usb/src/lib.rs | 129 |
1 files changed, 81 insertions, 48 deletions
diff --git a/embassy-usb/src/lib.rs b/embassy-usb/src/lib.rs index ccea8bc7..baeca099 100644 --- a/embassy-usb/src/lib.rs +++ b/embassy-usb/src/lib.rs @@ -100,7 +100,6 @@ pub struct UsbDevice<'d, D: Driver<'d>> { device_state: UsbDeviceState, suspended: bool, - in_control_handler: bool, remote_wakeup_enabled: bool, self_powered: bool, pending_address: u8, @@ -138,7 +137,6 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> { control_buf, device_state: UsbDeviceState::Disabled, suspended: false, - in_control_handler: false, remote_wakeup_enabled: false, self_powered: false, pending_address: 0, @@ -146,7 +144,26 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> { } } + /// Runs the `UsbDevice` forever. + /// + /// This future may leave the bus in an invalid state if it is dropped. + /// After dropping the future, [`UsbDevice::disable()`] should be called + /// before calling any other `UsbDevice` methods to fully reset the + /// peripheral. pub async fn run(&mut self) -> ! { + loop { + self.run_until_suspend().await; + self.wait_resume().await; + } + } + + /// Runs the `UsbDevice` until the bus is suspended. + /// + /// This future may leave the bus in an invalid state if it is dropped. + /// After dropping the future, [`UsbDevice::disable()`] should be called + /// before calling any other `UsbDevice` methods to fully reset the + /// peripheral. + pub async fn run_until_suspend(&mut self) -> () { if self.device_state == UsbDeviceState::Disabled { self.bus.enable().await; self.device_state = UsbDeviceState::Default; @@ -154,66 +171,33 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> { if let Some(h) = &self.handler { h.enabled(true); } - } else if self.in_control_handler { - warn!("usb: control request interrupted"); - self.control.reject(); - self.in_control_handler = false; } loop { let control_fut = self.control.setup(); let bus_fut = self.bus.poll(); match select(bus_fut, control_fut).await { - Either::First(evt) => match evt { - Event::Reset => { - trace!("usb: reset"); - self.device_state = UsbDeviceState::Default; - self.suspended = false; - self.remote_wakeup_enabled = false; - self.pending_address = 0; - - for (_, h) in self.interfaces.iter_mut() { - h.reset(); - } - - if let Some(h) = &self.handler { - h.reset(); - } - } - Event::Resume => { - trace!("usb: resume"); - self.suspended = false; - if let Some(h) = &self.handler { - h.suspended(false); - } - } - Event::Suspend => { - trace!("usb: suspend"); - self.suspended = true; - if let Some(h) = &self.handler { - h.suspended(true); - } - } - }, - Either::Second(req) => { - self.in_control_handler = true; - match req { - Setup::DataIn(req, stage) => self.handle_control_in(req, stage).await, - Setup::DataOut(req, stage) => self.handle_control_out(req, stage).await, + Either::First(evt) => { + self.handle_bus_event(evt); + if self.suspended { + return; } - self.in_control_handler = false; } + Either::Second(req) => match req { + Setup::DataIn(req, stage) => self.handle_control_in(req, stage).await, + Setup::DataOut(req, stage) => self.handle_control_out(req, stage).await, + }, } } } + /// Disables the USB peripheral. pub async fn disable(&mut self) { if self.device_state != UsbDeviceState::Disabled { self.bus.disable().await; self.device_state = UsbDeviceState::Disabled; self.suspended = false; self.remote_wakeup_enabled = false; - self.in_control_handler = false; if let Some(h) = &self.handler { h.enabled(false); @@ -221,11 +205,26 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> { } } + /// Waits for a resume condition on the USB bus. + /// + /// This future is cancel-safe. + pub async fn wait_resume(&mut self) { + while self.suspended { + let evt = self.bus.poll().await; + self.handle_bus_event(evt); + } + } + + /// Initiates a device remote wakeup on the USB bus. + /// + /// If the bus is not suspended or remote wakeup is not enabled, an error + /// will be returned. + /// + /// This future may leave the bus in an inconsistent state if dropped. + /// After dropping the future, [`UsbDevice::disable()`] should be called + /// before calling any other `UsbDevice` methods to fully reset the peripheral. pub async fn remote_wakeup(&mut self) -> Result<(), RemoteWakeupError> { - if self.device_state == UsbDeviceState::Configured - && self.suspended - && self.remote_wakeup_enabled - { + if self.suspended && self.remote_wakeup_enabled { self.bus.remote_wakeup().await?; self.suspended = false; @@ -239,6 +238,40 @@ impl<'d, D: Driver<'d>> UsbDevice<'d, D> { } } + fn handle_bus_event(&mut self, evt: Event) { + match evt { + Event::Reset => { + trace!("usb: reset"); + self.device_state = UsbDeviceState::Default; + self.suspended = false; + self.remote_wakeup_enabled = false; + self.pending_address = 0; + + for (_, h) in self.interfaces.iter_mut() { + h.reset(); + } + + if let Some(h) = &self.handler { + h.reset(); + } + } + Event::Resume => { + trace!("usb: resume"); + self.suspended = false; + if let Some(h) = &self.handler { + h.suspended(false); + } + } + Event::Suspend => { + trace!("usb: suspend"); + self.suspended = true; + if let Some(h) = &self.handler { + h.suspended(true); + } + } + } + } + async fn handle_control_out(&mut self, req: Request, stage: DataOutStage) { const CONFIGURATION_NONE_U16: u16 = CONFIGURATION_NONE as u16; const CONFIGURATION_VALUE_U16: u16 = CONFIGURATION_VALUE as u16; |