aboutsummaryrefslogtreecommitdiff
path: root/embassy-nrf/src/usb
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-nrf/src/usb')
-rw-r--r--embassy-nrf/src/usb/mod.rs10
-rw-r--r--embassy-nrf/src/usb/vbus_detect.rs2
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
5pub mod vbus_detect; 5pub mod vbus_detect;
6 6
7use core::future::{poll_fn, Future}; 7use core::future::{Future, poll_fn};
8use core::marker::PhantomData; 8use core::marker::PhantomData;
9use core::mem::MaybeUninit; 9use core::mem::MaybeUninit;
10use core::sync::atomic::{compiler_fence, AtomicU32, Ordering}; 10use core::sync::atomic::{AtomicU32, Ordering, compiler_fence};
11use core::task::Poll; 11use core::task::Poll;
12 12
13use cortex_m::peripheral::NVIC; 13use 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
3use core::future::{poll_fn, Future}; 3use core::future::{Future, poll_fn};
4use core::sync::atomic::{AtomicBool, Ordering}; 4use core::sync::atomic::{AtomicBool, Ordering};
5use core::task::Poll; 5use core::task::Poll;
6 6