mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1146 from kasjer/kasjer/da146xx-usb-complience

Browse Source 
da146xx usb complience
This commit is contained in:
Ha Thach 2021-10-17 23:48:04 +07:00 committed by GitHub
commit 4cecd4e6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/portable/dialog/da146xx/dcd_da146xx.c
View File

@ -368,8 +368,8 @@ static void start_rx_packet(xfer_ctl_t *xfer)
else else
{ {
// Other endpoint is using DMA in that direction, fall back to interrupts. // Other endpoint is using DMA in that direction, fall back to interrupts.
// For endpoint size greater then FIFO size enable FIFO level warning interrupt // For endpoint size greater than FIFO size enable FIFO level warning interrupt
// when FIFO has less then 17 bytes free. // when FIFO has less than 17 bytes free.
regs->rxc |= USB_USB_RXC1_REG_USB_RFWL_Msk; regs->rxc |= USB_USB_RXC1_REG_USB_RFWL_Msk;
USB->USB_FWMSK_REG |= 1 << (epnum - 1 + USB_USB_FWMSK_REG_USB_M_RXWARN31_Pos); USB->USB_FWMSK_REG |= 1 << (epnum - 1 + USB_USB_FWMSK_REG_USB_M_RXWARN31_Pos);
} }
@ -420,7 +420,7 @@ static void start_tx_packet(xfer_ctl_t *xfer)
regs->txc |= USB_USB_TXC1_REG_USB_TX_EN_Msk; regs->txc |= USB_USB_TXC1_REG_USB_TX_EN_Msk;
} }
static void read_rx_fifo(xfer_ctl_t *xfer, uint16_t bytes_in_fifo) static uint16_t read_rx_fifo(xfer_ctl_t *xfer, uint16_t bytes_in_fifo)
{ {
EPx_REGS *regs = XFER_REGS(xfer); EPx_REGS *regs = XFER_REGS(xfer);
uint16_t remaining = xfer->total_len - xfer->transferred - xfer->last_packet_size; uint16_t remaining = xfer->total_len - xfer->transferred - xfer->last_packet_size;
@ -433,6 +433,8 @@ static void read_rx_fifo(xfer_ctl_t *xfer, uint16_t bytes_in_fifo)
for (int i = 0; i < receive_this_time; ++i) buf[i] = regs->rxd; for (int i = 0; i < receive_this_time; ++i) buf[i] = regs->rxd;
xfer->last_packet_size += receive_this_time; xfer->last_packet_size += receive_this_time;
return bytes_in_fifo - receive_this_time;
} }
static void handle_ep0_rx(void) static void handle_ep0_rx(void)
@ -562,7 +564,7 @@ static void handle_epx_rx_ev(uint8_t ep)
// FIFO maybe empty if DMA read it before or it's final iteration and function already read all that was to read. // FIFO maybe empty if DMA read it before or it's final iteration and function already read all that was to read.
if (fifo_bytes > 0) if (fifo_bytes > 0)
{ {
read_rx_fifo(xfer, fifo_bytes); fifo_bytes = read_rx_fifo(xfer, fifo_bytes);
} }
if (GET_BIT(rxs, USB_USB_RXS1_REG_USB_RX_LAST)) if (GET_BIT(rxs, USB_USB_RXS1_REG_USB_RX_LAST))
{ {
@ -577,6 +579,13 @@ static void handle_epx_rx_ev(uint8_t ep)
xfer->transferred += xfer->last_packet_size; xfer->transferred += xfer->last_packet_size;
if (xfer->total_len == xfer->transferred || xfer->last_packet_size < xfer->max_packet_size || xfer->iso) if (xfer->total_len == xfer->transferred || xfer->last_packet_size < xfer->max_packet_size || xfer->iso)
{ {
if (fifo_bytes)
{
// There are extra bytes in the FIFO just flush them
regs->rxc |= USB_USB_RXC1_REG_USB_FLUSH_Msk;
fifo_bytes = 0;
}
dcd_event_xfer_complete(0, xfer->ep_addr, xfer->transferred, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(0, xfer->ep_addr, xfer->transferred, XFER_RESULT_SUCCESS, true);
} }
else else
@ -632,6 +641,13 @@ static void handle_epx_tx_ev(xfer_ctl_t *xfer)
return; return;
} }
} }
else if (regs->epc_in & USB_USB_EPC1_REG_USB_STALL_Msk)
{
// TX_DONE also indicates that STALL packet was just sent, there is
// no point to put anything into transmit FIFO. It could result in
// empty packet being scheduled.
return;
}
} }
if (txs & USB_USB_TXS1_REG_USB_TX_URUN_Msk) if (txs & USB_USB_TXS1_REG_USB_TX_URUN_Msk)
{ {