samples: net: echo-server: Add USB CDC NCM support

Add support for USB cdc_ncm to echo-server application.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

samples/net/sockets/echo_server/CMakeLists.txt

@@ -23,7 +23,15 @@ target_sources_ifdef(CONFIG_NET_UDP app PRIVATE src/udp.c)
 target_sources_ifdef(CONFIG_NET_TCP app PRIVATE src/tcp.c)
 target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
 target_sources_ifdef(CONFIG_NET_L2_IPIP app PRIVATE src/tunnel.c)
-target_sources_ifdef(CONFIG_USB_DEVICE_STACK app PRIVATE src/usb.c)
+
+if (CONFIG_USB_DEVICE_STACK)
+  target_sources(app PRIVATE src/usb.c)
+endif()
+
+if (CONFIG_USB_DEVICE_STACK_NEXT)
+  target_sources(app PRIVATE src/usb.c)
+  include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+endif()
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
 

samples/net/sockets/echo_server/Kconfig

@@ -104,4 +104,11 @@ config NET_SAMPLE_HTTPS_SERVER_SERVICE_PORT
 	default 443
 	depends on NET_SAMPLE_HTTPS_SERVICE
 
+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/echo_server/overlay-usbd_next.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_SYSTEM_WORKQUEUE_STACK_SIZE=2048

samples/net/sockets/echo_server/src/common.h

@@ -107,7 +107,7 @@ static inline bool is_tunnel(struct net_if *iface)
 }
 #endif /* CONFIG_NET_L2_IPIP */
 
-#if defined(CONFIG_USB_DEVICE_STACK)
+#if defined(CONFIG_USB_DEVICE_STACK) || defined(CONFIG_USB_DEVICE_STACK_NEXT)
 int init_usb(void);
 #else
 static inline int init_usb(void)

samples/net/sockets/echo_server/src/usb.c

@@ -10,15 +10,46 @@ LOG_MODULE_DECLARE(net_echo_server_sample, LOG_LEVEL_DBG);
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/net/net_config.h>
 
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+#include <sample_usbd.h>
+
+static struct usbd_context *sample_usbd;
+
+static int enable_usb_device_next(void)
+{
+	int err;
+
+	sample_usbd = sample_usbd_init_device(NULL);
+	if (sample_usbd == NULL) {
+		return -ENODEV;
+	}
+
+	err = usbd_enable(sample_usbd);
+	if (err) {
+		return err;
+	}
+
+	return 0;
+}
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
+
 int init_usb(void)
 {
+#if defined(CONFIG_USB_DEVICE_STACK)
 	int ret;
 
 	ret = usb_enable(NULL);
 	if (ret != 0) {
 		LOG_ERR("Cannot enable USB (%d)", ret);
 		return ret;
 	}
+#endif /* CONFIG_USB_DEVICE_STACK */
+
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+	if (enable_usb_device_next()) {
+		return 0;
+	}
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
 
 	(void)net_config_init_app(NULL, "Initializing network");
 

samples/net/sockets/echo_server/usbd_next_ncm.overlay

@@ -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";
+	};
+};