diff options
| author | sakumisu <[email protected]> | 2022-11-01 15:28:55 +0800 |
|---|---|---|
| committer | sakumisu <[email protected]> | 2022-11-01 15:28:55 +0800 |
| commit | a8723d01d05cad0cc9374b545a1b9ceb04d5a9ba (patch) | |
| tree | 7081de2883502488254db8090a45b412a934b684 | |
| parent | c79caff7922df3f5ab4e32e41f9d07bb89083d95 (diff) | |
fix musb ep_idx lost
| -rw-r--r-- | port/musb/usb_dc_musb.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/port/musb/usb_dc_musb.c b/port/musb/usb_dc_musb.c index e9ac107b..85e835c0 100644 --- a/port/musb/usb_dc_musb.c +++ b/port/musb/usb_dc_musb.c @@ -645,6 +645,7 @@ void USBD_IRQHandler(void) uint32_t txis; uint32_t rxis; uint8_t old_ep_idx; + uint8_t ep_idx; uint16_t write_count, read_count; is = HWREGB(USB_BASE + MUSB_IS_OFFSET); @@ -691,6 +692,7 @@ void USBD_IRQHandler(void) txis &= ~USB_TXIE_EP0; } + ep_idx = 1; while (txis) { if (txis & (1 << ep_idx)) { musb_set_active_ep(ep_idx); @@ -699,10 +701,9 @@ void USBD_IRQHandler(void) HWREGB(USB_BASE + MUSB_IND_TXCSRL_OFFSET) &= ~USB_TXCSRL1_UNDRN; } - write_count = MIN(g_musb_udc.in_ep[ep_idx].xfer_len, g_musb_udc.in_ep[ep_idx].ep_mps); - g_musb_udc.in_ep[ep_idx].xfer_buf += write_count; - g_musb_udc.in_ep[ep_idx].actual_xfer_len += write_count; - g_musb_udc.in_ep[ep_idx].xfer_len -= write_count; + g_musb_udc.in_ep[ep_idx].xfer_buf += g_musb_udc.in_ep[ep_idx].ep_mps; + g_musb_udc.in_ep[ep_idx].actual_xfer_len += g_musb_udc.in_ep[ep_idx].ep_mps; + g_musb_udc.in_ep[ep_idx].xfer_len -= g_musb_udc.in_ep[ep_idx].ep_mps; if (g_musb_udc.in_ep[ep_idx].xfer_len == 0) { usbd_event_ep_in_complete_handler(ep_idx | 0x80, g_musb_udc.in_ep[ep_idx].actual_xfer_len); @@ -715,9 +716,11 @@ void USBD_IRQHandler(void) txis &= ~(1 << ep_idx); } + ep_idx++; } rxis &= HWREGH(USB_BASE + MUSB_RXIE_OFFSET); + ep_idx = 1; while (rxis) { if (rxis & (1 << ep_idx)) { musb_set_active_ep(ep_idx); @@ -741,6 +744,7 @@ void USBD_IRQHandler(void) rxis &= ~(1 << ep_idx); } + ep_idx++; } musb_set_active_ep(old_ep_idx); |