samples: echo_server: use new USB device stack

Remove netusb code and use new USB device stack.

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

Author: jfischer-no

samples/net/sockets/echo_server/CMakeLists.txt

@@ -24,10 +24,6 @@ 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)
 
-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)

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

@@ -4,4 +4,6 @@ CONFIG_LOG=y
 CONFIG_USBD_LOG_LEVEL_WRN=y
 CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
 
+CONFIG_NET_L2_ETHERNET=y
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048

samples/net/sockets/echo_server/overlay-usbd_next.conf renamed to samples/net/sockets/echo_server/overlay-usbd.conf

@@ -75,18 +75,15 @@ tests:
   sample.net.sockets.echo_server.b91_802154:
     extra_args: EXTRA_CONF_FILE="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
-  sample.net.sockets.echo_server.usbnet:
-    depends_on: usb_device
+  sample.net.sockets.echo_server.usbd_cdc_ncm:
+    depends_on: usbd
     harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
+    extra_args: EXTRA_CONF_FILE="overlay-usbd.conf"
+                EXTRA_DTC_OVERLAY_FILE="usbd_cdc_ncm.overlay"
     tags:
       - net
       - usb
-    # native_sim usb driver does not work with CONFIG_POSIX_API
-    platform_exclude:
-      - native_sim
-      - native_sim/native/64
-  sample.net.sockets.echo_server.openthread:
+  sample.net.sockets.echo_server.nrf_openthread:
     extra_args: EXTRA_CONF_FILE="overlay-ot.conf"
     slow: true
     tags:

samples/net/sockets/echo_server/sample.yaml

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

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

@@ -7,15 +7,12 @@
 #include <zephyr/logging/log.h>
 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>
+#include <zephyr/net/net_config.h>
 
 static struct usbd_context *sample_usbd;
 
-static int enable_usb_device_next(void)
+int init_usb(void)
 {
 	int err;
 
@@ -29,28 +26,6 @@ static int enable_usb_device_next(void)
 		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");
 
 	return 0;