[USB] Fix EP allocation

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/usb/usbd_conf.c

@@ -30,11 +30,16 @@
 /* Size in words, byte size divided by 2 */
 #define PMA_EP0_OUT_ADDR (8 * 4)
 #define PMA_EP0_IN_ADDR (PMA_EP0_OUT_ADDR + USB_MAX_EP0_SIZE)
+#ifdef USBD_USE_CDC
 #define PMA_CDC_OUT_BASE (PMA_EP0_IN_ADDR + USB_MAX_EP0_SIZE)
 #define PMA_CDC_OUT_ADDR ((PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE) | \
                          (PMA_CDC_OUT_BASE << 16U))
 #define PMA_CDC_IN_ADDR (PMA_CDC_OUT_BASE + USB_FS_MAX_PACKET_SIZE * 2)
 #define PMA_CDC_CMD_ADDR (PMA_CDC_IN_ADDR + USB_FS_MAX_PACKET_SIZE)
+#elif USBD_USE_HID_COMPOSITE
+#define PMA_HID_MOUSE_IN_ADDR (PMA_EP0_IN_ADDR + 4)
+#define PMA_HID_KBD_IN_ADDR (PMA_EP0_IN_ADDR + 8)
+#endif
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 PCD_HandleTypeDef g_hpcd;
@@ -516,19 +521,30 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev)
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x80);
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0x40);
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 2, 0x160);
+#ifdef USBD_USE_CDC
+  HAL_PCDEx_SetTxFiFo(&g_hpcd, 3, 0x40);
+#endif
 #else /* USE_USB_FS */
 #ifdef USB_OTG_FS
   /* configure EPs FIFOs */
   HAL_PCDEx_SetRxFiFo(&g_hpcd, 0x80);
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 0, 0x40);
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 1, 0x40);
   HAL_PCDEx_SetTxFiFo(&g_hpcd, 2, 0x40);
+#ifdef USBD_USE_CDC
+  HAL_PCDEx_SetTxFiFo(&g_hpcd, 3, 0x40);
+#endif
 #else
   HAL_PCDEx_PMAConfig(&g_hpcd, 0x00, PCD_SNG_BUF, PMA_EP0_OUT_ADDR);
   HAL_PCDEx_PMAConfig(&g_hpcd, 0x80, PCD_SNG_BUF, PMA_EP0_IN_ADDR);
+#ifdef USBD_USE_CDC
   HAL_PCDEx_PMAConfig(&g_hpcd, 0x01, PCD_DBL_BUF, PMA_CDC_OUT_ADDR);
   HAL_PCDEx_PMAConfig(&g_hpcd, 0x82, PCD_SNG_BUF, PMA_CDC_IN_ADDR);
   HAL_PCDEx_PMAConfig(&g_hpcd, 0x83, PCD_SNG_BUF, PMA_CDC_CMD_ADDR);
+#elif USBD_USE_HID_COMPOSITE
+  HAL_PCDEx_PMAConfig(&g_hpcd, 0x81, PCD_SNG_BUF, PMA_HID_MOUSE_IN_ADDR);
+  HAL_PCDEx_PMAConfig(&g_hpcd, 0x81, PCD_SNG_BUF, PMA_HID_KBD_IN_ADDR);
+#endif
 #endif
 #endif /* USE_USB_HS */
   return USBD_OK;