USB: update core and class files after middleware update

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

Author: fpistm

cores/arduino/stm32/usb/cdc/usbd_cdc.c

@@ -38,6 +38,7 @@ extern "C" {
   * @{
   */
 
+
 /** @defgroup usbd_cdc_Exported_Defines
   * @{
   */
@@ -58,6 +59,7 @@ extern "C" {
 #define CDC_DATA_FS_IN_PACKET_SIZE                  CDC_DATA_FS_MAX_PACKET_SIZE
 #define CDC_DATA_FS_OUT_PACKET_SIZE                 CDC_DATA_FS_MAX_PACKET_SIZE
 
+#define CDC_REQ_MAX_DATA_SIZE                       0x7U
 /*---------------------------------------------------------------------*/
 /*  CDC definitions                                                    */
 /*---------------------------------------------------------------------*/
@@ -100,7 +102,7 @@ typedef struct _USBD_CDC_Itf {
 
 
 typedef struct {
-  uint32_t data[CDC_DATA_HS_MAX_PACKET_SIZE / 4U];      /* Force 32bits alignment */
+  uint32_t data[CDC_DATA_HS_MAX_PACKET_SIZE / 4U];      /* Force 32-bit alignment */
   uint8_t  CmdOpCode;
   uint8_t  CmdLength;
   uint8_t  *RxBuffer;
@@ -126,25 +128,25 @@ typedef struct {
   * @{
   */
 
-extern USBD_ClassTypeDef  USBD_CDC;
-#define USBD_CDC_CLASS    &USBD_CDC
+extern USBD_ClassTypeDef USBD_CDC;
+#define USBD_CDC_CLASS &USBD_CDC
 /**
   * @}
   */
 
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */
-uint8_t  USBD_CDC_RegisterInterface(USBD_HandleTypeDef   *pdev,
-                                    USBD_CDC_ItfTypeDef *fops);
+uint8_t USBD_CDC_RegisterInterface(USBD_HandleTypeDef *pdev,
+                                   USBD_CDC_ItfTypeDef *fops);
 
-uint8_t  USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
-                              uint32_t length);
+uint8_t USBD_CDC_SetTxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff,
+                             uint32_t length);
 
-uint8_t  USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
-uint8_t  USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev);
-uint8_t  USBD_CDC_ClearBuffer(USBD_HandleTypeDef *pdev);
-uint8_t  USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_SetRxBuffer(USBD_HandleTypeDef *pdev, uint8_t *pbuff);
+uint8_t USBD_CDC_ReceivePacket(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_ClearBuffer(USBD_HandleTypeDef *pdev);
+uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev);
 /**
   * @}
   */

cores/arduino/stm32/usb/cdc/usbd_cdc.h

@@ -243,7 +243,7 @@ static int8_t USBD_CDC_Receive(uint8_t *Buf, uint32_t *Len)
 
 /**
   * @brief  USBD_CDC_TransmitCplt
-  *         Data transmited callback
+  *         Data transmitted callback
   *
   *         @note
   *         This function is IN transfer complete callback used to inform user that

cores/arduino/stm32/usb/cdc/usbd_cdc_if.c

@@ -633,7 +633,7 @@ uint8_t USBD_LL_IsStallEP(USBD_HandleTypeDef *pdev, uint8_t ep_addr)
 /**
   * @brief  Assigns a USB address to the device.
   * @param  pdev: Device handle
-  * @param  ep_addr: Endpoint Number
+  * @param  dev_addr: Endpoint Number
   * @retval USBD Status
   */
 USBD_StatusTypeDef USBD_LL_SetUSBAddress(USBD_HandleTypeDef *pdev, uint8_t dev_addr)

cores/arduino/stm32/usb/hid/usbd_hid_composite.c

@@ -83,122 +83,219 @@ extern "C" {
 #endif
 
 #ifndef USBD_MAX_NUM_INTERFACES
-#define USBD_MAX_NUM_INTERFACES             2U
+#define USBD_MAX_NUM_INTERFACES                     2U
 #endif /* USBD_MAX_NUM_INTERFACES */
 
 #ifndef USBD_MAX_NUM_CONFIGURATION
-#define USBD_MAX_NUM_CONFIGURATION          1U
+#define USBD_MAX_NUM_CONFIGURATION                  1U
 #endif /* USBD_MAX_NUM_CONFIGURATION */
 
 #ifndef USBD_MAX_STR_DESC_SIZ
-#define USBD_MAX_STR_DESC_SIZ               0x100U
+#define USBD_MAX_STR_DESC_SIZ                       0x100U
 #endif /* USBD_MAX_STR_DESC_SIZ */
 
 #ifndef USBD_SELF_POWERED
-#define USBD_SELF_POWERED                   1U
+#define USBD_SELF_POWERED                           1U
 #endif /* USBD_SELF_POWERED */
 
 #ifndef USBD_DEBUG_LEVEL
-#define USBD_DEBUG_LEVEL                    0U
+#define USBD_DEBUG_LEVEL                            0U
 #endif /* USBD_DEBUG_LEVEL */
 
 /* ECM, RNDIS, DFU Class Config */
 #ifndef USBD_SUPPORT_USER_STRING_DESC
-#define USBD_SUPPORT_USER_STRING_DESC       0U
+#define USBD_SUPPORT_USER_STRING_DESC               0U
 #endif /* USBD_SUPPORT_USER_STRING_DESC */
 
 /* BillBoard Class Config */
 #ifndef USBD_CLASS_USER_STRING_DESC
-#define USBD_CLASS_USER_STRING_DESC         1U
+#define USBD_CLASS_USER_STRING_DESC                 1U
 #endif /* USBD_CLASS_USER_STRING_DESC */
 
 #ifndef USBD_CLASS_BOS_ENABLED
-#define USBD_CLASS_BOS_ENABLED              0U
+#define USBD_CLASS_BOS_ENABLED                      0U
 #endif /* USBD_CLASS_BOS_ENABLED */
 
 #ifndef USB_BB_MAX_NUM_ALT_MODE
-#define USB_BB_MAX_NUM_ALT_MODE             0x2U
+#define USB_BB_MAX_NUM_ALT_MODE                     0x2U
 #endif /* USB_BB_MAX_NUM_ALT_MODE */
 
 /* MSC Class Config */
 #ifndef MSC_MEDIA_PACKET
-#define MSC_MEDIA_PACKET                    8192U
+#define MSC_MEDIA_PACKET                            8192U
 #endif /* MSC_MEDIA_PACKET */
 
 /* CDC Class Config */
 #ifndef USBD_CDC_INTERVAL
-#define USBD_CDC_INTERVAL                   2000U
+#define USBD_CDC_INTERVAL                           2000U
 #endif /* USBD_CDC_INTERVAL */
 
 /* DFU Class Config */
 #ifndef USBD_DFU_MAX_ITF_NUM
-#define USBD_DFU_MAX_ITF_NUM                1U
+#define USBD_DFU_MAX_ITF_NUM                        1U
 #endif /* USBD_DFU_MAX_ITF_NUM */
 #ifndef USBD_DFU_XFERS_IZE
-#define USBD_DFU_XFERS_IZE                  1024U
+#define USBD_DFU_XFERS_IZE                          1024U
 #endif /* USBD_DFU_XFERS_IZE */
 
 /* AUDIO Class Config */
 #ifndef USBD_AUDIO_FREQ
-#define USBD_AUDIO_FREQ                     22100U
+#define USBD_AUDIO_FREQ                             22100U
 #endif /* USBD_AUDIO_FREQ */
 
+/* CustomHID Class Config */
+#ifndef CUSTOM_HID_HS_BINTERVAL
+#define CUSTOM_HID_HS_BINTERVAL                     0x05U
+#endif /* CUSTOM_HID_HS_BINTERVAL */
+#ifndef CUSTOM_HID_FS_BINTERVAL
+#define CUSTOM_HID_FS_BINTERVAL                     0x05U
+#endif /* CUSTOM_HID_FS_BINTERVAL */
+#ifndef USBD_CUSTOMHID_OUTREPORT_BUF_SIZE
+#define USBD_CUSTOMHID_OUTREPORT_BUF_SIZE           0x02U
+#endif /* USBD_CUSTOMHID_OUTREPORT_BUF_SIZE */
+#ifndef USBD_CUSTOM_HID_REPORT_DESC_SIZE
+#define USBD_CUSTOM_HID_REPORT_DESC_SIZE            163U
+#endif /* USBD_CUSTOM_HID_REPORT_DESC_SIZE */
+
+/* VIDEO Class Config */
+#ifndef UVC_1_1
+#define UVC_1_1 /* #define UVC_1_0 */
+#endif /* UVC_1_1 */
+
+/* To be used only with YUY2 and NV12 Video format, shouldn't be defined for MJPEG format */
+#ifndef USBD_UVC_FORMAT_UNCOMPRESSED
+#define USBD_UVC_FORMAT_UNCOMPRESSED
+#endif /* USBD_UVC_FORMAT_UNCOMPRESSED */
+
+#ifdef USBD_UVC_FORMAT_UNCOMPRESSED
+#ifndef UVC_BITS_PER_PIXEL
+#define UVC_BITS_PER_PIXEL                          12U
+#endif /* UVC_BITS_PER_PIXEL */
+#ifndef UVC_UNCOMPRESSED_GUID
+#define UVC_UNCOMPRESSED_GUID                       UVC_GUID_NV12 /* UVC_GUID_YUY2 */
+#endif /* UVC_UNCOMPRESSED_GUID */
+
+/* refer to Table 3-18 Color Matching Descriptor video class v1.1 */
+#ifndef UVC_COLOR_PRIMARIE
+#define UVC_COLOR_PRIMARIE                          0x01U
+#endif /* UVC_COLOR_PRIMARIE */
+#ifndef UVC_TFR_CHARACTERISTICS
+#define UVC_TFR_CHARACTERISTICS                     0x01U
+#endif /* UVC_TFR_CHARACTERISTICS */
+#ifndef UVC_MATRIX_COEFFICIENTS
+#define UVC_MATRIX_COEFFICIENTS                     0x04U
+#endif /* UVC_MATRIX_COEFFICIENTS */
+#endif
+
+/* Video Stream frame width and height */
+#ifndef UVC_WIDTH
+#define UVC_WIDTH                                   176U
+#endif /* UVC_WIDTH */
+#ifndef UVC_HEIGHT
+#define UVC_HEIGHT                                  144U
+#endif /* UVC_HEIGHT */
+
+/* bEndpointAddress in Endpoint Descriptor */
+#ifndef UVC_IN_EP
+#define UVC_IN_EP                                   0x81U
+#endif /* UVC_IN_EP */
+
+#ifndef UVC_CAM_FPS_FS
+#define UVC_CAM_FPS_FS                              10U
+#endif /* UVC_CAM_FPS_FS */
+#ifndef UVC_CAM_FPS_HS
+#define UVC_CAM_FPS_HS                              5U
+#endif /* UVC_CAM_FPS_HS */
+
+#ifndef UVC_ISO_HS_MPS
+#define UVC_ISO_FS_MPS                              512U
+#endif /* UVC_ISO_HS_MPS */
+#ifndef UVC_ISO_HS_MPS
+#define UVC_ISO_HS_MPS                              512U
+#endif /* UVC_ISO_HS_MPS */
+
+#ifndef UVC_PACKET_SIZE
+#define UVC_PACKET_SIZE                             UVC_ISO_FS_MPS
+#endif /* UVC_PACKET_SIZE */
+/* To be used with Device Only IP supporting double buffer mode */
+/* #define UVC_HEADER_PACKET_CNT                     0x02U */
+/* #define UVC_PACKET_SIZE                           (UVC_ISO_FS_MPS * UVC_HEADER_PACKET_CNT) */
+
+#ifndef UVC_MAX_FRAME_SIZE
+#define UVC_MAX_FRAME_SIZE                          (UVC_WIDTH * UVC_HEIGHT * 16U / 8U)
+#endif /* UVC_MAX_FRAME_SIZE */
+
 /* Interrupt priority */
 #ifndef USBD_IRQ_PRIO
-#define USBD_IRQ_PRIO                       1
+#define USBD_IRQ_PRIO                               1
 #endif /* USBD_IRQ_PRIO */
+
 #ifndef USBD_IRQ_SUBPRIO
-#define USBD_IRQ_SUBPRIO                    0
+#define USBD_IRQ_SUBPRIO                            0
 #endif /* USBD_IRQ_SUBPRIO */
 
-/* Memory management macros */
+/* Memory management macros make sure to use static memory allocation */
+/* Currently dynamic memory allocation usage */
+/** Alias for memory allocation. */
 #ifndef USBD_malloc
-#define USBD_malloc               malloc
+#define USBD_malloc         malloc
 #endif /* USBD_malloc */
+
+/** Alias for memory release. */
 #ifndef USBD_free
-#define USBD_free                 free
+#define USBD_free           free
 #endif /* USBD_free */
+
+/** Alias for memory set. */
 #ifndef USBD_memset
-#define USBD_memset               memset
+#define USBD_memset         memset
 #endif /* USBD_memset */
+
+/** Alias for memory copy. */
 #ifndef USBD_memcpy
-#define USBD_memcpy               memcpy
+#define USBD_memcpy         memcpy
 #endif /* USBD_memcpy */
+
+/** Alias for delay. */
 #ifndef USBD_Delay
-#define USBD_Delay                HAL_Delay
+#define USBD_Delay          HAL_Delay
 #endif /* USBD_Delay */
 
 /* DEBUG macros */
 #if (USBD_DEBUG_LEVEL > 0U)
 #define  USBD_UsrLog(...)   do { \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
+                                 printf(__VA_ARGS__); \
+                                 printf("\n"); \
+                               } while (0)
 #else
 #define USBD_UsrLog(...) do {} while (0)
 #endif
 
 #if (USBD_DEBUG_LEVEL > 1U)
 
 #define  USBD_ErrLog(...) do { \
-                            printf("ERROR: ") ; \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
+                               printf("ERROR: ") ; \
+                               printf(__VA_ARGS__); \
+                               printf("\n"); \
+                             } while (0)
 #else
 #define USBD_ErrLog(...) do {} while (0)
 #endif
 
 #if (USBD_DEBUG_LEVEL > 2U)
 #define  USBD_DbgLog(...)   do { \
-                            printf("DEBUG : ") ; \
-                            printf(__VA_ARGS__); \
-                            printf("\n"); \
-} while (0)
+                                 printf("DEBUG : ") ; \
+                                 printf(__VA_ARGS__); \
+                                 printf("\n"); \
+                               } while (0)
 #else
 #define USBD_DbgLog(...) do {} while (0)
 #endif
 
+/* Exported functions -------------------------------------------------------*/
+void *USBD_static_malloc(uint32_t size);
+void USBD_static_free(void *p);
+
 #endif /* USBCON */
 
 #ifdef __cplusplus

cores/arduino/stm32/usb/usbd_conf.c

@@ -257,8 +257,8 @@ __ALIGN_BEGIN  uint8_t USBD_BOSDesc[USB_SIZ_BOS_DESC] __ALIGN_END = {
 
   0x00,                                /* bAlternateMode[0] Index of the Alternate Mode within the SVID as
                                         returned in response to a Discover Modes command. Example:
-                                        0 – first Mode entry
-                                        1 – second mode entry */
+                                        0  first Mode entry
+                                        1  second mode entry */
 
   USBD_BB_ALTMODE0_STRING_INDEX,           /* iAlternateModeString[0]: Index of string descriptor describing protocol.
                                         It is optional to support this string. */
@@ -268,8 +268,8 @@ __ALIGN_BEGIN  uint8_t USBD_BOSDesc[USB_SIZ_BOS_DESC] __ALIGN_END = {
 
   0x01,                                /* bAlternateMode[1] Index of the Alternate Mode within the SVID as
                                         returned in response to a Discover Modes command. Example:
-                                        0 – first Mode entry
-                                        1 – second Mode entry */
+                                        0  first Mode entry
+                                        1  second Mode entry */
 
   USBD_BB_ALTMODE1_STRING_INDEX,           /* iAlternateModeString[1]: Index of string descriptor describing protocol.
                                         It is optional to support this string. */

cores/arduino/stm32/usb/usbd_conf.h

@@ -27,8 +27,8 @@
   /* Exported types ------------------------------------------------------------*/
   /* Exported constants --------------------------------------------------------*/
   #define  DEVICE_ID1                  (UID_BASE)
-  #define  DEVICE_ID2                  (UID_BASE + 0x4)
-  #define  DEVICE_ID3                  (UID_BASE + 0x8)
+  #define  DEVICE_ID2                  (UID_BASE + 0x4U)
+  #define  DEVICE_ID3                  (UID_BASE + 0x8U)
 
   /*
   * USB Billboard Class USER string desc Defines Template
@@ -46,7 +46,7 @@
     #define USBD_BB_ALTMODE1_STR_DESC     (uint8_t *)"STM32 Alternate1 Mode"
   #endif
 
-  #define  USB_SIZ_STRING_SERIAL       0x1A
+  #define  USB_SIZ_STRING_SERIAL       0x1AU
 
   #if (USBD_LPM_ENABLED == 1)
     #define  USB_SIZ_BOS_DESC            0x0CU