andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Renamed pcd_set_ep_rx_cnt because it actually sets the maximum buffer size

Browse Source
This commit is contained in:
Simon Kueppers
2022-10-27 18:51:16 +02:00
committed by Mengsk
parent 9a84390878
commit 510720b396
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
View File

@@ -557,9 +557,9 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
{ {
uint32_t remaining = (uint32_t)xfer->total_len - (uint32_t)xfer->queued_len; uint32_t remaining = (uint32_t)xfer->total_len - (uint32_t)xfer->queued_len;
if(remaining >= xfer->max_packet_size) { if(remaining >= xfer->max_packet_size) {
pcd_set_ep_rx_cnt(USB, EPindex,xfer->max_packet_size); pcd_set_ep_rx_bufsize(USB, EPindex,xfer->max_packet_size);
} else { } else {
pcd_set_ep_rx_cnt(USB, EPindex,remaining); pcd_set_ep_rx_bufsize(USB, EPindex,remaining);
} }
pcd_set_ep_rx_status(USB, EPindex, USB_EP_RX_VALID); pcd_set_ep_rx_status(USB, EPindex, USB_EP_RX_VALID);
} }
@@ -571,7 +571,7 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
if(EPindex == 0u) if(EPindex == 0u)
{ {
// Always be prepared for a status packet... // Always be prepared for a status packet...
pcd_set_ep_rx_cnt(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE); pcd_set_ep_rx_bufsize(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE);
pcd_clear_rx_ep_ctr(USB, EPindex); pcd_clear_rx_ep_ctr(USB, EPindex);
} }
} }
@@ -828,7 +828,7 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc
#endif #endif
{ {
*pcd_ep_rx_address_ptr(USB, epnum) = pma_addr; *pcd_ep_rx_address_ptr(USB, epnum) = pma_addr;
pcd_set_ep_rx_cnt(USB, epnum, buffer_size); pcd_set_ep_rx_bufsize(USB, epnum, buffer_size);
pcd_clear_rx_dtog(USB, epnum); pcd_clear_rx_dtog(USB, epnum);
} }
@@ -939,9 +939,9 @@ bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
if(total_bytes > xfer->max_packet_size) if(total_bytes > xfer->max_packet_size)
{ {
pcd_set_ep_rx_cnt(USB,epnum,xfer->max_packet_size); pcd_set_ep_rx_bufsize(USB,epnum,xfer->max_packet_size);
} else { } else {
pcd_set_ep_rx_cnt(USB,epnum,total_bytes); pcd_set_ep_rx_bufsize(USB,epnum,total_bytes);
} }
pcd_set_ep_rx_status(USB, epnum, USB_EP_RX_VALID); pcd_set_ep_rx_status(USB, epnum, USB_EP_RX_VALID);
} }
@@ -969,9 +969,9 @@ bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16
{ {
if(total_bytes > xfer->max_packet_size) if(total_bytes > xfer->max_packet_size)
{ {
pcd_set_ep_rx_cnt(USB,epnum,xfer->max_packet_size); pcd_set_ep_rx_bufsize(USB,epnum,xfer->max_packet_size);
} else { } else {
pcd_set_ep_rx_cnt(USB,epnum,total_bytes); pcd_set_ep_rx_bufsize(USB,epnum,total_bytes);
} }
pcd_set_ep_rx_status(USB, epnum, USB_EP_RX_VALID); pcd_set_ep_rx_status(USB, epnum, USB_EP_RX_VALID);
} }

10
src/portable/st/stm32_fsdev/dcd_stm32_fsdev_pvt_st.h
View File

@@ -276,12 +276,20 @@ static inline __IO uint16_t* pcd_ep_rx_cnt_ptr(USB_TypeDef * USBx, uint32_t bEpN
static inline void pcd_set_ep_tx_cnt(USB_TypeDef * USBx, uint32_t bEpNum, uint32_t wCount) static inline void pcd_set_ep_tx_cnt(USB_TypeDef * USBx, uint32_t bEpNum, uint32_t wCount)
{ {
*pcd_ep_tx_cnt_ptr(USBx, bEpNum) = (uint16_t)wCount; __IO uint16_t * reg = pcd_ep_tx_cnt_ptr(USBx, bEpNum);
*reg = (uint16_t) (*reg & (uint16_t) ~0x3FFU) | (wCount & 0x3FFU);
} }
static inline void pcd_set_ep_rx_cnt(USB_TypeDef * USBx, uint32_t bEpNum, uint32_t wCount) static inline void pcd_set_ep_rx_cnt(USB_TypeDef * USBx, uint32_t bEpNum, uint32_t wCount)
{
__IO uint16_t * reg = pcd_ep_rx_cnt_ptr(USBx, bEpNum);
*reg = (uint16_t) (*reg & (uint16_t) ~0x3FFU) | (wCount & 0x3FFU);
}
static inline void pcd_set_ep_rx_bufsize(USB_TypeDef * USBx, uint32_t bEpNum, uint32_t wCount)
{ {
__IO uint16_t *pdwReg = pcd_ep_rx_cnt_ptr((USBx),(bEpNum)); __IO uint16_t *pdwReg = pcd_ep_rx_cnt_ptr((USBx),(bEpNum));
wCount = pcd_aligned_buffer_size(wCount);
pcd_set_ep_cnt_rx_reg(pdwReg, wCount); pcd_set_ep_cnt_rx_reg(pdwReg, wCount);
} }