add zephyr twister test for USB device level testing

Signed-off-by: Benedek Kupper <kupper.benedek@gmail.com>

Author: benedekkupper

.github/workflows/zephyr.yml

@@ -38,6 +38,16 @@ jobs:
         with:
           manifest: west4nrfsdk.yml
 
+      - name: Run USB virtual-device tests
+        working-directory: zephyr/tests
+        shell: bash
+        run: |
+          west twister \
+            -T usb/device_virtual \
+            -p native_sim/native/64 \
+            --inline-logs \
+            -v
+
       - name: Build ble-keyboard firmware
         working-directory: zephyr/examples/ble-keyboard
         shell: bash

c2usb/CMakeLists.txt

@@ -38,7 +38,7 @@ CPMAddPackage("gh:Neargye/magic_enum@0.9.3")
 include(../cmake/get_cpm.cmake)
 if(ZEPHYR_HID_RP_MODULE_DIR OR MCUX_HID_RP_MODULE_DIR)
 else()
-    CPMAddPackage("gh:IntergatedCircuits/hid-rp#1cf78a8905c13e3670fe4999523cb04ad01f18ee")
+    CPMAddPackage("gh:IntergatedCircuits/hid-rp#770f31f71bf602f6d0a9c387dccd4b54dbe6d7c8")
 endif()
 
 if(ZEPHYR_ETL_MODULE_DIR OR MCUX_ETL_MODULE_DIR)

c2usb/port/zephyr/Kconfig.shell

@@ -1,6 +1,7 @@
 
 menuconfig SHELL_BACKEND_C2USB
 	bool "c2usb shell backend"
+	depends on SHELL
 	help
 	  Build c2usb shell backend.
 

c2usb/port/zephyr/udc_mac.hpp

@@ -26,6 +26,16 @@ namespace usb::zephyr
 class udc_mac : public df::mac
 {
   public:
+    static constexpr usb::speeds supported_speeds()
+    {
+#if !defined(CONFIG_UDC_DRIVER_HIGH_SPEED_SUPPORT_ENABLED) ||                                      \
+    !defined(CONFIG_UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT)
+        return usb::speeds(usb::speed::FULL);
+#else
+        return usb::speeds(usb::speed::FULL, usb::speed::HIGH);
+#endif
+    }
+
     udc_mac(const ::device* dev, size_t ctrl_ep_buf_size);
     udc_mac(const ::device* dev, size_t ctrl_ep_buf_size, usb::power::state power_state);
     ~udc_mac() override;

c2usb/port/zephyr/usb_shell.cpp

@@ -1,4 +1,5 @@
-#include "port/zephyr/usb_shell.hpp"
+// SPDX-License-Identifier: MPL-2.0
+#include "usb_shell.hpp"
 #include <cassert>
 
 extern "C" const struct shell* c2usb_shell_handle();

c2usb/port/zephyr/usb_shell.hpp

@@ -1,6 +1,5 @@
-#ifndef __USB_SHELL_HPP
-#define __USB_SHELL_HPP
-
+// SPDX-License-Identifier: MPL-2.0
+#pragma once
 #include <atomic>
 #include <optional>
 #include <zephyr/shell/shell.h>
@@ -119,5 +118,3 @@ class usb_shell : public usb::df::cdc::acm::function
 };
 
 } // namespace usb::zephyr
-
-#endif // __USB_SHELL_HPP

c2usb/usb/base.hpp

@@ -58,6 +58,8 @@ struct descriptor : public descriptor_header
     constexpr descriptor(uint8_t length)
         : descriptor_header(length, type())
     {}
+
+    [[nodiscard]] constexpr bool type_valid() const { return (bDescriptorType == type()); }
 };
 
 // TODO: https://github.com/mariusbancila/stduuid

c2usb/usb/control.hpp

@@ -86,10 +86,14 @@ struct request : public request_id
 
     template <typename T>
     constexpr request(usb::direction dir, request_base::type t, request_base::recipient rec, T code,
-                      uint16_t value, uint16_t len = 0, uint16_t index = 0)
+                      uint16_t value, uint16_t index = 0, uint16_t len = 0)
         : request_id(dir, t, rec, code), wValue(value), wIndex(index), wLength(len)
     {}
 
+    constexpr request(request_id id, uint16_t value, uint16_t index = 0, uint16_t len = 0)
+        : request_id(id), wValue(value), wIndex(index), wLength(len)
+    {}
+
     struct splittable_uint16_t : public le_uint16_t
     {
         [[nodiscard]] constexpr uint8_t high_byte() const { return this->storage[1]; }

c2usb/usb/df/class/cdc_acm.cpp

@@ -49,7 +49,7 @@ void function::control_setup_request(message& msg, const config::interface& ifac
 {
     if (!iface.primary())
     {
-        msg.reject();
+        return msg.reject();
     }
 
     using namespace usb::cdc::control;

c2usb/usb/df/ep_flags.hpp

@@ -1,16 +1,5 @@
-/// @file
-///
-/// @author Benedek Kupper
-/// @date   2023
-///
-/// @copyright
-///         This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-///         If a copy of the MPL was not distributed with this file, You can obtain one at
-///         https://mozilla.org/MPL/2.0/.
-///
-#ifndef __USB_DF_EP_FLAGS_HPP_
-#define __USB_DF_EP_FLAGS_HPP_
-
+// SPDX-License-Identifier: MPL-2.0
+#pragma once
 #include <array>
 #include <atomic>
 
@@ -54,5 +43,3 @@ class ep_flags
 };
 
 } // namespace usb::df
-
-#endif // __USB_DF_EP_FLAGS_HPP_