diff options
| author | Damien George | 2017-09-05 14:07:16 +1000 |
|---|---|---|
| committer | Damien George | 2017-09-21 21:50:37 +1000 |
| commit | 77e1da40e2fdcef736d05f2646fbaa8abf844543 (patch) | |
| tree | e05f8c78fed2fa8f0c0611ead1b66671e42436c8 /ports/stm32/usbdev/class/src | |
| parent | 980b33177bbb99f4bc6472c24a0cc67bf7760679 (diff) | |
stm32/usbdev: Put all HID state in a struct.
Diffstat (limited to 'ports/stm32/usbdev/class/src')
| -rw-r--r-- | ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c b/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c index 38e5bcbc6..d2daa3aee 100644 --- a/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c +++ b/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c @@ -96,7 +96,6 @@ static uint8_t *hid_desc; static const uint8_t *hid_report_desc; static USBD_StorageTypeDef *MSC_fops; -static USBD_HID_ItfTypeDef *HID_fops; static USBD_CDC_HandleTypeDef CDC_ClassData; static USBD_MSC_BOT_HandleTypeDef MSC_BOT_ClassData; @@ -725,7 +724,7 @@ static uint8_t USBD_CDC_MSC_HID_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx) { USBD_EP_TYPE_INTR, mps_out); - HID_fops->Init(pdev); + usbd_hid_init(state->hid, pdev); // Prepare Out endpoint to receive next packet USBD_LL_PrepareReceive(pdev, hid_out_ep, HID_ClassData.RxBuffer, mps_out); @@ -975,7 +974,7 @@ static uint8_t USBD_CDC_MSC_HID_DataOut(USBD_HandleTypeDef *pdev, uint8_t epnum) return USBD_OK; } else if ((usbd_mode & USBD_MODE_HID) && epnum == (hid_out_ep & 0x7f)) { HID_ClassData.RxLength = USBD_LL_GetRxDataSize(pdev, epnum); - HID_fops->Receive(pdev, HID_ClassData.RxBuffer, HID_ClassData.RxLength); + usbd_hid_receive(state->hid, HID_ClassData.RxLength, HID_ClassData.RxBuffer); } return USBD_OK; @@ -1044,15 +1043,6 @@ uint8_t USBD_MSC_RegisterStorage(USBD_HandleTypeDef *pdev, USBD_StorageTypeDef * } } -uint8_t USBD_HID_RegisterInterface(USBD_HandleTypeDef *pdev, USBD_HID_ItfTypeDef *fops) { - if (fops == NULL) { - return USBD_FAIL; - } else { - HID_fops = fops; - return USBD_OK; - } -} - uint8_t USBD_HID_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff) { HID_ClassData.RxBuffer = pbuff; return USBD_OK; |