stm32/usbdev: Optionally pass through vendor requests to Setup function.

dpgeorge · dpgeorge · commit 7cf1118831e7 · 2023-12-20T17:25:10.000+11:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
@@ -49,6 +49,11 @@
 #endif
 #define USBD_DEBUG_LEVEL                      0
 
+// Whether the core USBD driver passes through vendor device requests to the class implementation.
+#ifndef USBD_ENABLE_VENDOR_DEVICE_REQUESTS
+#define USBD_ENABLE_VENDOR_DEVICE_REQUESTS    (0)
+#endif
+
 // For MCUs with a device-only USB peripheral
 #define USBD_PMA_RESERVE                      (64)
 #define USBD_PMA_NUM_FIFO                     (16) // Maximum 8 endpoints, 2 FIFOs each
diff --git a/ports/stm32/usbdev/core/src/usbd_ctlreq.c b/ports/stm32/usbdev/core/src/usbd_ctlreq.c
@@ -120,6 +120,14 @@ USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType
 {
   USBD_StatusTypeDef ret = USBD_OK;
 
+  #if USBD_ENABLE_VENDOR_DEVICE_REQUESTS
+  // Pass through vendor device requests directly to the implementation.
+  // It must call `USBD_CtlError(pdev, req);` if it does not respond to the request.
+  if ((req->bmRequest & 0xe0) == 0xc0) {
+    return pdev->pClass->Setup (pdev, req);
+  }
+  #endif
+
   switch (req->bRequest)
   {
   case USB_REQ_GET_DESCRIPTOR:

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,14 @@ USBD_StatusTypeDef USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqType`
`120`	`120`	`{`
`121`	`121`	`USBD_StatusTypeDef ret = USBD_OK;`
`122`	`122`
	`123`	`+ #if USBD_ENABLE_VENDOR_DEVICE_REQUESTS`
	`124`	`+ // Pass through vendor device requests directly to the implementation.`
	`125`	+ // It must call `USBD_CtlError(pdev, req);` if it does not respond to the request.
	`126`	`+ if ((req->bmRequest & 0xe0) == 0xc0) {`
	`127`	`+ return pdev->pClass->Setup (pdev, req);`
	`128`	`+ }`
	`129`	`+ #endif`
	`130`	`+`
`123`	`131`	`switch (req->bRequest)`
`124`	`132`	`{`
`125`	`133`	`case USB_REQ_GET_DESCRIPTOR:`