max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #655

Browse Source 
655: common/serial/usb: fix hang when write buffer gets full and then the bus resets. r=Dirbaio a=Dirbaio



Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2022-03-06 23:33:02 +00:00 committed by GitHub
commit 9735c38592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
embassy-hal-common/src/usb/usb_serial.rs
View File

@ -167,6 +167,7 @@ impl<'bus, 'a, B: UsbBus> AsyncWrite for UsbSerial<'bus, 'a, B> {
let write_buf = this.write_buf.push_buf(); let write_buf = this.write_buf.push_buf();
if write_buf.is_empty() { if write_buf.is_empty() {
trace!("buf full, registering waker");
this.write_waker.register(cx.waker()); this.write_waker.register(cx.waker());
return Poll::Pending; return Poll::Pending;
} }
@ -244,10 +245,18 @@ impl<'bus, 'a, B: UsbBus> UsbSerial<'bus, 'a, B> {
}; };
if !buf.is_empty() { if !buf.is_empty() {
trace!("writing packet len {}", buf.len());
let count = match self.inner.write_packet(buf) { let count = match self.inner.write_packet(buf) {
Ok(c) => c, Ok(c) => {
Err(UsbError::WouldBlock) => 0, trace!("write packet: OK {}", c);
c
}
Err(UsbError::WouldBlock) => {
trace!("write packet: WouldBlock");
0
}
Err(_) => { Err(_) => {
trace!("write packet: error");
self.write_error = true; self.write_error = true;
return; return;
} }
@ -260,11 +269,20 @@ impl<'bus, 'a, B: UsbBus> UsbSerial<'bus, 'a, B> {
} }
self.write_buf.pop(count); self.write_buf.pop(count);
} else if full_size_packets > 0 { } else if full_size_packets > 0 {
if let Err(e) = self.inner.write_packet(&[]) { trace!("writing empty packet");
if !matches!(e, UsbError::WouldBlock) { match self.inner.write_packet(&[]) {
self.write_error = true; Ok(_) => {
trace!("write empty packet: OK");
}
Err(UsbError::WouldBlock) => {
trace!("write empty packet: WouldBlock");
return;
}
Err(_) => {
trace!("write empty packet: Error");
self.write_error = true;
return;
} }
return;
} }
self.write_state = WriteState::Idle; self.write_state = WriteState::Idle;
} }
@ -284,10 +302,14 @@ where
self.read_buf.clear(); self.read_buf.clear();
self.write_buf.clear(); self.write_buf.clear();
self.write_state = WriteState::Idle; self.write_state = WriteState::Idle;
self.read_waker.wake();
self.write_waker.wake();
} }
fn endpoint_in_complete(&mut self, addr: EndpointAddress) { fn endpoint_in_complete(&mut self, addr: EndpointAddress) {
trace!("DONE endpoint_in_complete");
if addr == self.inner.write_ep_address() { if addr == self.inner.write_ep_address() {
trace!("DONE writing packet, waking");
self.write_waker.wake(); self.write_waker.wake();
self.flush_write(); self.flush_write();