samples: usb: move the legacy code out of the HIC USB sample

Move the legacy code from HCI USB sample to a separate sample in the
legacy directory.

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

Author: jfischer-no

samples/bluetooth/hci_usb/README.rst

@@ -1,6 +1,6 @@
 .. zephyr:code-sample:: bluetooth_hci_usb
    :name: HCI USB
-   :relevant-api: hci_raw bluetooth _usb_device_core_api usbd_api
+   :relevant-api: hci_raw bluetooth usbd_api
 
    Turn a Zephyr board into a USB Bluetooth dongle (compatible with all operating systems).
 

samples/bluetooth/hci_usb/prj.conf

@@ -1,12 +1,10 @@
 CONFIG_BT=y
 CONFIG_BT_HCI_RAW=y
-
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PID=0x000B
-CONFIG_USB_DEVICE_BLUETOOTH=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
-
-# We dont want any console or CDC ACM that may cause BlueZ to not detect hci_usb
 CONFIG_SERIAL=n
 CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n
+
+CONFIG_USB_DEVICE_STACK_NEXT=y
+CONFIG_SAMPLE_USBD_PID=0x000B
+CONFIG_SAMPLE_USBD_PRODUCT="Zephyr USBD BT HCI"
+CONFIG_USBD_BT_HCI=y

samples/bluetooth/hci_usb/sample.yaml

@@ -4,18 +4,8 @@ tests:
   sample.bluetooth.hci_usb:
     harness: bluetooth
     depends_on:
-      - usb_device
+      - usbd
       - ble
     tags:
       - usb
       - bluetooth
-  sample.bluetooth.hci_usb.device_next:
-    harness: bluetooth
-    depends_on:
-      - usb_device
-      - ble
-    tags:
-      - usb
-      - bluetooth
-    extra_args: CONF_FILE="usbd_next_prj.conf"
-    platform_allow: nrf52840dk/nrf52840

samples/bluetooth/hci_usb/src/main.c

@@ -6,35 +6,22 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
-#include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/usbd.h>
 
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
 #include <sample_usbd.h>
 
-static int enable_usb_device_next(void)
+int main(void)
 {
-	struct usbd_context *sample_usbd = sample_usbd_init_device(NULL);
+	struct usbd_context *sample_usbd;
+	int ret;
 
+	sample_usbd = sample_usbd_init_device(NULL);
 	if (sample_usbd == NULL) {
 		printk("Failed to initialize USB device");
 		return -ENODEV;
 	}
 
-	return usbd_enable(sample_usbd);
-}
-#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
-
-int main(void)
-{
-	int ret;
-
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
-	ret = enable_usb_device_next();
-#else
-	ret = usb_enable(NULL);
-#endif
-
+	ret = usbd_enable(sample_usbd);
 	if (ret != 0) {
 		printk("Failed to enable USB");
 		return 0;

samples/bluetooth/hci_usb/usbd_next_prj.conf

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(hci_usb)
+
+target_sources(app PRIVATE src/main.c)

samples/subsys/usb/legacy/hci_usb/CMakeLists.txt

@@ -0,0 +1,21 @@
+.. zephyr:code-sample:: legacy_bluetooth_hci_usb
+   :name: Legacy HCI USB
+   :relevant-api: hci_raw bluetooth _usb_device_core_api
+
+   Turn a Zephyr board into a USB Bluetooth dongle (compatible with all operating systems).
+
+Overview
+********
+
+Make a USB Bluetooth dongle out of Zephyr.
+
+Requirements
+************
+
+* Bluetooth stack running on the host (e.g. BlueZ)
+* A board with Bluetooth and USB support in Zephyr
+
+Building and Running
+********************
+This sample can be found under :zephyr_file:`samples/subsys/usb/legacy/hci_usb` in the
+Zephyr tree.

samples/subsys/usb/legacy/hci_usb/README.rst

@@ -0,0 +1,16 @@
+CONFIG_BT=y
+CONFIG_BT_HCI_RAW=y
+
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_DEVICE_PID=0x000B
+CONFIG_USB_DEVICE_BLUETOOTH=y
+CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+
+# We dont want any console or CDC ACM that may cause BlueZ to not detect hci_usb
+CONFIG_SERIAL=n
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10

samples/subsys/usb/legacy/hci_usb/prj.conf

@@ -0,0 +1,11 @@
+sample:
+  name: Bluetooth over USB sample
+tests:
+  sample.bluetooth.hci_usb.legacy:
+    depends_on:
+      - usb_device
+      - ble
+    build_only: true
+    tags:
+      - usb
+      - bluetooth

samples/subsys/usb/legacy/hci_usb/sample.yaml

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/usb/usb_device.h>
+
+int main(void)
+{
+	int ret;
+
+	ret = usb_enable(NULL);
+	if (ret != 0) {
+		printk("Failed to enable USB");
+		return 0;
+	}
+
+	printk("Bluetooth over USB sample\n");
+	return 0;
+}