usb: device_next: allow vendor request support to be disabled

Disabling it if not needed can save about 100 bytes of flash memory.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

include/zephyr/usb/usbd.h

@@ -688,12 +688,16 @@ static inline void *usbd_class_get_private(const struct usbd_class_data *const c
 /**
  * @brief Define a vendor request with recipient device
  *
+ * @note It requires Kconfig options USBD_VREQ_SUPPORT to be enabled.
+ *
  * @param name      Vendor request identifier
  * @param vcode     Vendor request code
  * @param vto_host  Vendor callback for to-host direction request
  * @param vto_dev   Vendor callback for to-device direction request
  */
 #define USBD_VREQUEST_DEFINE(name, vcode, vto_host, vto_dev)			\
+	BUILD_ASSERT(IS_ENABLED(CONFIG_USBD_VREQ_SUPPORT),			\
+		     "USB device vendor request support is disabled");		\
 	static struct usbd_vreq_node name = {					\
 		.code = vcode,							\
 		.to_host = vto_host,						\
@@ -709,6 +713,9 @@ static inline void *usbd_class_get_private(const struct usbd_class_data *const c
  * USBD_DESC_BOS_VREQ_DEFINE(bos_vreq_webusb, sizeof(bos_cap_webusb), &bos_cap_webusb,
  *                           SAMPLE_WEBUSB_VENDOR_CODE, webusb_to_host_cb, NULL);
  *
+ * @note It requires Kconfig options USBD_VREQ_SUPPORT and USBD_BOS_SUPPORT to
+ *       be enabled.
+ *
  * @param name      Descriptor node identifier
  * @param len       Device Capability descriptor length
  * @param subset    Pointer to a Device Capability descriptor

subsys/usb/device_next/Kconfig

@@ -43,6 +43,13 @@ config USBD_BOS_SUPPORT
 	  BOS support can be disabled if the application does not use a BOS
 	  descriptor.
 
+config USBD_VREQ_SUPPORT
+	bool "USB device vendor request support"
+	default y
+	help
+	  Allow the application to register a handler for the vendor request
+	  with the recipient device.
+
 config USBD_SHELL
 	bool "USB device shell"
 	depends on SHELL

subsys/usb/device_next/usbd_ch9.c

@@ -940,6 +940,11 @@ static int vendor_device_request(struct usbd_context *const uds_ctx,
 	struct usb_setup_packet *setup = usbd_get_setup_pkt(uds_ctx);
 	struct usbd_vreq_node *vreq_nd;
 
+	if (!IS_ENABLED(CONFIG_USBD_VREQ_SUPPORT)) {
+		errno = -ENOTSUP;
+		return 0;
+	}
+
 	vreq_nd = usbd_device_get_vreq(uds_ctx, setup->bRequest);
 	if (vreq_nd == NULL) {
 		errno = -ENOTSUP;

subsys/usb/device_next/usbd_desc.c

@@ -145,7 +145,8 @@ int usbd_add_descriptor(struct usbd_context *const uds_ctx,
 
 	if (IS_ENABLED(CONFIG_USBD_BOS_SUPPORT) &&
 	    desc_nd->bDescriptorType == USB_DESC_BOS) {
-		if (desc_nd->bos.utype == USBD_DUT_BOS_VREQ) {
+		if (IS_ENABLED(CONFIG_USBD_VREQ_SUPPORT) &&
+		    desc_nd->bos.utype == USBD_DUT_BOS_VREQ) {
 			ret =  usbd_device_register_vreq(uds_ctx, desc_nd->bos.vreq_nd);
 			if (ret) {
 				goto add_descriptor_error;

subsys/usb/device_next/usbd_device.c

@@ -364,6 +364,10 @@ int usbd_device_register_vreq(struct usbd_context *const uds_ctx,
 {
 	int ret = 0;
 
+	if (!IS_ENABLED(CONFIG_USBD_VREQ_SUPPORT)) {
+		return -ENOTSUP;
+	}
+
 	usbd_device_lock(uds_ctx);
 
 	if (usbd_is_initialized(uds_ctx)) {