mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 15:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

separate flush tx/rx fifo

Browse Source
This commit is contained in:
hathach 2024-04-11 11:02:54 +07:00
parent 03cfe90f3e
commit 79cbe93fcf
No known key found for this signature in database
GPG Key ID: 26FAB84F615C3C52
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/portable/synopsys/dwc2/dcd_dwc2.c
View File

@ -101,19 +101,6 @@ static uint16_t _allocated_fifo_words_tx; // TX FIFO size in words (IN EPs)
// SOF enabling flag - required for SOF to not get disabled in ISR when SOF was enabled by // SOF enabling flag - required for SOF to not get disabled in ISR when SOF was enabled by
static bool _sof_en; static bool _sof_en;
static inline void fifo_flush(uint8_t rhport)
{
dwc2_regs_t* dwc2 = DWC2_REG(rhport);
// flush all TX fifo and wait for it cleared
dwc2->grstctl = GRSTCTL_TXFFLSH | (0x10u << GRSTCTL_TXFNUM_Pos);
while (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) {}
// flush RX fifo and wait for it cleared
dwc2->grstctl = GRSTCTL_RXFFLSH;
while (dwc2->grstctl & GRSTCTL_RXFFLSH_Msk) {}
}
// Calculate the RX FIFO size according to minimum recommendations from reference manual // Calculate the RX FIFO size according to minimum recommendations from reference manual
// RxFIFO = (5 * number of control endpoints + 8) + // RxFIFO = (5 * number of control endpoints + 8) +
// ((largest USB packet used / 4) + 1 for status information) + // ((largest USB packet used / 4) + 1 for status information) +
@ -125,6 +112,17 @@ static inline uint16_t calc_grxfsiz(uint16_t max_ep_size, uint8_t ep_count) {
return 15 + 2 * (max_ep_size / 4) + 2 * ep_count; return 15 + 2 * (max_ep_size / 4) + 2 * ep_count;
} }
TU_ATTR_ALWAYS_INLINE static inline void fifo_flush_tx(dwc2_regs_t* dwc2, uint8_t epnum) {
// flush TX fifo and wait for it cleared
dwc2->grstctl = GRSTCTL_TXFFLSH | (epnum << GRSTCTL_TXFNUM_Pos);
while (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) {}
}
TU_ATTR_ALWAYS_INLINE static inline void fifo_flush_rx(dwc2_regs_t* dwc2) {
// flush RX fifo and wait for it cleared
dwc2->grstctl = GRSTCTL_RXFFLSH;
while (dwc2->grstctl & GRSTCTL_RXFFLSH_Msk) {}
}
static bool fifo_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t packet_size) { static bool fifo_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t packet_size) {
dwc2_regs_t* dwc2 = DWC2_REG(rhport); dwc2_regs_t* dwc2 = DWC2_REG(rhport);
uint8_t const ep_count = _dwc2_controller[rhport].ep_count; uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
@ -238,8 +236,7 @@ static void edpt_disable(uint8_t rhport, uint8_t ep_addr, bool stall) {
} }
// Flush the FIFO, and wait until we have confirmed it cleared. // Flush the FIFO, and wait until we have confirmed it cleared.
dwc2->grstctl = ((epnum << GRSTCTL_TXFNUM_Pos) | GRSTCTL_TXFFLSH); fifo_flush_tx(dwc2, epnum);
while ((dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) != 0) {}
} else { } else {
dwc2_epout_t* epout = dwc2->epout; dwc2_epout_t* epout = dwc2->epout;
@ -283,7 +280,8 @@ static void bus_reset(uint8_t rhport) {
dwc2->epout[n].doepctl |= DOEPCTL_SNAK; dwc2->epout[n].doepctl |= DOEPCTL_SNAK;
} }
fifo_flush(rhport); fifo_flush_tx(dwc2, 0x10); // all tx fifo
fifo_flush_rx(dwc2);
// 2. Set up interrupt mask // 2. Set up interrupt mask
dwc2->daintmsk = TU_BIT(DAINTMSK_OEPM_Pos) | TU_BIT(DAINTMSK_IEPM_Pos); dwc2->daintmsk = TU_BIT(DAINTMSK_OEPM_Pos) | TU_BIT(DAINTMSK_IEPM_Pos);
@ -591,7 +589,8 @@ void dcd_init(uint8_t rhport) {
// (non zero-length packet), send STALL back and discard. // (non zero-length packet), send STALL back and discard.
dwc2->dcfg |= DCFG_NZLSOHSK; dwc2->dcfg |= DCFG_NZLSOHSK;
fifo_flush(rhport); fifo_flush_tx(dwc2, 0x10); // all tx fifo
fifo_flush_rx(dwc2);
// Clear all interrupts // Clear all interrupts
uint32_t int_mask = dwc2->gintsts; uint32_t int_mask = dwc2->gintsts;
@ -714,7 +713,8 @@ void dcd_edpt_close_all(uint8_t rhport) {
// reset allocated fifo IN // reset allocated fifo IN
_allocated_fifo_words_tx = 16; _allocated_fifo_words_tx = 16;
fifo_flush(rhport); fifo_flush_tx(dwc2, 0x10); // all tx fifo
fifo_flush_rx(dwc2);
} }
bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size) { bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size) {