tracing: port USB backend to the new USB device stack

Port USB backend to the new USB device stack.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>

Author: jfischer-no

samples/subsys/tracing/CMakeLists.txt

@@ -9,6 +9,7 @@ endif()
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(tracing_tests)
 
+include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
 target_sources(app PRIVATE src/main.c)
 target_sources_ifdef(CONFIG_TRACING_GPIO app PRIVATE src/gpio_main.c)
 target_sources_ifdef(CONFIG_TRACING_USER app PRIVATE src/tracing_user.c)

samples/subsys/tracing/Kconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Source common USB sample options used to initialize new experimental USB
+# device stack. The scope of these options is limited to USB samples in project
+# tree, you cannot use them in your own application.
+source "samples/subsys/usb/common/Kconfig.sample_usbd"
+
+source "Kconfig.zephyr"

samples/subsys/tracing/README.rst

@@ -46,7 +46,7 @@ Build a USB-tracing image with:
 
 .. zephyr-app-commands::
 	:zephyr-app: samples/subsys/tracing
-	:board: sam_e70_xplained/same70q21
+	:board: reel_board
 	:conf: "prj_usb_ctf.conf"
 	:goals: build
 	:compact:
@@ -65,7 +65,7 @@ run the :zephyr_file:`scripts/tracing/trace_capture_usb.py` script on the host:
 
 .. code-block:: console
 
-	sudo python3 trace_capture_usb.py -v 0x2FE9 -p 0x100 -o channel0_0
+	sudo python3 trace_capture_usb.py -v 0x2FE3 -p 0x0001 -o channel0_0
 
 The VID and PID of USB device can be configured, just adjusting it accordingly.
 

samples/subsys/tracing/prj_usb_ctf.conf

@@ -1,7 +1,5 @@
 CONFIG_GPIO=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_VID=0x2FE9
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+CONFIG_USB_DEVICE_STACK_NEXT=y
 
 CONFIG_TRACING=y
 CONFIG_TRACING_CTF=y

samples/subsys/tracing/sample.yaml

@@ -53,8 +53,9 @@ tests:
     extra_args: CONF_FILE="prj_uart_ctf.conf"
     filter: dt_chosen_enabled("zephyr,tracing-uart")
   sample.tracing.transport.usb.ctf:
-    platform_allow: sam_e70_xplained/same70q21
-    depends_on: usb_device
+    integration_platforms:
+      - frdm_k64f
+    depends_on: usbd
     extra_args: CONF_FILE="prj_usb_ctf.conf"
   sample.tracing.transport.native:
     platform_allow:

samples/subsys/tracing/src/main.c

@@ -8,7 +8,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/usb/usb_device.h>
+#include <sample_usbd.h>
 #include <zephyr/tracing/tracing.h>
 
 /*
@@ -93,15 +93,19 @@ void threadA(void *dummy1, void *dummy2, void *dummy3)
 	ARG_UNUSED(dummy2);
 	ARG_UNUSED(dummy3);
 
-#if defined(CONFIG_USB_DEVICE_STACK)
-	int ret;
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+	struct usbd_context *sample_usbd = sample_usbd_init_device(NULL);
 
-	ret = usb_enable(NULL);
-	if (ret) {
+	if (sample_usbd == NULL) {
+		printk("Failed to initialize USB device");
+		return;
+	}
+
+	if (usbd_enable(sample_usbd)) {
 		printk("usb backend enable failed");
 		return;
 	}
-#endif /* CONFIG_USB_DEVICE_STACK */
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
 
 	/* spawn threadB */
 	k_tid_t tid = k_thread_create(&threadB_data, threadB_stack_area,

subsys/tracing/Kconfig

@@ -142,7 +142,7 @@ config TRACING_BACKEND_UART
 
 config TRACING_BACKEND_USB
 	bool "USB backend"
-	depends on USB_DEVICE_STACK
+	depends on USB_DEVICE_STACK_NEXT
 	depends on TRACING_ASYNC
 	help
 	  Use USB to output tracing data.
@@ -178,13 +178,6 @@ config RAM_TRACING_BUFFER_SIZE
 	  Size of the RAM trace buffer. Trace will be discarded if the
 	  length is exceeded.
 
-config TRACING_USB_MPS
-	int "USB backend max packet size"
-	default 64
-	depends on TRACING_BACKEND_USB
-	help
-	  USB tracing backend max packet size(endpoint MPS).
-
 config TRACING_HANDLE_HOST_CMD
 	bool "Host command handle"
 	select UART_INTERRUPT_DRIVEN if TRACING_BACKEND_UART