usbhs: implement USBHS USB device driver #63
Conversation
Since all uses of naked_functions have been removed, remove the feature declaration to build on the stable toolchain.
ExplodingWaffle pointed out[1] the host is allowed to send a shorter packet than what we were expecting. Remove the assertions and links to embassy. [1] ch32-rs#59 (comment) Reported-by: Harry Brooke <harry.brooke1@hotmail.co.uk>
Refactor to improve code reuse in USBHS.
Calling .unwrap can result in extra strings and bloat. Use the defmt unwrap macro.
Setup USBHS related RCC register values. Co-authored-by: Harry Brooke <harry.brooke1@hotmail.co.uk> Co-authored-by: Codetector <codetector@codetector.org> Co-authored-by: Dummyc0m <xieyuanchu@gmail.com>
|
@ExplodingWaffle I didn't include your usb serial example because I was lazy and didn't want to polish it up. Feel free to add it as a follow-up. |
There was a problem hiding this comment.
LGTM
@ExplodingWaffle please also take a look to make sure nothing is crazy
src/usbhs/mod.rs
Outdated
| Direction::Out => { | ||
| T::dregs().ep_config().modify(|v| v.set_r_en(index - 1, enabled)); | ||
| T::dregs().ep_rx_ctrl(index).write(|v| { | ||
| v.set_mask_uep_r_tog(EpTog::DATA1); |
There was a problem hiding this comment.
shouldn’t this be DATA0? same for below
There was a problem hiding this comment.
Ah, I'll switch the data toggling to where NAK is set in the endpoint read/write. This is DATA1 because the data is toggled when the endpoint is set to ACK, so the first one can be DATA0. I'll test when I wake up lol.
There was a problem hiding this comment.
Yeah we should test with checking the tog_ok, otherwise this is actually not doing much
src/usbhs/mod.rs
Outdated
|
|
||
| let ep0_buf = self.allocator.alloc_endpoint(control_max_packet_size).unwrap(); | ||
| d.ep0_dma().write_value(ep0_buf.addr() as u32); | ||
| d.ep_max_len(0).write(|w| w.set_len(64)); |
There was a problem hiding this comment.
this should probably be control_max_packet_size. not that it’ll be anything other than 64 unless ls/fs support is added later
Implement the Embassy USB driver for the USBHS peripheral. The implementation largely mirrors the OTG_FS driver and has similar limitation such as non-configurable endpoint buffer sizes, in/out on the same endpoint index, lack of iso transfer, and untested bulk transfer. This change requires the latest fixes in ch32-metapac due to incorrect striding of the endpoint control registers. Tested on CH32V305 with the following applications: - USB HID device, for testing non-control endpoints interrupt transfer. - USB DFU, for testing the control endpoint. Co-authored-by: Harry Brooke <harry.brooke1@hotmail.co.uk> Co-authored-by: Codetector <codetector@codetector.org> Co-authored-by: Dummyc0m <xieyuanchu@gmail.com>
Small cleanup in EndpointBufferAllocator to ensure we don't request max_packet_size > 64
Codetector1374
force-pushed
the
ch32-hal-usbhs-feat
branch
from
47cbc57
to
8949439
Compare
Implement the Embassy USB driver for the USBHS peripheral. The
implementation largely mirrors the OTG_FS driver and has similar
limitation such as non-configurable endpoint buffer sizes, in/out on the
same endpoint index, lack of iso transfer, and untested bulk transfer.
This change requires the latest fixes in ch32-metapac due to incorrect
striding of the endpoint control registers.
Tested on CH32V305 with the following applications:
Co-authored-by: Harry Brooke harry.brooke1@hotmail.co.uk
Co-authored-by: Codetector codetector@codetector.org
Co-authored-by: Dummyc0m xieyuanchu@gmail.com