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

Merge pull request #1807 from romixlab/main

Browse Source 
Fix hardcoded buffer length in USB NCM causing broken link on USB 2.0.
This commit is contained in:
Dario Nieuwenhuis 2023-08-20 09:05:07 +00:00 committed by GitHub
commit 6ef888d73e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
embassy-usb/src/class/cdc_ncm/mod.rs
View File

@ -248,6 +248,8 @@ pub struct CdcNcmClass<'d, D: Driver<'d>> {
write_ep: D::EndpointIn, write_ep: D::EndpointIn,
_control: &'d ControlShared, _control: &'d ControlShared,
max_packet_size: usize,
} }
impl<'d, D: Driver<'d>> CdcNcmClass<'d, D> { impl<'d, D: Driver<'d>> CdcNcmClass<'d, D> {
@ -338,6 +340,7 @@ impl<'d, D: Driver<'d>> CdcNcmClass<'d, D> {
read_ep, read_ep,
write_ep, write_ep,
_control: &state.shared, _control: &state.shared,
max_packet_size: max_packet_size as usize,
} }
} }
@ -349,6 +352,7 @@ impl<'d, D: Driver<'d>> CdcNcmClass<'d, D> {
Sender { Sender {
write_ep: self.write_ep, write_ep: self.write_ep,
seq: 0, seq: 0,
max_packet_size: self.max_packet_size,
}, },
Receiver { Receiver {
data_if: self.data_if, data_if: self.data_if,
@ -365,6 +369,7 @@ impl<'d, D: Driver<'d>> CdcNcmClass<'d, D> {
pub struct Sender<'d, D: Driver<'d>> { pub struct Sender<'d, D: Driver<'d>> {
write_ep: D::EndpointIn, write_ep: D::EndpointIn,
seq: u16, seq: u16,
max_packet_size: usize,
} }
impl<'d, D: Driver<'d>> Sender<'d, D> { impl<'d, D: Driver<'d>> Sender<'d, D> {
@ -375,8 +380,8 @@ impl<'d, D: Driver<'d>> Sender<'d, D> {
let seq = self.seq; let seq = self.seq;
self.seq = self.seq.wrapping_add(1); self.seq = self.seq.wrapping_add(1);
const MAX_PACKET_SIZE: usize = 64; // TODO unhardcode
const OUT_HEADER_LEN: usize = 28; const OUT_HEADER_LEN: usize = 28;
const ABS_MAX_PACKET_SIZE: usize = 512;
let header = NtbOutHeader { let header = NtbOutHeader {
nth_sig: SIG_NTH, nth_sig: SIG_NTH,
@ -395,27 +400,27 @@ impl<'d, D: Driver<'d>> Sender<'d, D> {
}; };
// Build first packet on a buffer, send next packets straight from `data`. // Build first packet on a buffer, send next packets straight from `data`.
let mut buf = [0; MAX_PACKET_SIZE]; let mut buf = [0; ABS_MAX_PACKET_SIZE];
let n = byteify(&mut buf, header); let n = byteify(&mut buf, header);
assert_eq!(n.len(), OUT_HEADER_LEN); assert_eq!(n.len(), OUT_HEADER_LEN);
if OUT_HEADER_LEN + data.len() < MAX_PACKET_SIZE { if OUT_HEADER_LEN + data.len() < self.max_packet_size {
// First packet is not full, just send it. // First packet is not full, just send it.
// No need to send ZLP because it's short for sure. // No need to send ZLP because it's short for sure.
buf[OUT_HEADER_LEN..][..data.len()].copy_from_slice(data); buf[OUT_HEADER_LEN..][..data.len()].copy_from_slice(data);
self.write_ep.write(&buf[..OUT_HEADER_LEN + data.len()]).await?; self.write_ep.write(&buf[..OUT_HEADER_LEN + data.len()]).await?;
} else { } else {
let (d1, d2) = data.split_at(MAX_PACKET_SIZE - OUT_HEADER_LEN); let (d1, d2) = data.split_at(self.max_packet_size - OUT_HEADER_LEN);
buf[OUT_HEADER_LEN..].copy_from_slice(d1); buf[OUT_HEADER_LEN..self.max_packet_size].copy_from_slice(d1);
self.write_ep.write(&buf).await?; self.write_ep.write(&buf[..self.max_packet_size]).await?;
for chunk in d2.chunks(MAX_PACKET_SIZE) { for chunk in d2.chunks(self.max_packet_size) {
self.write_ep.write(&chunk).await?; self.write_ep.write(&chunk).await?;
} }
// Send ZLP if needed. // Send ZLP if needed.
if d2.len() % MAX_PACKET_SIZE == 0 { if d2.len() % self.max_packet_size == 0 {
self.write_ep.write(&[]).await?; self.write_ep.write(&[]).await?;
} }
} }