alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2024-12-23 12:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

usb: Read ints rather than sie_status in poll (#493)

Browse source 
If the latency is too high, there is a risk that the status reverts to a
previous state while keeping the interrupt flag up.
This fixes that by relying on ints instead of sie_status to process the
events.
This commit is contained in:
Wilfried Chauveau 2022-11-28 18:08:23 +00:00 committed by GitHub
parent 0055dbaf87
commit 119534d2da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rp2040-hal/src/usb.rs
View file

@ -615,12 +615,12 @@ impl UsbBusTrait for UsbBus {
} }
// check for bus reset and/or suspended states. // check for bus reset and/or suspended states.
let sie_status = inner.ctrl_reg.sie_status.read(); let ints = inner.ctrl_reg.ints.read();
let mut buff_status = inner.ctrl_reg.buff_status.read().bits(); let mut buff_status = inner.ctrl_reg.buff_status.read().bits();
if sie_status.bus_reset().bit_is_set() { if ints.bus_reset().bit_is_set() {
#[cfg(feature = "rp2040-e5")] #[cfg(feature = "rp2040-e5")]
if sie_status.connected().bit_is_clear() { if inner.ctrl_reg.sie_status.read().connected().bit_is_clear() {
inner.errata5_state = Some(errata5::Errata5State::start()); inner.errata5_state = Some(errata5::Errata5State::start());
return PollResult::None; return PollResult::None;
} else { } else {
@ -629,11 +629,11 @@ impl UsbBusTrait for UsbBus {
#[cfg(not(feature = "rp2040-e5"))] #[cfg(not(feature = "rp2040-e5"))]
return PollResult::Reset; return PollResult::Reset;
} else if buff_status == 0 && sie_status.setup_rec().bit_is_clear() { } else if buff_status == 0 && ints.setup_req().bit_is_clear() {
if sie_status.suspended().bit_is_set() { if ints.dev_suspend().bit_is_set() {
inner.ctrl_reg.sie_status.write(|w| w.suspended().set_bit()); inner.ctrl_reg.sie_status.write(|w| w.suspended().set_bit());
return PollResult::Suspend; return PollResult::Suspend;
} else if sie_status.resume().bit_is_set() { } else if ints.dev_resume_from_host().bit_is_set() {
inner.ctrl_reg.sie_status.write(|w| w.resume().set_bit()); inner.ctrl_reg.sie_status.write(|w| w.resume().set_bit());
return PollResult::Resume; return PollResult::Resume;
} }
@ -664,7 +664,7 @@ impl UsbBusTrait for UsbBus {
} }
// check for setup request // check for setup request
if sie_status.setup_rec().bit_is_set() { if ints.setup_req().bit_is_set() {
// Small max_packet_size_ep0 Work-Around // Small max_packet_size_ep0 Work-Around
inner.ctrl_dpram.ep_buffer_control[0].modify(|_, w| w.available_0().clear_bit()); inner.ctrl_dpram.ep_buffer_control[0].modify(|_, w| w.available_0().clear_bit());