aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDion Dokter <[email protected]>2022-10-26 10:39:29 +0200
committerDion Dokter <[email protected]>2022-10-26 10:39:29 +0200
commit0c9ec8dc362efb3a569b4b85c6fcd97a7f9d7860 (patch)
treea5dbfa3f94dbeca08451dd74a072f1ef03bd5f8f
parentea868920e6859aac924a6266968f790a76d6b160 (diff)
Update usb
-rw-r--r--embassy-nrf/src/usb.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/embassy-nrf/src/usb.rs b/embassy-nrf/src/usb.rs
index 00da5c9dd..eb1472fa5 100644
--- a/embassy-nrf/src/usb.rs
+++ b/embassy-nrf/src/usb.rs
@@ -313,7 +313,7 @@ impl<'d, T: Instance, P: UsbSupply> driver::Bus for Bus<'d, T, P> {
313 } 313 }
314 }) 314 })
315 .await; 315 .await;
316 regs.eventcause.write(|w| w.ready().set_bit()); // Write 1 to clear. 316 regs.eventcause.write(|w| w.ready().clear_bit_by_one());
317 317
318 errata::post_enable(); 318 errata::post_enable();
319 319
@@ -367,24 +367,24 @@ impl<'d, T: Instance, P: UsbSupply> driver::Bus for Bus<'d, T, P> {
367 let r = regs.eventcause.read(); 367 let r = regs.eventcause.read();
368 368
369 if r.isooutcrc().bit() { 369 if r.isooutcrc().bit() {
370 regs.eventcause.write(|w| w.isooutcrc().set_bit()); 370 regs.eventcause.write(|w| w.isooutcrc().detected());
371 trace!("USB event: isooutcrc"); 371 trace!("USB event: isooutcrc");
372 } 372 }
373 if r.usbwuallowed().bit() { 373 if r.usbwuallowed().bit() {
374 regs.eventcause.write(|w| w.usbwuallowed().set_bit()); 374 regs.eventcause.write(|w| w.usbwuallowed().allowed());
375 trace!("USB event: usbwuallowed"); 375 trace!("USB event: usbwuallowed");
376 } 376 }
377 if r.suspend().bit() { 377 if r.suspend().bit() {
378 regs.eventcause.write(|w| w.suspend().set_bit()); 378 regs.eventcause.write(|w| w.suspend().detected());
379 regs.lowpower.write(|w| w.lowpower().low_power()); 379 regs.lowpower.write(|w| w.lowpower().low_power());
380 return Poll::Ready(Event::Suspend); 380 return Poll::Ready(Event::Suspend);
381 } 381 }
382 if r.resume().bit() { 382 if r.resume().bit() {
383 regs.eventcause.write(|w| w.resume().set_bit()); 383 regs.eventcause.write(|w| w.resume().detected());
384 return Poll::Ready(Event::Resume); 384 return Poll::Ready(Event::Resume);
385 } 385 }
386 if r.ready().bit() { 386 if r.ready().bit() {
387 regs.eventcause.write(|w| w.ready().set_bit()); 387 regs.eventcause.write(|w| w.ready().ready());
388 trace!("USB event: ready"); 388 trace!("USB event: ready");
389 } 389 }
390 390
@@ -512,7 +512,7 @@ impl<'d, T: Instance, P: UsbSupply> driver::Bus for Bus<'d, T, P> {
512 } else if r.resume().bit() { 512 } else if r.resume().bit() {
513 Poll::Ready(()) 513 Poll::Ready(())
514 } else if r.usbwuallowed().bit() { 514 } else if r.usbwuallowed().bit() {
515 regs.eventcause.write(|w| w.usbwuallowed().set_bit()); 515 regs.eventcause.write(|w| w.usbwuallowed().allowed());
516 516
517 regs.dpdmvalue.write(|w| w.state().resume()); 517 regs.dpdmvalue.write(|w| w.state().resume());
518 regs.tasks_dpdmdrive.write(|w| w.tasks_dpdmdrive().set_bit()); 518 regs.tasks_dpdmdrive.write(|w| w.tasks_dpdmdrive().set_bit());