diff options
Diffstat (limited to 'embassy-nrf/src/usb')
| -rw-r--r-- | embassy-nrf/src/usb/mod.rs | 10 | ||||
| -rw-r--r-- | embassy-nrf/src/usb/vbus_detect.rs | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/embassy-nrf/src/usb/mod.rs b/embassy-nrf/src/usb/mod.rs index 2a32fe922..07cf2578a 100644 --- a/embassy-nrf/src/usb/mod.rs +++ b/embassy-nrf/src/usb/mod.rs | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | 4 | ||
| 5 | pub mod vbus_detect; | 5 | pub mod vbus_detect; |
| 6 | 6 | ||
| 7 | use core::future::{poll_fn, Future}; | 7 | use core::future::{Future, poll_fn}; |
| 8 | use core::marker::PhantomData; | 8 | use core::marker::PhantomData; |
| 9 | use core::mem::MaybeUninit; | 9 | use core::mem::MaybeUninit; |
| 10 | use core::sync::atomic::{compiler_fence, AtomicU32, Ordering}; | 10 | use core::sync::atomic::{AtomicU32, Ordering, compiler_fence}; |
| 11 | use core::task::Poll; | 11 | use core::task::Poll; |
| 12 | 12 | ||
| 13 | use cortex_m::peripheral::NVIC; | 13 | use cortex_m::peripheral::NVIC; |
| @@ -330,11 +330,7 @@ impl<'d, V: VbusDetect> driver::Bus for Bus<'d, V> { | |||
| 330 | let mut was_enabled = false; | 330 | let mut was_enabled = false; |
| 331 | regs.epinen().modify(|w| { | 331 | regs.epinen().modify(|w| { |
| 332 | was_enabled = (w.0 & mask) != 0; | 332 | was_enabled = (w.0 & mask) != 0; |
| 333 | if enabled { | 333 | if enabled { w.0 |= mask } else { w.0 &= !mask } |
| 334 | w.0 |= mask | ||
| 335 | } else { | ||
| 336 | w.0 &= !mask | ||
| 337 | } | ||
| 338 | }); | 334 | }); |
| 339 | 335 | ||
| 340 | let ready_mask = In::mask(i); | 336 | let ready_mask = In::mask(i); |
diff --git a/embassy-nrf/src/usb/vbus_detect.rs b/embassy-nrf/src/usb/vbus_detect.rs index 33cf91ee2..f24a7bff5 100644 --- a/embassy-nrf/src/usb/vbus_detect.rs +++ b/embassy-nrf/src/usb/vbus_detect.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | //! Trait and implementations for performing VBUS detection. | 1 | //! Trait and implementations for performing VBUS detection. |
| 2 | 2 | ||
| 3 | use core::future::{poll_fn, Future}; | 3 | use core::future::{Future, poll_fn}; |
| 4 | use core::sync::atomic::{AtomicBool, Ordering}; | 4 | use core::sync::atomic::{AtomicBool, Ordering}; |
| 5 | use core::task::Poll; | 5 | use core::task::Poll; |
| 6 | 6 | ||
