revert some dk and dk-solution changes

Author: robamu

nrf52-code/boards/dk-solution/src/lib.rs

@@ -51,9 +51,6 @@ pub struct Board {
     /// Radio interface
     #[cfg(feature = "radio")]
     pub radio: crate::radio::Radio<'static>,
-    /// USBD (Universal Serial Bus Device) peripheral
-    #[cfg(any(feature = "advanced", feature = "usbd"))]
-    pub usbd: hal::Peri<'static, hal::peripherals::USBD>,
     /// Raw register block for the USBD peripheral.
     #[cfg(any(feature = "advanced", feature = "usbd"))]
     pub usbd_regs: hal::pac::usbd::Usbd,
@@ -438,8 +435,6 @@ pub fn init() -> Result<Board, Error> {
         #[cfg(feature = "advanced")]
         ep0in: unsafe { usbd::Ep0In::new(&EP0IN_BUF) },
         #[cfg(any(feature = "advanced", feature = "usbd"))]
-        usbd: periph.USBD,
-        #[cfg(any(feature = "advanced", feature = "usbd"))]
         usbd_regs: hal::pac::USBD,
         #[cfg(feature = "advanced")]
         power: hal::pac::POWER,

nrf52-code/boards/dk/src/lib.rs

@@ -47,9 +47,6 @@ pub struct Board {
     /// Radio interface
     #[cfg(feature = "radio")]
     pub radio: crate::radio::Radio<'static>,
-    /// USBD (Universal Serial Bus Device) peripheral
-    #[cfg(any(feature = "advanced", feature = "usbd"))]
-    pub usbd: hal::Peri<'static, hal::peripherals::USBD>,
     /// Raw register block for the USBD peripheral.
     #[cfg(any(feature = "advanced", feature = "usbd"))]
     pub usbd_regs: hal::pac::usbd::Usbd,
@@ -390,8 +387,6 @@ pub fn init() -> Result<Board, Error>{
         #[cfg(feature = "advanced")]
         ep0in: unsafe { usbd::Ep0In::new(&EP0IN_BUF) },
         #[cfg(any(feature = "advanced", feature = "usbd"))]
-        usbd: periph.USBD,
-        #[cfg(any(feature = "advanced", feature = "usbd"))]
         usbd_regs: hal::pac::USBD,
         #[cfg(feature = "advanced")]
         power: hal::pac::POWER,