Revert "Rebase #144, formerly #133 to pull in USB for nrf52480"

This reverts commit 8a5ee04.

Author: jonas-schievink

Cargo.toml

@@ -22,5 +22,5 @@ lto = true
 opt-level = "s"
 
 [patch.crates-io.usb-device]
-git = "https://github.com/unrelentingtech/usb-device.git"
+git = "https://github.com/jonas-schievink/usb-device.git"
 branch = "inhibit-setaddr-resp"

examples/usb/Cargo.toml

@@ -10,10 +10,9 @@ cortex-m-rt = "0.6.12"
 cortex-m-semihosting = "0.3.5"
 panic-semihosting = "0.5.3"
 nrf52840-pac = "0.9.0"
-usb-device = "0.2.7"
+usb-device = "0.2.5"
 usbd-serial = "0.1.0"
 
 [dependencies.nrf52840-hal]
-version = "0.12.0"
+version = "0.10.0"
 path = "../../nrf52840-hal"
-

examples/usb/src/main.rs

@@ -51,7 +51,6 @@ fn main() -> ! {
     let p1 = p1::Parts::new(periph.P1);
 
     let mut led = p0.p0_23.into_push_pull_output(Level::High);
-
     let btn = p1.p1_00.into_pullup_input();
     while btn.is_high().unwrap() {}
 
@@ -80,11 +79,6 @@ fn main() -> ! {
         if new_state != state {
             hprintln!("{:?} {:#x}", new_state, usb_dev.bus().device_address()).ok();
             state = new_state;
-
-            if state == UsbDeviceState::Configured {
-                serial.write(b"Hello, world!\n").unwrap();
-                serial.flush().unwrap();
-            }
         }
     }
 }

nrf-hal-common/Cargo.toml

@@ -39,7 +39,7 @@ optional = true
 version = "0.9.0"
 
 [dependencies.usb-device]
-version = "0.2.7"
+version = "0.2.5"
 optional = true
 
 [dependencies.nrf52810-pac]

nrf-hal-common/src/usbd/mod.rs

@@ -10,7 +10,7 @@ mod errata;
 
 use crate::{
     clocks::{Clocks, ExternalOscillator},
-    pac::USBD,
+    target::USBD,
 };
 use core::sync::atomic::{compiler_fence, Ordering};
 use core::{cell::Cell, mem, ptr, slice};
@@ -470,7 +470,7 @@ impl UsbBus for Usbd<'_> {
                 // stage and must be followed by us responding with an ACK token to an OUT token
                 // sent from the host (AKA the status stage) -- `usb-device` provides no call back
                 // for that so we'll trigger the status stage using a shortcut
-                let is_short_packet = buf.len() < self.max_packet_size_0 as usize;
+                let is_short_packet = buf.len() < self.max_packet_size_0.into();
                 regs.shorts.modify(|_, w| {
                     if is_short_packet {
                         w.ep0datadone_ep0status().set_bit()
@@ -572,7 +572,7 @@ impl UsbBus for Usbd<'_> {
 
             unsafe {
                 if ep_addr.index() == 0 {
-                    regs.tasks_ep0stall.write(|w| w.tasks_ep0stall().bit(stalled));
+                    regs.tasks_ep0stall.write(|w| w.tasks_ep0stall().set_bit());
                 } else {
                     regs.epstall.write(|w| {
                         w.ep()
@@ -607,6 +607,7 @@ impl UsbBus for Usbd<'_> {
             errata::pre_wakeup();
 
             regs.lowpower.write(|w| w.lowpower().force_normal());
+            
         });
     }
 

nrf52840-hal/Cargo.toml

@@ -22,7 +22,7 @@ nrf52840-pac = "0.9.0"
 [dependencies.nrf-hal-common]
 path = "../nrf-hal-common"
 default-features = false
-features = ["52840", "usb-device"]
+features = ["52840"]
 version = "=0.12.0"
 
 [dependencies.embedded-hal]