ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert to original fix concentrating on type correctness

pull/6697/head
Paul Thompson 2018-04-12 10:09:53 -07:00 committed by adbridge
parent d224665519
commit 7166aa7baf
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_pcd.c
View File

@ -1298,56 +1298,53 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd)
*/
static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t epnum)
{
USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;
USB_OTG_EPTypeDef *ep;
uint32_t len;
uint32_t len32b;
uint32_t fifoemptymsk = 0U;
USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;
USB_OTG_EPTypeDef *ep;
uint32_t len;
int32_t ilen;
uint32_t len32b;
uint32_t fifoemptymsk = 0;
ep = &hpcd->IN_ep[epnum];
ep = &hpcd->IN_ep[epnum];
ilen = ep->xfer_len - ep->xfer_count;
len = ilen;
if (ep->xfer_len >= ep->xfer_count)
if ((ilen > 0) && (len > ep->maxpacket))
{
len = ep->maxpacket;
}
len32b = (len + 3) / 4;
while ( (USBx_INEP(epnum)->DTXFSTS & USB_OTG_DTXFSTS_INEPTFSAV) > len32b &&
ep->xfer_count < ep->xfer_len &&
ep->xfer_len != 0)
{
/* Write the FIFO */
ilen = ep->xfer_len - ep->xfer_count;
len = ilen;
if ((ilen > 0) && (len > ep->maxpacket))
{
len = ep->xfer_len - ep->xfer_count;
if (len > ep->maxpacket)
{
len = ep->maxpacket;
}
len32b = (len + 3U) / 4U;
while (((USBx_INEP(epnum)->DTXFSTS & USB_OTG_DTXFSTS_INEPTFSAV) > len32b) &&
(ep->xfer_count < ep->xfer_len) &&
(ep->xfer_len != 0U))
{
/* Write the FIFO */
if (ep->xfer_len >= ep->xfer_count)
{
len = ep->xfer_len - ep->xfer_count;
if (len > ep->maxpacket)
{
len = ep->maxpacket;
}
len32b = (len + 3U) / 4U;
USB_WritePacket(USBx, ep->xfer_buff, epnum, len, hpcd->Init.dma_enable);
ep->xfer_buff += len;
ep->xfer_count += len;
}
}
}
else
{
fifoemptymsk = 0x1U << epnum;
/* MBED */
atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK, fifoemptymsk);
/* MBED */
len = ep->maxpacket;
}
len32b = (len + 3) / 4;
return HAL_OK;
USB_WritePacket(USBx, ep->xfer_buff, epnum, len, hpcd->Init.dma_enable);
ep->xfer_buff += len;
ep->xfer_count += len;
}
if(ilen <= 0)
{
fifoemptymsk = 0x1 << epnum;
atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK, fifoemptymsk); // MBED: changed
}
return HAL_OK;
}
/**