Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-07 05:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1509 from liamfraser/rp2040_hcd_improvements

Browse Source 
RP2040 HCD Improvements (Hub + Keyboard + Mouse working)
This commit is contained in:
Ha Thach 2022-06-21 15:55:02 +07:00 committed by GitHub
commit 070382d599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/portable/raspberrypi/rp2040/hcd_rp2040.c
View File

@ -104,6 +104,8 @@ static void __tusb_irq_path_func(hw_xfer_complete)(struct hw_endpoint *ep, xfer_
static void __tusb_irq_path_func(_handle_buff_status_bit)(uint bit, struct hw_endpoint *ep) static void __tusb_irq_path_func(_handle_buff_status_bit)(uint bit, struct hw_endpoint *ep)
{ {
usb_hw_clear->buf_status = bit; usb_hw_clear->buf_status = bit;
// EP may have been stalled?
assert(ep->active);
bool done = hw_endpoint_xfer_continue(ep); bool done = hw_endpoint_xfer_continue(ep);
if (done) if (done)
{ {
@ -166,6 +168,8 @@ static void __tusb_irq_path_func(hw_trans_complete)(void)
pico_trace("Sent setup packet\n"); pico_trace("Sent setup packet\n");
struct hw_endpoint *ep = &epx; struct hw_endpoint *ep = &epx;
assert(ep->active); assert(ep->active);
// Set transferred length to 8 for a setup packet
ep->xferred_len = 8;
hw_xfer_complete(ep, XFER_RESULT_SUCCESS); hw_xfer_complete(ep, XFER_RESULT_SUCCESS);
} }
else else
@ -197,6 +201,18 @@ static void __tusb_irq_path_func(hcd_rp2040_irq)(void)
usb_hw_clear->sie_status = USB_SIE_STATUS_SPEED_BITS; usb_hw_clear->sie_status = USB_SIE_STATUS_SPEED_BITS;
} }
if (status & USB_INTS_STALL_BITS)
{
// We have rx'd a stall from the device
// NOTE THIS SHOULD HAVE PRIORITY OVER BUFF_STATUS
// AND TRANS_COMPLETE as the stall is an alternative response
// to one of those events
pico_trace("Stall REC\n");
handled |= USB_INTS_STALL_BITS;
usb_hw_clear->sie_status = USB_SIE_STATUS_STALL_REC_BITS;
hw_xfer_complete(&epx, XFER_RESULT_STALLED);
}
if (status & USB_INTS_BUFF_STATUS_BITS) if (status & USB_INTS_BUFF_STATUS_BITS)
{ {
handled |= USB_INTS_BUFF_STATUS_BITS; handled |= USB_INTS_BUFF_STATUS_BITS;
@ -212,15 +228,6 @@ static void __tusb_irq_path_func(hcd_rp2040_irq)(void)
hw_trans_complete(); hw_trans_complete();
} }
if (status & USB_INTS_STALL_BITS)
{
// We have rx'd a stall from the device
pico_trace("Stall REC\n");
handled |= USB_INTS_STALL_BITS;
usb_hw_clear->sie_status = USB_SIE_STATUS_STALL_REC_BITS;
hw_xfer_complete(&epx, XFER_RESULT_STALLED);
}
if (status & USB_INTS_ERROR_RX_TIMEOUT_BITS) if (status & USB_INTS_ERROR_RX_TIMEOUT_BITS)
{ {
handled |= USB_INTS_ERROR_RX_TIMEOUT_BITS; handled |= USB_INTS_ERROR_RX_TIMEOUT_BITS;
@ -505,6 +512,9 @@ bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t *
struct hw_endpoint *ep = get_dev_ep(dev_addr, ep_addr); struct hw_endpoint *ep = get_dev_ep(dev_addr, ep_addr);
assert(ep); assert(ep);
// EP should be inactive
assert(!ep->active);
// Control endpoint can change direction 0x00 <-> 0x80 // Control endpoint can change direction 0x00 <-> 0x80
if ( ep_addr != ep->ep_addr ) if ( ep_addr != ep->ep_addr )
{ {
@ -552,6 +562,9 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
// Configure EP0 struct with setup info for the trans complete // Configure EP0 struct with setup info for the trans complete
struct hw_endpoint *ep = _hw_endpoint_allocate(0); struct hw_endpoint *ep = _hw_endpoint_allocate(0);
// EPX should be inactive
assert(!ep->active);
// EP0 out // EP0 out
_hw_endpoint_init(ep, dev_addr, 0x00, ep->wMaxPacketSize, 0, 0); _hw_endpoint_init(ep, dev_addr, 0x00, ep->wMaxPacketSize, 0, 0);
assert(ep->configured); assert(ep->configured);
@ -571,21 +584,6 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
return true; return true;
} }
//bool hcd_edpt_busy(uint8_t dev_addr, uint8_t ep_addr)
//{
// // EPX is shared, so multiple device addresses and endpoint addresses share that
// // so if any transfer is active on epx, we are busy. Interrupt endpoints have their own
// // EPX so ep->active will only be busy if there is a pending transfer on that interrupt endpoint
// // on that device
// pico_trace("hcd_edpt_busy dev addr %d ep_addr 0x%x\n", dev_addr, ep_addr);
// struct hw_endpoint *ep = get_dev_ep(dev_addr, ep_addr);
// assert(ep);
// bool busy = ep->active;
// pico_trace("busy == %d\n", busy);
// return busy;
//}
bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr) bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
{ {
(void) dev_addr; (void) dev_addr;