mirror of
https://github.com/STMicroelectronics/stm32-mw-usb-device.git
synced 2026-04-09 18:55:40 -04:00
Release v2.11.6
This commit is contained in:
@@ -105,21 +105,22 @@ USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev,
|
||||
|
||||
#ifdef USE_USBD_COMPOSITE
|
||||
/* Parse the table of classes in use */
|
||||
for (uint32_t i = 0; i < USBD_MAX_SUPPORTED_CLASS; i++)
|
||||
for (uint32_t i = 0U; i < USBD_MAX_SUPPORTED_CLASS; i++)
|
||||
{
|
||||
/* Unlink previous class*/
|
||||
pdev->pClass[i] = NULL;
|
||||
pdev->pUserData[i] = NULL;
|
||||
|
||||
/* Set class as inactive */
|
||||
pdev->tclasslist[i].Active = 0;
|
||||
pdev->NumClasses = 0;
|
||||
pdev->classId = 0;
|
||||
pdev->tclasslist[i].Active = 0U;
|
||||
pdev->NumClasses = 0U;
|
||||
pdev->classId = 0U;
|
||||
}
|
||||
#else
|
||||
/* Unlink previous class*/
|
||||
pdev->pClass[0] = NULL;
|
||||
pdev->pUserData[0] = NULL;
|
||||
pdev->NumClasses = 0U;
|
||||
#endif /* USE_USBD_COMPOSITE */
|
||||
|
||||
pdev->pConfDesc = NULL;
|
||||
|
||||
@@ -361,6 +361,12 @@ USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
|
||||
break;
|
||||
|
||||
case USBD_STATE_CONFIGURED:
|
||||
if ((ep_addr & 0x7FU) > 0x0FU)
|
||||
{
|
||||
USBD_CtlError(pdev, req);
|
||||
break;
|
||||
}
|
||||
|
||||
if ((ep_addr & 0x80U) == 0x80U)
|
||||
{
|
||||
if (pdev->ep_in[ep_addr & 0xFU].is_used == 0U)
|
||||
@@ -378,8 +384,8 @@ USBD_StatusTypeDef USBD_StdEPReq(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef
|
||||
}
|
||||
}
|
||||
|
||||
pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0x7FU] : \
|
||||
&pdev->ep_out[ep_addr & 0x7FU];
|
||||
pep = ((ep_addr & 0x80U) == 0x80U) ? &pdev->ep_in[ep_addr & 0xFU] : \
|
||||
&pdev->ep_out[ep_addr & 0xFU];
|
||||
|
||||
if ((ep_addr == 0x00U) || (ep_addr == 0x80U))
|
||||
{
|
||||
@@ -1011,7 +1017,7 @@ void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)
|
||||
unicode[idx] = USB_DESC_TYPE_STRING;
|
||||
idx++;
|
||||
|
||||
while (*pdesc != (uint8_t)'\0')
|
||||
while ((*pdesc != (uint8_t)'\0') && (idx < *len))
|
||||
{
|
||||
unicode[idx] = *pdesc;
|
||||
pdesc++;
|
||||
|
||||
Reference in New Issue
Block a user