stm/stm32-mw-usb-device
1
0
Fork 1
mirror of https://github.com/STMicroelectronics/stm32-mw-usb-device.git synced 2026-04-09 18:55:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Release v2.11.6

Browse Source
This commit is contained in:
slimih
2026-04-08 11:44:17 +01:00
parent 947131e000
commit 2df324bd60
27 changed files with 1297 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/usbd_conf_template.h
View File

@@ -177,8 +177,6 @@ extern "C" {
* @}
*/
/**
* @}
*/

4
Core/Inc/usbd_core.h
View File

@@ -55,13 +55,11 @@ extern "C" {
* @{
*/
/**
* @}
*/
/** @defgroup USBD_CORE_Exported_Macros
* @{
*/
@@ -171,5 +169,3 @@ USBD_DescHeaderTypeDef *USBD_GetNextDesc(uint8_t *pbuf, uint16_t *ptr);
/**
* @}
*/

3
Core/Inc/usbd_ctlreq.h
View File

@@ -53,7 +53,6 @@ extern "C" {
*/
/** @defgroup USBD_REQ_Exported_Macros
* @{
*/
@@ -97,5 +96,3 @@ void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len);
/**
* @}
*/

1
Core/Inc/usbd_def.h
View File

@@ -418,7 +418,6 @@ typedef enum
*/
/** @defgroup USBD_DEF_Exported_Macros
* @{
*/

4
Core/Inc/usbd_ioreq.h
View File

@@ -40,6 +40,7 @@ extern "C" {
/** @defgroup USBD_IOREQ_Exported_Defines
* @{
*/
/**
* @}
*/
@@ -49,13 +50,11 @@ extern "C" {
* @{
*/
/**
* @}
*/
/** @defgroup USBD_IOREQ_Exported_Macros
* @{
*/
@@ -110,4 +109,3 @@ uint32_t USBD_GetRxCount(USBD_HandleTypeDef *pdev, uint8_t ep_addr);
/**
* @}
*/

9
Core/Src/usbd_core.c
View File

@@ -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;

12
Core/Src/usbd_ctlreq.c
View File

@@ -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++;