diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-09-20 17:33:57 +1000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-09-21 21:51:02 +1000 |
| commit | 35e3435f6e2ca7494249e781a4fb99bfdf0a039a (patch) | |
| tree | 56bd193c59deedcf30b139d4a76fe777fc7811bb | |
| parent | b3b922f177ee7553b2d06edf7bf3df6c2076b03a (diff) | |
stm32/usbdev/core: Add state parameter to all callback functions.
| -rw-r--r-- | ports/stm32/usbdev/core/inc/usbd_def.h | 8 | ||||
| -rw-r--r-- | ports/stm32/usbdev/core/src/usbd_ctlreq.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ports/stm32/usbdev/core/inc/usbd_def.h b/ports/stm32/usbdev/core/inc/usbd_def.h index 06b57dfd4..bd913a286 100644 --- a/ports/stm32/usbdev/core/inc/usbd_def.h +++ b/ports/stm32/usbdev/core/inc/usbd_def.h @@ -168,10 +168,10 @@ typedef struct _Device_cb uint8_t (*IsoINIncomplete) (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 *(*GetFSConfigDescriptor)(uint16_t *length);
- uint8_t *(*GetOtherSpeedConfigDescriptor)(uint16_t *length);
- uint8_t *(*GetDeviceQualifierDescriptor)(uint16_t *length);
+ uint8_t *(*GetHSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+ uint8_t *(*GetFSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+ uint8_t *(*GetOtherSpeedConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+ uint8_t *(*GetDeviceQualifierDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
#if (USBD_SUPPORT_USER_STRING == 1)
uint8_t *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index, uint16_t *length);
#endif
diff --git a/ports/stm32/usbdev/core/src/usbd_ctlreq.c b/ports/stm32/usbdev/core/src/usbd_ctlreq.c index d744725b2..15d9b6ec4 100644 --- a/ports/stm32/usbdev/core/src/usbd_ctlreq.c +++ b/ports/stm32/usbdev/core/src/usbd_ctlreq.c @@ -336,12 +336,12 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , case USB_DESC_TYPE_CONFIGURATION:
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;
}
else
{
- pbuf = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(&len);
+ pbuf = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(pdev, &len);
pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
}
break;
@@ -387,7 +387,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , if(pdev->dev_speed == USBD_SPEED_HIGH )
{
- pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(&len);
+ pbuf = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(pdev, &len);
break;
}
else
@@ -399,7 +399,7 @@ static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
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;
break;
}
|