sample: net: remove legacy USB code from the zperf sample

Remove legacy netusb code.

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

Author: jfischer-no

samples/net/zperf/overlay-netusb.conf

@@ -41,74 +41,32 @@ tests:
     extra_configs:
       - CONFIG_ZPERF_SESSION_PER_THREAD=y
     platform_allow: qemu_x86
-  sample.net.zperf.netusb_ecm:
-    harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
-    tags:
-      - usb
-      - net
-      - zperf
-    depends_on: usb_device
-    # native_sim usb driver does not work with CONFIG_POSIX_API
-    platform_exclude:
-      - native_sim
-      - native_sim/native/64
-  sample.net.zperf.device_next_ecm:
+  sample.net.zperf.usbd_cdc_ecm:
     harness: net
     extra_args:
-      - EXTRA_CONF_FILE="overlay-usbd_next.conf"
-      - DTC_OVERLAY_FILE="usbd_next_ecm.overlay"
+      - EXTRA_CONF_FILE="overlay-usbd.conf"
+      - DTC_OVERLAY_FILE="usbd_cdc_ecm.overlay"
     platform_allow:
       - nrf52840dk/nrf52840
       - frdm_k64f
     tags:
       - usb
       - net
       - zperf
-    depends_on: usb_device
-  sample.net.zperf.device_next_ncm:
+    depends_on: usbd
+  sample.net.zperf.usbd_cdc_ncm:
     harness: net
     extra_args:
-      - EXTRA_CONF_FILE="overlay-usbd_next.conf"
-      - DTC_OVERLAY_FILE="usbd_next_ncm.overlay"
+      - EXTRA_CONF_FILE="overlay-usbd.conf"
+      - DTC_OVERLAY_FILE="usbd_cdc_ncm.overlay"
     platform_allow:
       - nrf52840dk/nrf52840
       - frdm_k64f
     tags:
       - usb
       - net
       - zperf
-    depends_on: usb_device
-  sample.net.zperf.netusb_eem:
-    harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
-    extra_configs:
-      - CONFIG_USB_DEVICE_NETWORK_ECM=n
-      - CONFIG_USB_DEVICE_NETWORK_EEM=y
-    tags:
-      - usb
-      - net
-      - zperf
-    depends_on: usb_device
-    # native_sim usb driver does not work with CONFIG_POSIX_API
-    platform_exclude:
-      - native_sim
-      - native_sim/native/64
-  sample.net.zperf.netusb_rndis:
-    harness: net
-    extra_args: EXTRA_CONF_FILE="overlay-netusb.conf"
-    extra_configs:
-      - CONFIG_USB_DEVICE_NETWORK_ECM=n
-      - CONFIG_USB_DEVICE_NETWORK_RNDIS=y
-    tags:
-      - usb
-      - net
-      - zperf
-    depends_on: usb_device
-    # native_sim usb driver does not work with CONFIG_POSIX_API
-    platform_exclude:
-      - native_sim
-      - native_sim/native/64
+    depends_on: usbd
   sample.net.zperf.shield:
     harness: net
     platform_allow: reel_board

samples/net/zperf/overlay-usbd_next.conf renamed to samples/net/zperf/overlay-usbd.conf

@@ -8,7 +8,6 @@
  * @file
  * @brief Zperf sample.
  */
-#include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/usbd.h>
 #include <zephyr/net/net_config.h>
 
@@ -20,11 +19,12 @@ LOG_MODULE_REGISTER(zperf, CONFIG_NET_ZPERF_LOG_LEVEL);
 
 #if defined(CONFIG_USB_DEVICE_STACK_NEXT)
 #include <sample_usbd.h>
+#endif
 
-static struct usbd_context *sample_usbd;
-
-static int enable_usb_device_next(void)
+int main(void)
 {
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+	struct usbd_context *sample_usbd;
 	int err;
 
 	sample_usbd = sample_usbd_init_device(NULL);
@@ -37,28 +37,6 @@ static int enable_usb_device_next(void)
 		return err;
 	}
 
-	return 0;
-}
-#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
-
-int main(void)
-{
-#if defined(CONFIG_USB_DEVICE_STACK)
-	int ret;
-
-	ret = usb_enable(NULL);
-	if (ret != 0) {
-		printk("usb enable error %d\n", ret);
-	}
-
-	(void)net_config_init_app(NULL, "Initializing network");
-#endif /* CONFIG_USB_DEVICE_STACK */
-
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
-	if (enable_usb_device_next()) {
-		return 0;
-	}
-
 	(void)net_config_init_app(NULL, "Initializing network");
 #endif /* CONFIG_USB_DEVICE_STACK_NEXT */