alex/rp-hal-boards
1
0
Fork 0
mirror of https://github.com/italicsjenga/rp-hal-boards.git synced 2025-01-11 13:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Usb fixes (#104)

Browse source 
* Remove check for ep0 buffer.len == 64

* Simplify EP buffer check
This commit is contained in:
9names 2021-09-11 18:31:45 +10:00 committed by GitHub
parent 0e5d582363
commit 7afa19a82b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,7 @@ impl Inner {
let is_ep0 = ep_addr.index() == 0; let is_ep0 = ep_addr.index() == 0;
let is_ctrl_ep = ep_type == EndpointType::Control; let is_ctrl_ep = ep_type == EndpointType::Control;
if !(is_ep0 ^ !is_ctrl_ep) || (is_ep0 && (max_packet_size != 64)) { if !(is_ep0 ^ !is_ctrl_ep) {
return Err(UsbError::Unsupported); return Err(UsbError::Unsupported);
} }
@ -149,10 +149,12 @@ impl Inner {
return Err(UsbError::InvalidEndpoint); return Err(UsbError::InvalidEndpoint);
} }
// validate buffer size // Validate buffer size. From datasheet (4.1.2.5):
if let (EndpointType::Isochronous, true) = (ep_type, max_packet_size > 1023) { // Data Buffers are typically 64 bytes long as this is the max normal packet size for most FS packets.
return Err(UsbError::Unsupported); // For Isochronous endpoints a maximum buffer size of 1023 bytes is supported.
} else if max_packet_size > 64 { // For other packet types the maximum size is 64 bytes per buffer.
if (ep_type != EndpointType::Isochronous && max_packet_size > 64) || max_packet_size > 1023
{
return Err(UsbError::Unsupported); return Err(UsbError::Unsupported);
} }