tests: bluetooth: use new USB device stack

jfischer-no · cfriedt · commit 891e700ce882 · 2025-08-06T11:57:39.000-04:00
Use new USB device stack.

Signed-off-by: Johann Fischer &lt;johann.fischer@nordicsemi.no&gt;
diff --git a/tests/bluetooth/shell/cdc_acm.conf b/tests/bluetooth/shell/cdc_acm.conf
@@ -1,6 +1,6 @@
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr BT Shell"
-CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
+CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Zephyr BT Shell"
 
 CONFIG_UART_LINE_CTRL=y
 CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c
@@ -128,7 +128,7 @@ int main(void)
 	uint32_t dtr = 0;
 
 	dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
-	if (!device_is_ready(dev) || usb_enable(NULL)) {
+	if (!device_is_ready(dev)) {
 		return 0;
 	}
 
diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
@@ -56,7 +56,7 @@ tests:
     extra_args:
       - EXTRA_CONF_FILE=cdc_acm.conf
       - DTC_OVERLAY_FILE="usb.overlay"
-    depends_on: usb_device
+    depends_on: usbd
     platform_allow:
       - native_sim
       - native_sim/native/64

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ int main(void)`
`128`	`128`	`uint32_t dtr = 0;`
`129`	`129`
`130`	`130`	`dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));`
`131`		`- if (!device_is_ready(dev) \|\| usb_enable(NULL)) {`
	`131`	`+ if (!device_is_ready(dev)) {`
`132`	`132`	`return 0;`
`133`	`133`	`}`
`134`	`134`