diff options
Diffstat (limited to 'embassy-nrf/src/usb/vbus_detect.rs')
| -rw-r--r-- | embassy-nrf/src/usb/vbus_detect.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/embassy-nrf/src/usb/vbus_detect.rs b/embassy-nrf/src/usb/vbus_detect.rs index a6a959905..a05e5aa52 100644 --- a/embassy-nrf/src/usb/vbus_detect.rs +++ b/embassy-nrf/src/usb/vbus_detect.rs | |||
| @@ -7,8 +7,8 @@ use core::task::Poll; | |||
| 7 | use embassy_sync::waitqueue::AtomicWaker; | 7 | use embassy_sync::waitqueue::AtomicWaker; |
| 8 | 8 | ||
| 9 | use super::BUS_WAKER; | 9 | use super::BUS_WAKER; |
| 10 | use crate::interrupt::{self, Interrupt}; | 10 | use crate::interrupt::typelevel::Interrupt; |
| 11 | use crate::pac; | 11 | use crate::{interrupt, pac}; |
| 12 | 12 | ||
| 13 | /// Trait for detecting USB VBUS power. | 13 | /// Trait for detecting USB VBUS power. |
| 14 | /// | 14 | /// |
| @@ -29,9 +29,9 @@ pub trait VbusDetect { | |||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | #[cfg(not(feature = "_nrf5340"))] | 31 | #[cfg(not(feature = "_nrf5340"))] |
| 32 | type UsbRegIrq = interrupt::POWER_CLOCK; | 32 | type UsbRegIrq = interrupt::typelevel::POWER_CLOCK; |
| 33 | #[cfg(feature = "_nrf5340")] | 33 | #[cfg(feature = "_nrf5340")] |
| 34 | type UsbRegIrq = interrupt::USBREGULATOR; | 34 | type UsbRegIrq = interrupt::typelevel::USBREGULATOR; |
| 35 | 35 | ||
| 36 | #[cfg(not(feature = "_nrf5340"))] | 36 | #[cfg(not(feature = "_nrf5340"))] |
| 37 | type UsbRegPeri = pac::POWER; | 37 | type UsbRegPeri = pac::POWER; |
| @@ -43,7 +43,7 @@ pub struct InterruptHandler { | |||
| 43 | _private: (), | 43 | _private: (), |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | impl interrupt::Handler<UsbRegIrq> for InterruptHandler { | 46 | impl interrupt::typelevel::Handler<UsbRegIrq> for InterruptHandler { |
| 47 | unsafe fn on_interrupt() { | 47 | unsafe fn on_interrupt() { |
| 48 | let regs = unsafe { &*UsbRegPeri::ptr() }; | 48 | let regs = unsafe { &*UsbRegPeri::ptr() }; |
| 49 | 49 | ||
| @@ -77,7 +77,7 @@ static POWER_WAKER: AtomicWaker = AtomicWaker::new(); | |||
| 77 | 77 | ||
| 78 | impl HardwareVbusDetect { | 78 | impl HardwareVbusDetect { |
| 79 | /// Create a new `VbusDetectNative`. | 79 | /// Create a new `VbusDetectNative`. |
| 80 | pub fn new(_irq: impl interrupt::Binding<UsbRegIrq, InterruptHandler> + 'static) -> Self { | 80 | pub fn new(_irq: impl interrupt::typelevel::Binding<UsbRegIrq, InterruptHandler> + 'static) -> Self { |
| 81 | let regs = unsafe { &*UsbRegPeri::ptr() }; | 81 | let regs = unsafe { &*UsbRegPeri::ptr() }; |
| 82 | 82 | ||
| 83 | UsbRegIrq::unpend(); | 83 | UsbRegIrq::unpend(); |
