[nrf fromtree] samples: usb: move the legacy code out of the USB MSC sample

Move the legacy code from the USB MSC sample to a separate sample in the
legacy directory. Make legacy sample very simple and drop all filesystem
dependencies.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 375e8e6)

Author: jfischer-no

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

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(mass)
+
+include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+FILE(GLOB app_sources src/*.c)
+target_sources(app PRIVATE ${app_sources})

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

@@ -0,0 +1,32 @@
+.. zephyr:code-sample:: legacy-usb-mass
+   :name: Legacy USB Mass Storage
+   :relevant-api: _usb_device_core_api
+
+   Expose board's RAM as a USB disk using USB Mass Storage driver.
+
+Overview
+********
+
+This sample app demonstrates use of a USB Mass Storage driver by the Zephyr
+project. This very simple driver enumerates a board with RAM disk into an USB
+disk. This sample can be found under
+:zephyr_file:`samples/subsys/usb/legacy/mass` in the Zephyr project tree.
+
+.. note::
+   This samples demonstrate deprecated :ref:`usb_device_stack`.
+
+Requirements
+************
+
+This project requires a USB device driver, and either 96KiB of RAM or a FLASH device.
+
+Building and Running
+********************
+
+The configurations selects RAM-based disk without any file system.
+
+.. zephyr-app-commands::
+   :zephyr-app: samples/subsys/usb/legacy/mass
+   :board: reel_board
+   :goals: build
+   :compact:

samples/subsys/usb/legacy/mass/app.overlay

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	ramdisk0 {
+		compatible = "zephyr,ram-disk";
+		disk-name = "RAM";
+		sector-size = <512>;
+		sector-count = <192>;
+	};
+};

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

@@ -0,0 +1,14 @@
+CONFIG_STDOUT_CONSOLE=y
+
+#USB related configs
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_DEVICE_PRODUCT="Zephyr MSC sample"
+CONFIG_USB_DEVICE_PID=0x0008
+CONFIG_LOG=y
+CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
+CONFIG_USB_MASS_STORAGE=y
+CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
+CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
+CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+
+CONFIG_MAIN_STACK_SIZE=1536

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

@@ -0,0 +1,10 @@
+sample:
+  name: Mass Storage
+tests:
+  sample.usb.legacy.mass_ram_none:
+    min_ram: 128
+    depends_on: usb_device
+    build_only: true
+    arch_exclude: posix
+    tags:
+      - usb

samples/subsys/usb/legacy/mass/src/main.c

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016 Intel Corporation.
+ * Copyright (c) 2019-2020 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/usb/usb_device.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
+
+int main(void)
+{
+	int ret;
+
+	ret = usb_enable(NULL);
+	if (ret != 0) {
+		LOG_ERR("Failed to enable USB");
+		return 0;
+	}
+
+	LOG_INF("The device is put in USB mass storage mode");
+
+	return 0;
+}

samples/subsys/usb/mass/README.rst

@@ -1,6 +1,6 @@
 .. zephyr:code-sample:: usb-mass
    :name: USB Mass Storage
-   :relevant-api: usbd_api usbd_msc_device _usb_device_core_api file_system_api
+   :relevant-api: usbd_api usbd_msc_device file_system_api
 
    Expose board's RAM or FLASH as a USB disk using USB Mass Storage driver.
 

samples/subsys/usb/mass/prj.conf

@@ -1,14 +1,15 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+
 CONFIG_STDOUT_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_UART_LINE_CTRL=y
+CONFIG_USBD_MSC_CLASS=y
+CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3
 
-#USB related configs
-CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_DEVICE_PRODUCT="Zephyr MSC sample"
-CONFIG_USB_DEVICE_PID=0x0008
 CONFIG_LOG=y
-CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
-CONFIG_USB_MASS_STORAGE=y
-CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
-CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
-CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
+CONFIG_USBD_LOG_LEVEL_WRN=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
 
-CONFIG_MAIN_STACK_SIZE=1536
+CONFIG_SAMPLE_USBD_PID=0x0008
+CONFIG_SAMPLE_USBD_PRODUCT="USBD MSC sample"
+CONFIG_MAIN_STACK_SIZE=2048

samples/subsys/usb/mass/sample.yaml

@@ -1,25 +1,7 @@
 sample:
   name: Mass Storage
 tests:
-  sample.usb.mass_ram_none:
-    min_ram: 128
-    depends_on: usb_device
-    arch_exclude: posix
-    extra_args:
-      - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
-    extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
-    tags:
-      - msd
-      - usb
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "No file system selected"
-        - "The device is put in USB mass storage mode."
-  sample.usb_device_next.mass_ram_none:
+  sample.usbd.mass_ram_none:
     min_ram: 128
     depends_on: usbd
     integration_platforms:
@@ -32,65 +14,41 @@ tests:
       - mimxrt1060_evk/mimxrt1062/qspi
       - max32690evkit/max32690/m4
     extra_args:
-      - CONF_FILE="usbd_next_prj.conf"
       - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
-    extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
     tags:
-      - msd
       - usb
     harness: console
     harness_config:
       type: multi_line
       ordered: true
       regex:
         - "No file system selected"
-        - "The device is put in USB mass storage mode."
-  sample.usb.mass_ram_fat:
+        - "The device is put in USB mass storage mode"
+  sample.usbd.mass_ram_fat:
     min_ram: 128
-    depends_on: usb_device
-    arch_exclude: posix
+    depends_on: usbd
+    integration_platforms:
+      - nrf52840dk/nrf52840
+      - nrf54h20dk/nrf54h20/cpuapp
+      - frdm_k64f
+      - stm32f723e_disco
+      - nucleo_f413zh
+      - mimxrt685_evk/mimxrt685s/cm33
+      - mimxrt1060_evk/mimxrt1062/qspi
     extra_args:
       - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"
     extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
       - CONFIG_APP_MSC_STORAGE_RAM=y
     tags:
-      - msd
-      - usb
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "End of files"
-        - "The device is put in USB mass storage mode."
-  sample.usb.mass_flash_fatfs:
-    min_ram: 32
-    modules:
-      - fatfs
-    depends_on: usb_device
-    filter: dt_compat_enabled("nordic,qspi-nor")
-    platform_allow:
-      - nrf52840dk/nrf52840
-      - nrf5340dk/nrf5340/cpuapp
-      - adafruit_feather_nrf52840/nrf52840/sense
-    integration_platforms:
-      - nrf52840dk/nrf52840
-    extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
-      - CONFIG_APP_MSC_STORAGE_FLASH_FATFS=y
-    tags:
-      - msd
       - usb
     harness: console
     harness_config:
       type: multi_line
       ordered: true
       regex:
         - "End of files"
-        - "The device is put in USB mass storage mode."
-  sample.usb_device_next.mass_flash_fatfs:
+        - "The device is put in USB mass storage mode"
+  sample.usbd.mass_flash_fatfs:
     min_ram: 32
     modules:
       - fatfs
@@ -102,43 +60,18 @@ tests:
       - adafruit_feather_nrf52840/nrf52840/sense
     integration_platforms:
       - nrf52840dk/nrf52840
-    extra_args: CONF_FILE="usbd_next_prj.conf"
     extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
       - CONFIG_APP_MSC_STORAGE_FLASH_FATFS=y
     tags:
-      - msd
-      - usb
-    harness: console
-    harness_config:
-      type: multi_line
-      ordered: true
-      regex:
-        - "End of files"
-        - "The device is put in USB mass storage mode."
-  sample.usb.mass_sdhc_fatfs:
-    min_ram: 32
-    filter: dt_compat_enabled("zephyr,sdmmc-disk")
-    modules:
-      - fatfs
-    depends_on:
-      - usb_device
-      - sdhc
-    extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
-      - CONFIG_APP_MSC_STORAGE_SDCARD=y
-    tags:
-      - msd
       - usb
     harness: console
     harness_config:
-      fixture: fixture_sdcard
       type: multi_line
       ordered: true
       regex:
         - "End of files"
-        - "The device is put in USB mass storage mode."
-  sample.usb_device_next.mass_sdhc_fatfs:
+        - "The device is put in USB mass storage mode"
+  sample.usbd.mass_sdhc_fatfs:
     min_ram: 32
     filter: dt_compat_enabled("zephyr,sdmmc-disk")
     modules:
@@ -147,11 +80,8 @@ tests:
       - usbd
       - sdhc
     extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
       - CONFIG_APP_MSC_STORAGE_SDCARD=y
-    extra_args: CONF_FILE="usbd_next_prj.conf"
     tags:
-      - msd
       - usb
     harness: console
     harness_config:
@@ -160,12 +90,12 @@ tests:
       ordered: true
       regex:
         - "End of files"
-        - "The device is put in USB mass storage mode."
-  sample.usb.mass_flash_littlefs:
+        - "The device is put in USB mass storage mode"
+  sample.usbd.mass_flash_littlefs:
     modules:
       - littlefs
     min_ram: 32
-    depends_on: usb_device
+    depends_on: usbd
     filter: dt_compat_enabled("nordic,qspi-nor")
     platform_allow:
       - nrf52840dk/nrf52840
@@ -174,15 +104,13 @@ tests:
     integration_platforms:
       - nrf52840dk/nrf52840
     extra_configs:
-      - CONFIG_LOG_DEFAULT_LEVEL=3
       - CONFIG_APP_MSC_STORAGE_FLASH_LITTLEFS=y
     tags:
-      - msd
       - usb
     harness: console
     harness_config:
       type: multi_line
       ordered: true
       regex:
         - "End of files"
-        - "The device is put in USB mass storage mode."
+        - "The device is put in USB mass storage mode"