Use nrf-usbd

Author: jonas-schievink

examples/usb/src/bin/serial.rs

@@ -4,8 +4,8 @@
 use panic_semihosting as _;
 
 use cortex_m_rt::entry;
-use nrf52840_hal::usbd::Usbd;
 use nrf52840_hal::clocks::Clocks;
+use nrf52840_hal::usbd::{UsbPeripheral, Usbd};
 use nrf52840_pac::Peripherals;
 use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
@@ -16,7 +16,7 @@ fn main() -> ! {
     let clocks = Clocks::new(periph.CLOCK);
     let clocks = clocks.enable_ext_hfosc();
 
-    let usb_bus = Usbd::new(periph.USBD, &clocks);
+    let usb_bus = Usbd::new(UsbPeripheral::new(periph.USBD, &clocks));
     let mut serial = SerialPort::new(&usb_bus);
 
     let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd))
@@ -48,8 +48,8 @@ fn main() -> ! {
                     match serial.write(&buf[write_offset..count]) {
                         Ok(len) if len > 0 => {
                             write_offset += len;
-                        },
-                        _ => {},
+                        }
+                        _ => {}
                     }
                 }
             }

examples/usb/src/bin/test_class.rs

@@ -4,8 +4,8 @@
 use panic_semihosting as _;
 
 use cortex_m_rt::entry;
-use nrf52840_hal::usbd::Usbd;
 use nrf52840_hal::clocks::Clocks;
+use nrf52840_hal::usbd::{UsbPeripheral, Usbd};
 use nrf52840_pac::Peripherals;
 use usb_device::test_class::TestClass;
 
@@ -15,7 +15,7 @@ fn main() -> ! {
     let clocks = Clocks::new(periph.CLOCK);
     let clocks = clocks.enable_ext_hfosc();
 
-    let usb_bus = Usbd::new(periph.USBD, &clocks);
+    let usb_bus = Usbd::new(UsbPeripheral::new(periph.USBD, &clocks));
 
     let mut test = TestClass::new(&usb_bus);
 

nrf-hal-common/Cargo.toml

@@ -39,10 +39,6 @@ version = "0.2.3"
 optional = true
 version = "0.9.0"
 
-[dependencies.usb-device]
-version = "0.2.7"
-optional = true
-
 [dependencies.nrf52810-pac]
 optional = true
 version = "0.9.0"
@@ -67,6 +63,10 @@ version = "0.9.0"
 optional = true
 version = "0.2.1"
 
+[dependencies.nrf-usbd]
+git = "https://github.com/nrf-rs/nrf-usbd.git"
+optional = true
+
 [dependencies.embedded-hal]
 features = ["unproven"]
 version = "0.2.4"
@@ -77,6 +77,6 @@ doc = []
 52810 = ["nrf52810-pac"]
 52811 = ["nrf52811-pac"]
 52832 = ["nrf52832-pac"]
-52833 = ["nrf52833-pac", "usb-device"]
-52840 = ["nrf52840-pac", "usb-device"]
+52833 = ["nrf52833-pac", "nrf-usbd"]
+52840 = ["nrf52840-pac", "nrf-usbd"]
 9160 = ["nrf9160-pac"]

nrf-hal-common/src/lib.rs

@@ -80,9 +80,9 @@ pub mod uart;
 pub mod uarte;
 #[cfg(not(feature = "9160"))]
 pub mod uicr;
-pub mod wdt;
-#[cfg(feature = "usb-device")]
+#[cfg(feature = "nrf-usbd")]
 pub mod usbd;
+pub mod wdt;
 
 pub mod prelude {
     pub use crate::hal::digital::v2::*;

nrf-hal-common/src/usbd.rs

@@ -0,0 +1,21 @@
+use crate::clocks::ExternalOscillator;
+use crate::pac::USBD;
+use crate::Clocks;
+
+pub use nrf_usbd::Usbd;
+
+#[allow(dead_code)] // fields are unused and only hold ownership
+pub struct UsbPeripheral<'a> {
+    usbd: USBD,
+    clocks: &'a (),
+}
+
+impl<'a> UsbPeripheral<'a> {
+    pub fn new<L, LSTAT>(usbd: USBD, _clocks: &'a Clocks<ExternalOscillator, L, LSTAT>) -> Self {
+        Self { usbd, clocks: &() }
+    }
+}
+
+unsafe impl<'a> nrf_usbd::UsbPeripheral for UsbPeripheral<'a> {
+    const REGISTERS: *const () = USBD::ptr() as *const _;
+}