samples: dap: use new USB device stack and new DAP backend USB

Rework the sample to use the new USB device stack and the new DAP
backend and align the sample with the WebUSB sample which has a similar
BOS descriptor.

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

Author: jfischer-no

samples/subsys/dap/CMakeLists.txt

@@ -5,5 +5,6 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(dap)
 
+include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})

samples/subsys/dap/Kconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 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/dap/README.rst

@@ -7,7 +7,7 @@ Overview
 ********
 
 This sample app demonstrates use of a SWDP interface driver and CMSIS DAP
-controller through USB Bulk interface.
+controller through DAP USB backend.
 
 Requirements
 ************
@@ -21,8 +21,6 @@ e.g. if the SWD connections are multiplexed.
 Building and Running
 ********************
 
-In order for our debug adapter to be recognized by pyOCD we need to change
-Zephyr's VID/PID to IDs known to pyOCD, this is up to the user.
 The following commands build and flash DAP sample.
 
 .. zephyr-app-commands::

samples/subsys/dap/prj.conf

@@ -1,19 +1,18 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_SAMPLE_USBD_PRODUCT="Zephyr CMSIS-DAP"
+CONFIG_SAMPLE_USBD_PID=0x0204
+CONFIG_SAMPLE_USBD_20_EXTENSION_DESC=y
+
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_BOS=y
 CONFIG_SERIAL=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr CMSIS-DAP"
-CONFIG_USB_DEVICE_PID=0x0204
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 
 CONFIG_LOG=y
+CONFIG_LOG_DEFAULT_LEVEL=2
 
-CONFIG_USB_DRIVER_LOG_LEVEL_INF=y
-CONFIG_USB_DEVICE_LOG_LEVEL_INF=y
 CONFIG_DAP_LOG_LEVEL_INF=y
 CONFIG_DP_DRIVER_LOG_LEVEL_INF=y
 CONFIG_DAP=y
+CONFIG_DAP_BACKEND_USB=y
 CONFIG_GPIO=y
-CONFIG_NET_BUF=y

samples/subsys/dap/sample.yaml

@@ -5,7 +5,7 @@ tests:
     build_only: true
     depends_on:
       - arduino_gpio
-      - usb_device
+      - usbd
     platform_allow:
       - nrf52840dk/nrf52840
       - frdm_k64f