USB composite CustomHID endpoint size configuration problem

[LaurentGolay]

Brief description
USB composite CustomHID wrongly refers endpoint size definitons and mismatch IN and OUT endpoints configuration.

Describe the set-up
The board: (not relevant) custom board with STM32H7B0IBT6 MCU
IDE: (not relevant) STM32CubeIDE 1.16.1, GNU Tools for STM32 11.3rel1.

Describe the bug
USBD_CMPSIT_CUSTOMHIDDesc() in usbd_composite_builder.c uses wrong definition for Out Endpoint size configuration. It uses "CUSTOM_HID_EPIN_SIZE" instead of "CUSTOM_HID_EPOUT_SIZE", which will causes issues if sizes are different.
Similarly, SBD_CMPSIT_AddToConfDesc() function, in CLASS_TYPE_CHID case, refers to CUSTOM_HID_EPOUT_SIZE for both endpoint setting (with USBD_CMPSIT_AssignEp).

How To Reproduce
Configure a composite USB Device that includes a CustomHID interface.
Set different sizes for IN and OUT endpoints.

[ALABSTM]

Hi @LaurentGolay,

Your point looks relevant. It has been forwarded to our development teams. Let's wait for their feedback.

With regards,

[ALABSTM]

ST Internal Reference: 196750

[ALABSTM]

Hi @LaurentGolay,

Issue fixed in version 2.11.4 of the USB Device library, now supported by the STM32CubeH7 firmware. Thank you for having reported.

In function USBD_CMPSIT_AddToConfDesc(), the last argument passed to each one of the USBD_CMPSIT_AssignEp() function calls has been changed, as shown below...

      /* Set IN endpoint slot */
      iEp = pdev->tclasslist[pdev->classId].EpAdd[0];
-      USBD_CMPSIT_AssignEp(pdev, iEp, USBD_EP_TYPE_INTR, pdev->tclasslist[pdev->classId].CurrPcktSze);
+      USBD_CMPSIT_AssignEp(pdev, iEp, USBD_EP_TYPE_INTR,CUSTOM_HID_EPIN_SIZE);

      /* Set OUT endpoint slot */
      iEp = pdev->tclasslist[pdev->classId].EpAdd[1];
-      USBD_CMPSIT_AssignEp(pdev, iEp, USBD_EP_TYPE_INTR, pdev->tclasslist[pdev->classId].CurrPcktSze);
+      USBD_CMPSIT_AssignEp(pdev, iEp, USBD_EP_TYPE_INTR, CUSTOM_HID_EPOUT_SIZE);

Similarly, in USBD_CMPSIT_CUSTOMHIDDesc(), the output endpoint size argument passed to __USBD_CMPSIT_SET_EP() has been changed too.

  /* Append Endpoint descriptor to Configuration descriptor */
  __USBD_CMPSIT_SET_EP(pdev->tclasslist[pdev->classId].Eps[1].add, \
-                       USBD_EP_TYPE_INTR, CUSTOM_HID_EPIN_SIZE, CUSTOM_HID_HS_BINTERVAL, CUSTOM_HID_FS_BINTERVAL);
+                       USBD_EP_TYPE_INTR, CUSTOM_HID_EPOUT_SIZE, CUSTOM_HID_HS_BINTERVAL, CUSTOM_HID_FS_BINTERVAL);

With regards,