samples: http_server: use new USB device stack

Remove netusb code, use new USB device stack and CDC NCM implementation.

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

Author: jfischer-no

samples/net/sockets/http_server/CMakeLists.txt

@@ -41,7 +41,10 @@ target_sources(app PRIVATE src/main.c)
 set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
 
 target_sources_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_SERVICE app PRIVATE src/ws.c)
-target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
+
+if (CONFIG_USB_DEVICE_STACK_NEXT)
+  include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+endif()
 
 target_link_libraries(app PRIVATE zephyr_interface zephyr)
 

samples/net/sockets/http_server/Kconfig

@@ -69,4 +69,11 @@ config NET_SAMPLE_WEBSOCKET_STATS_INTERVAL
 	  This interval controls how often the net stats data shown on the web page
 	  will be updated.
 
+if USB_DEVICE_STACK_NEXT
+# 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"
+endif
+
 source "Kconfig.zephyr"

samples/net/sockets/http_server/README.rst

@@ -31,7 +31,7 @@ There are configuration files for various setups in the
     * - :zephyr_file:`ieee802154-overlay.conf <samples/net/sockets/http_server/ieee802154-overlay.conf>`
       - This overlay config can be added for IEEE 802.15.4 support.
 
-    * - :zephyr_file:`overlay-netusb.conf <samples/net/sockets/http_server/overlay-netusb.conf>`
+    * - :zephyr_file:`overlay-usbd.conf <samples/net/sockets/http_server/overlay-usbd.conf>`
       - This overlay config can be added for connecting via network USB.
 
     * - :zephyr_file:`overlay-tls.conf <samples/net/sockets/http_server/overlay-tls.conf>`

samples/net/sockets/http_server/overlay-netusb.conf

@@ -0,0 +1,7 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+
+CONFIG_LOG=y
+CONFIG_USBD_LOG_LEVEL_WRN=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
+
+CONFIG_NET_L2_ETHERNET=y

samples/net/sockets/http_server/overlay-usbd.conf

@@ -16,3 +16,9 @@ tests:
   sample.net.sockets.http.server: {}
   sample.net.sockets.https.server:
     extra_args: EXTRA_CONF_FILE="overlay-tls.conf"
+  sample.net.sockets.http.server.usbd_cdc_ncm:
+    depends_on: usbd
+    extra_args: EXTRA_CONF_FILE="overlay-usbd.conf"
+                EXTRA_DTC_OVERLAY_FILE="usbd_cdc_ncm.overlay"
+    tags:
+      - usb

samples/net/sockets/http_server/sample.yaml

@@ -19,6 +19,8 @@
 #include <zephyr/drivers/led.h>
 #include <zephyr/data/json.h>
 #include <zephyr/sys/util_macro.h>
+#include <sample_usbd.h>
+#include <zephyr/net/net_config.h>
 
 #include "ws.h"
 
@@ -347,14 +349,27 @@ static void setup_tls(void)
 #endif /* defined(CONFIG_NET_SAMPLE_HTTPS_SERVICE) */
 }
 
-#if defined(CONFIG_USB_DEVICE_STACK)
-int init_usb(void);
-#else
-static inline int init_usb(void)
+static int init_usb(void)
 {
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+	struct usbd_context *sample_usbd;
+	int err;
+
+	sample_usbd = sample_usbd_init_device(NULL);
+	if (sample_usbd == NULL) {
+		return -ENODEV;
+	}
+
+	err = usbd_enable(sample_usbd);
+	if (err) {
+		return err;
+	}
+
+	(void)net_config_init_app(NULL, "Initializing network");
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
+
 	return 0;
 }
-#endif /* CONFIG_USB_DEVICE_STACK */
 
 int main(void)
 {

samples/net/sockets/http_server/src/main.c

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	cdc_ncm_eth0: cdc_ncm_eth0 {
+		compatible = "zephyr,cdc-ncm-ethernet";
+		remote-mac-address = "00005E005301";
+	};
+};