Revert "rebase fixes"

This reverts commit 707c199.

Author: jonas-schievink

examples/usb/Cargo.toml

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

examples/usb/src/main.rs

@@ -24,6 +24,7 @@ fn TIMER0() {
 fn main() -> ! {
     static mut EP_BUF: [u8; 512] = [0; 512];
 
+    let core = cortex_m::Peripherals::take().unwrap();
     let periph = Peripherals::take().unwrap();
     while !periph
         .POWER
@@ -45,6 +46,7 @@ fn main() -> ! {
     let clocks = Clocks::new(periph.CLOCK);
     let clocks = clocks.enable_ext_hfosc();
 
+    let mut nvic = core.NVIC;
     let mut timer = Timer::one_shot(periph.TIMER0);
     let usbd = periph.USBD;
     let p0 = p0::Parts::new(periph.P0);
@@ -54,7 +56,7 @@ fn main() -> ! {
     let btn = p1.p1_00.into_pullup_input();
     while btn.is_high().unwrap() {}
 
-    timer.enable_interrupt();
+    timer.enable_interrupt(Some(&mut nvic));
     timer.start(Timer::<TIMER0, OneShot>::TICKS_PER_SECOND * 3);
 
     led.set_low().unwrap();