mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/usbdev/core: Add state parameter to all callback functions.

Browse Source
This commit is contained in:
Damien George 2017-09-20 17:33:57 +10:00
parent b3b922f177
commit 35e3435f6e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/stm32/usbdev/core/inc/usbd_def.h
View File

@ -168,10 +168,10 @@ typedef struct _Device_cb
uint8_t (*IsoINIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); uint8_t (*IsoINIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
uint8_t (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum); uint8_t (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
uint8_t *(*GetHSConfigDescriptor)(uint16_t *length); uint8_t *(*GetHSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
uint8_t *(*GetFSConfigDescriptor)(uint16_t *length); uint8_t *(*GetFSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
uint8_t *(*GetOtherSpeedConfigDescriptor)(uint16_t *length); uint8_t *(*GetOtherSpeedConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
uint8_t *(*GetDeviceQualifierDescriptor)(uint16_t *length); uint8_t *(*GetDeviceQualifierDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
#if (USBD_SUPPORT_USER_STRING == 1) #if (USBD_SUPPORT_USER_STRING == 1)
uint8_t *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index, uint16_t *length); uint8_t *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index, uint16_t *length);
#endif #endif

8
ports/stm32/usbdev/core/src/usbd_ctlreq.c
View File

@ -336,12 +336,12 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
case USB_DESC_TYPE_CONFIGURATION: case USB_DESC_TYPE_CONFIGURATION:
if(pdev->dev_speed == USBD_SPEED_HIGH ) if(pdev->dev_speed == USBD_SPEED_HIGH )
{ {
pbuf = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(&len); pbuf = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(pdev, &len);
pbuf[1] = USB_DESC_TYPE_CONFIGURATION; pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
} }
else else
{ {
pbuf = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(&len); pbuf = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(pdev, &len);
pbuf[1] = USB_DESC_TYPE_CONFIGURATION; pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
} }
break; break;
@ -387,7 +387,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
if(pdev->dev_speed == USBD_SPEED_HIGH ) if(pdev->dev_speed == USBD_SPEED_HIGH )
{ {
pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(&len); pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(pdev, &len);
break; break;
} }
else else
@ -399,7 +399,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION: case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
if(pdev->dev_speed == USBD_SPEED_HIGH ) if(pdev->dev_speed == USBD_SPEED_HIGH )
{ {
pbuf = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(&len); pbuf = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(pdev, &len);
pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION; pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;
break; break;
} }