kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed various small problems and inaccuracies regarding ISOCHRONOUS endpoint

This commit is contained in:
Simon Kueppers 2022-10-31 13:42:52 +01:00 committed by Mengsk
parent b4b619abd6
commit 9ec21248d7
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,7 +506,6 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
{ {
uint32_t EPindex = wIstr & USB_ISTR_EP_ID; uint32_t EPindex = wIstr & USB_ISTR_EP_ID;
uint32_t wEPRegVal = pcd_get_endpoint(USB, EPindex); uint32_t wEPRegVal = pcd_get_endpoint(USB, EPindex);
uint32_t count = pcd_get_ep_rx_cnt(USB,EPindex);
uint8_t ep_addr = wEPRegVal & USB_EPADDR_FIELD; uint8_t ep_addr = wEPRegVal & USB_EPADDR_FIELD;
xfer_ctl_t *xfer = xfer_ctl_ptr(ep_addr); xfer_ctl_t *xfer = xfer_ctl_ptr(ep_addr);
@ -518,11 +517,12 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
return; return;
} }
if((EPindex == 0U) && ((wEPRegVal & USB_EP_SETUP) != 0U)) /* Setup packet */ if((ep_addr == 0U) && ((wEPRegVal & USB_EP_SETUP) != 0U)) /* Setup packet */
{ {
// The setup_received function uses memcpy, so this must first copy the setup data into // The setup_received function uses memcpy, so this must first copy the setup data into
// user memory, to allow for the 32-bit access that memcpy performs. // user memory, to allow for the 32-bit access that memcpy performs.
uint8_t userMemBuf[8]; uint8_t userMemBuf[8];
uint32_t count = pcd_get_ep_rx_cnt(USB, EPindex);
/* Get SETUP Packet*/ /* Get SETUP Packet*/
if(count == 8) // Setup packet should always be 8 bytes. If not, ignore it, and try again. if(count == 8) // Setup packet should always be 8 bytes. If not, ignore it, and try again.
{ {
@ -535,8 +535,16 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
} }
else else
{ {
uint32_t count;
/* Read from correct register when ISOCHRONOUS (double buffered) */
if ( (wEPRegVal & USB_EP_DTOG_RX) && ( (wEPRegVal & USB_EP_TYPE_MASK) == USB_EP_ISOCHRONOUS) ) {
count = pcd_get_ep_tx_cnt(USB, EPindex);
} else {
count = pcd_get_ep_rx_cnt(USB, EPindex);
}
// Clear RX CTR interrupt flag // Clear RX CTR interrupt flag
if(EPindex != 0u) if(ep_addr != 0u)
{ {
pcd_clear_rx_ep_ctr(USB, EPindex); pcd_clear_rx_ep_ctr(USB, EPindex);
} }
@ -579,7 +587,7 @@ static void dcd_ep_ctr_rx_handler(uint32_t wIstr)
// For EP0, prepare to receive another SETUP packet. // For EP0, prepare to receive another SETUP packet.
// Clear CTR last so that a new packet does not overwrite the packing being read. // Clear CTR last so that a new packet does not overwrite the packing being read.
// (Based on the docs, it seems SETUP will always be accepted after CTR is cleared) // (Based on the docs, it seems SETUP will always be accepted after CTR is cleared)
if(EPindex == 0u) if(ep_addr == 0u)
{ {
// Always be prepared for a status packet... // Always be prepared for a status packet...
pcd_set_ep_rx_bufsize(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE); pcd_set_ep_rx_bufsize(USB, EPindex, CFG_TUD_ENDPOINT0_SIZE);

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

@ -223,16 +223,17 @@ static inline uint32_t pcd_get_ep_rx_cnt(USB_TypeDef * USBx, uint32_t bEpNum)
* @param wNBlocks no. of Blocks. * @param wNBlocks no. of Blocks.
* @retval None * @retval None
*/ */
static inline void pcd_set_ep_cnt_rx_reg(__O uint16_t * pdwReg, size_t wCount) static inline void pcd_set_ep_cnt_reg(__O uint16_t * pdwReg, size_t wCount)
{ {
/* We assume that the buffer size is already aligned to hardware requirements. */ /* We assume that the buffer size is already aligned to hardware requirements. */
uint16_t blocksize = (wCount > 62) ? 1 : 0; uint16_t blocksize = (wCount > 62) ? 1 : 0;
uint16_t numblocks = wCount / (blocksize ? 32 : 2); uint16_t numblocks = wCount / (blocksize ? 32 : 2);
/* There should be no remainder in the above calculation */ /* There should be no remainder in the above calculation */
TU_VERIFY((wCount - (numblocks * (blocksize ? 32 : 2))) == 0, /**/); TU_ASSERT((wCount - (numblocks * (blocksize ? 32 : 2))) == 0, /**/);
*pdwReg = (blocksize << 15) | (numblocks << 10); /* Encode into register. When BLSIZE==1, we need to substract 1 block count */
*pdwReg = (blocksize << 15) | ((numblocks - blocksize) << 10);
} }
/** /**
@ -294,7 +295,7 @@ static inline void pcd_set_ep_rx_bufsize(USB_TypeDef * USBx, uint32_t bEpNum, u
{ {
__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); wCount = pcd_aligned_buffer_size(wCount);
pcd_set_ep_cnt_rx_reg(pdwReg, wCount); pcd_set_ep_cnt_reg(pdwReg, wCount);
} }
/** /**