diff --git a/README.md b/README.md index 1f0d229..a74dbdf 100644 --- a/README.md +++ b/README.md @@ -100,9 +100,9 @@ west build -b lpcxpresso55s16/lpc55s16 cannectivity/app/ -- -DFILE_SUFFIX=releas After building, the firmware can be flashed to the board by running the `west flash` command. -> **Note:** Build configurations for using the experimental `device_next` USB device stack in -> Zephyr are also provided. These can be selected by setting either `FILE_SUFFIX=usbd_next` or -> `FILE_SUFFIX=usbd_next_release`. +> **Note:** Build configurations for using the legacy USB device stack in Zephyr are also +> provided. These can be selected by setting either `FILE_SUFFIX=legacy` or +> `FILE_SUFFIX=legacy_release`. ## USB Device Firmware Upgrade (DFU) Mode diff --git a/app/boards/canbardo_same70n20b.conf b/app/boards/canbardo_same70n20b.conf index 6841593..ad8e6a7 100644 --- a/app/boards/canbardo_same70n20b.conf +++ b/app/boards/canbardo_same70n20b.conf @@ -1,5 +1,5 @@ -# Copyright (c) 2024-2025 Henrik Brix Andersen +# Copyright (c) 2026 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 CONFIG_CANNECTIVITY_USB_SELF_POWERED=n -CONFIG_USB_DEVICE_GS_USB_COMPATIBILITY_MODE=n +CONFIG_USBD_GS_USB_COMPATIBILITY_MODE=n diff --git a/app/boards/canbardo_same70n20b_legacy.conf b/app/boards/canbardo_same70n20b_legacy.conf new file mode 100644 index 0000000..6841593 --- /dev/null +++ b/app/boards/canbardo_same70n20b_legacy.conf @@ -0,0 +1,5 @@ +# Copyright (c) 2024-2025 Henrik Brix Andersen +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_CANNECTIVITY_USB_SELF_POWERED=n +CONFIG_USB_DEVICE_GS_USB_COMPATIBILITY_MODE=n diff --git a/app/boards/canbardo_same70n20b_usbd_next.conf b/app/boards/canbardo_same70n20b_legacy_release.conf similarity index 75% rename from app/boards/canbardo_same70n20b_usbd_next.conf rename to app/boards/canbardo_same70n20b_legacy_release.conf index ad8e6a7..1c9a3c7 100644 --- a/app/boards/canbardo_same70n20b_usbd_next.conf +++ b/app/boards/canbardo_same70n20b_legacy_release.conf @@ -2,4 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_CANNECTIVITY_USB_SELF_POWERED=n -CONFIG_USBD_GS_USB_COMPATIBILITY_MODE=n +CONFIG_USB_DEVICE_GS_USB_COMPATIBILITY_MODE=n diff --git a/app/boards/native_sim.overlay b/app/boards/native_sim.overlay index 226d5e4..0a6fe15 100644 --- a/app/boards/native_sim.overlay +++ b/app/boards/native_sim.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Henrik Brix Andersen + * Copyright (c) 2024-2025 Henrik Brix Andersen * * SPDX-License-Identifier: Apache-2.0 */ @@ -48,7 +48,7 @@ channel0 { compatible = "cannectivity-channel"; - can-controller = <&can_loopback0>; + can-controller = <&cannectivity0>; termination-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; state-led = <&led_ch0_state>; activity-leds = <&led_ch0_activity>; @@ -56,7 +56,7 @@ channel1 { compatible = "cannectivity-channel"; - can-controller = <&can_loopback1>; + can-controller = <&cannectivity1>; termination-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; state-led = <&led_ch1_state>; activity-leds = <&led_ch1_activity>; @@ -64,26 +64,29 @@ channel2 { compatible = "cannectivity-channel"; - can-controller = <&can_loopback2>; + can-controller = <&cannectivity2>; termination-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; state-led = <&led_ch2_state>; activity-leds = <&led_ch2_activity>; }; }; - can_loopback0: can_loopback0 { + cannectivity0: cannectivity0 { status = "okay"; - compatible = "zephyr,can-loopback"; + compatible = "zephyr,native-linux-can"; + host-interface = "cannectivity0"; }; - can_loopback1: can_loopback1 { + cannectivity1: cannectivity1 { status = "okay"; - compatible = "zephyr,can-loopback"; + compatible = "zephyr,native-linux-can"; + host-interface = "cannectivity1"; }; - can_loopback2: can_loopback2 { + cannectivity2: cannectivity2 { status = "okay"; - compatible = "zephyr,can-loopback"; + compatible = "zephyr,native-linux-can"; + host-interface = "cannectivity2"; }; }; diff --git a/app/boards/native_sim_usbd_next.overlay b/app/boards/native_sim_legacy.overlay similarity index 75% rename from app/boards/native_sim_usbd_next.overlay rename to app/boards/native_sim_legacy.overlay index 0a6fe15..226d5e4 100644 --- a/app/boards/native_sim_usbd_next.overlay +++ b/app/boards/native_sim_legacy.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Henrik Brix Andersen + * Copyright (c) 2024 Henrik Brix Andersen * * SPDX-License-Identifier: Apache-2.0 */ @@ -48,7 +48,7 @@ channel0 { compatible = "cannectivity-channel"; - can-controller = <&cannectivity0>; + can-controller = <&can_loopback0>; termination-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; state-led = <&led_ch0_state>; activity-leds = <&led_ch0_activity>; @@ -56,7 +56,7 @@ channel1 { compatible = "cannectivity-channel"; - can-controller = <&cannectivity1>; + can-controller = <&can_loopback1>; termination-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; state-led = <&led_ch1_state>; activity-leds = <&led_ch1_activity>; @@ -64,29 +64,26 @@ channel2 { compatible = "cannectivity-channel"; - can-controller = <&cannectivity2>; + can-controller = <&can_loopback2>; termination-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; state-led = <&led_ch2_state>; activity-leds = <&led_ch2_activity>; }; }; - cannectivity0: cannectivity0 { + can_loopback0: can_loopback0 { status = "okay"; - compatible = "zephyr,native-linux-can"; - host-interface = "cannectivity0"; + compatible = "zephyr,can-loopback"; }; - cannectivity1: cannectivity1 { + can_loopback1: can_loopback1 { status = "okay"; - compatible = "zephyr,native-linux-can"; - host-interface = "cannectivity1"; + compatible = "zephyr,can-loopback"; }; - cannectivity2: cannectivity2 { + can_loopback2: can_loopback2 { status = "okay"; - compatible = "zephyr,native-linux-can"; - host-interface = "cannectivity2"; + compatible = "zephyr,can-loopback"; }; }; diff --git a/app/boards/native_sim_legacy_release.overlay b/app/boards/native_sim_legacy_release.overlay new file mode 100644 index 0000000..895b926 --- /dev/null +++ b/app/boards/native_sim_legacy_release.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2026 Henrik Brix Andersen + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_sim_legacy.overlay" diff --git a/app/boards/native_sim_native_64.overlay b/app/boards/native_sim_native_64.overlay index 38eaeac..0d14e12 100644 --- a/app/boards/native_sim_native_64.overlay +++ b/app/boards/native_sim_native_64.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Henrik Brix Andersen + * Copyright (c) 2025-2026 Henrik Brix Andersen * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/app/boards/native_sim_native_64_legacy.overlay b/app/boards/native_sim_native_64_legacy.overlay new file mode 100644 index 0000000..9828c1d --- /dev/null +++ b/app/boards/native_sim_native_64_legacy.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024-2026 Henrik Brix Andersen + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_sim_legacy.overlay" diff --git a/app/boards/native_sim_native_64_legacy_release.overlay b/app/boards/native_sim_native_64_legacy_release.overlay new file mode 100644 index 0000000..50dc11a --- /dev/null +++ b/app/boards/native_sim_native_64_legacy_release.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2026 Henrik Brix Andersen + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_sim_native_64_legacy.overlay" diff --git a/app/boards/native_sim_native_64_usbd_next.overlay b/app/boards/native_sim_native_64_usbd_next.overlay deleted file mode 100644 index dd4d044..0000000 --- a/app/boards/native_sim_native_64_usbd_next.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2025 Henrik Brix Andersen - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "native_sim_usbd_next.overlay" diff --git a/app/prj.conf b/app/prj.conf index 10315f3..f0758d0 100644 --- a/app/prj.conf +++ b/app/prj.conf @@ -1,10 +1,8 @@ -# This is using the deprecated USB device stack -CONFIG_DEPRECATION_TEST=y -CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_STACK_NEXT=y # Logging configuration CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_GS_USB_LOG_LEVEL_DBG=y +CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y +CONFIG_USBD_LOG_LEVEL_WRN=y +CONFIG_USBD_GS_USB_LOG_LEVEL_DBG=y CONFIG_CANNECTIVITY_LOG_LEVEL_DBG=y diff --git a/app/prj_legacy.conf b/app/prj_legacy.conf new file mode 100644 index 0000000..10315f3 --- /dev/null +++ b/app/prj_legacy.conf @@ -0,0 +1,10 @@ +# This is using the deprecated USB device stack +CONFIG_DEPRECATION_TEST=y +CONFIG_USB_DEVICE_STACK=y + +# Logging configuration +CONFIG_LOG=y +CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_GS_USB_LOG_LEVEL_DBG=y +CONFIG_CANNECTIVITY_LOG_LEVEL_DBG=y diff --git a/app/prj_usbd_next_release.conf b/app/prj_legacy_release.conf similarity index 68% rename from app/prj_usbd_next_release.conf rename to app/prj_legacy_release.conf index 4c88856..706e911 100644 --- a/app/prj_usbd_next_release.conf +++ b/app/prj_legacy_release.conf @@ -1,4 +1,6 @@ -CONFIG_USB_DEVICE_STACK_NEXT=y +# This is using the deprecated USB device stack +CONFIG_DEPRECATION_TEST=y +CONFIG_USB_DEVICE_STACK=y # Hardened configuration CONFIG_BOOT_BANNER=n diff --git a/app/prj_release.conf b/app/prj_release.conf index 706e911..4c88856 100644 --- a/app/prj_release.conf +++ b/app/prj_release.conf @@ -1,6 +1,4 @@ -# This is using the deprecated USB device stack -CONFIG_DEPRECATION_TEST=y -CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_STACK_NEXT=y # Hardened configuration CONFIG_BOOT_BANNER=n diff --git a/app/prj_usbd_next.conf b/app/prj_usbd_next.conf deleted file mode 100644 index f0758d0..0000000 --- a/app/prj_usbd_next.conf +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_USB_DEVICE_STACK_NEXT=y - -# Logging configuration -CONFIG_LOG=y -CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_USBD_LOG_LEVEL_WRN=y -CONFIG_USBD_GS_USB_LOG_LEVEL_DBG=y -CONFIG_CANNECTIVITY_LOG_LEVEL_DBG=y diff --git a/app/sample.yaml b/app/sample.yaml index b348572..4ecb88c 100644 --- a/app/sample.yaml +++ b/app/sample.yaml @@ -14,10 +14,12 @@ common: regex: - "CANnectivity firmware initialized with .*" tests: - app.cannectivity: + app.cannectivity.legacy: depends_on: - can - usb_device + extra_args: + - FILE_SUFFIX=legacy integration_platforms: - canbardo - candlelight @@ -30,20 +32,22 @@ tests: - nucleo_h723zg - ucan - usb2canfdv1 - app.cannectivity.sof: + app.cannectivity.legacy.sof: depends_on: - can - usb_device + extra_args: + - FILE_SUFFIX=legacy integration_platforms: - nucleo_h723zg extra_configs: - CONFIG_USB_DEVICE_GS_USB_TIMESTAMP_SOF=y - app.cannectivity.release: + app.cannectivity.legacy.release: depends_on: - can - usb_device extra_args: - - FILE_SUFFIX=release + - FILE_SUFFIX=legacy_release integration_platforms: - canbardo - candlelight @@ -57,12 +61,10 @@ tests: - ucan - usb2canfdv1 build_only: true - app.cannectivity.usbd_next: + app.cannectivity: depends_on: - can - usbd - extra_args: - - FILE_SUFFIX=usbd_next integration_platforms: - canbardo - candlelightfd @@ -72,23 +74,21 @@ tests: - lpcxpresso55s16 - nucleo_h723zg - usb2canfdv1 - app.cannectivity.usbd_next.sof: + app.cannectivity.sof: depends_on: - can - usbd - extra_args: - - FILE_SUFFIX=usbd_next integration_platforms: - lpcxpresso55s16 - nucleo_h723zg extra_configs: - CONFIG_USBD_GS_USB_TIMESTAMP_SOF=y - app.cannectivity.usbd_next.release: + app.cannectivity.release: depends_on: - can - usbd extra_args: - - FILE_SUFFIX=usbd_next_release + - FILE_SUFFIX=release integration_platforms: - canbardo - candlelight @@ -102,7 +102,7 @@ tests: - ucan - usb2canfdv1 build_only: true - app.cannectivity.dfu: + app.cannectivity.legacy.dfu: sysbuild: true depends_on: - can @@ -112,8 +112,9 @@ tests: - lpcxpresso55s16 - canbardo extra_args: + - FILE_SUFFIX=legacy - SB_CONF_FILE=sysbuild-dfu.conf - app.cannectivity.usbd_next.dfu: + app.cannectivity.dfu: sysbuild: true depends_on: - can @@ -124,5 +125,4 @@ tests: - frdm_mcxn947/mcxn947/cpu0 - lpcxpresso55s16 extra_args: - - FILE_SUFFIX=usbd_next_release - SB_CONF_FILE=sysbuild-dfu.conf diff --git a/app/sysbuild/mcuboot/boards/canbardo_same70n20b.conf b/app/sysbuild/mcuboot/boards/canbardo_same70n20b_legacy.conf similarity index 100% rename from app/sysbuild/mcuboot/boards/canbardo_same70n20b.conf rename to app/sysbuild/mcuboot/boards/canbardo_same70n20b_legacy.conf diff --git a/app/sysbuild/mcuboot/boards/canbardo_same70n20b_legacy_release.conf b/app/sysbuild/mcuboot/boards/canbardo_same70n20b_legacy_release.conf new file mode 100644 index 0000000..adf7f00 --- /dev/null +++ b/app/sysbuild/mcuboot/boards/canbardo_same70n20b_legacy_release.conf @@ -0,0 +1,13 @@ +# Copyright (c) 2024-2026 Henrik Brix Andersen +# SPDX-License-Identifier: Apache-2.0 + +# This is using the deprecated USB device stack +CONFIG_DEPRECATION_TEST=y + +CONFIG_MCUBOOT_INDICATION_LED=y +CONFIG_BOOT_USB_DFU_GPIO=y +CONFIG_USB_DEVICE_MANUFACTURER="CANnectivity" +CONFIG_USB_DEVICE_PRODUCT="CANnectivity USB to CAN adapter (MCUboot DFU)" +CONFIG_USB_DEVICE_VID=0x1209 +CONFIG_USB_DEVICE_PID=0xca02 +CONFIG_USB_DEVICE_DFU_PID=0xca02 diff --git a/app/sysbuild/mcuboot/boards/canbardo_same70n20b_usbd_next.conf b/app/sysbuild/mcuboot/boards/canbardo_same70n20b_usbd_next.conf deleted file mode 100644 index 794a1e4..0000000 --- a/app/sysbuild/mcuboot/boards/canbardo_same70n20b_usbd_next.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2026 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -# Override default y for this board -CONFIG_BOOT_USB_DFU_GPIO=n diff --git a/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12.conf b/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_legacy.conf similarity index 100% rename from app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12.conf rename to app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_legacy.conf diff --git a/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_legacy_release.conf b/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_legacy_release.conf new file mode 100644 index 0000000..a18a7e3 --- /dev/null +++ b/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_legacy_release.conf @@ -0,0 +1,12 @@ +# Copyright (c) 2024-2026 Henrik Brix Andersen +# SPDX-License-Identifier: Apache-2.0 + +# This is using the deprecated USB device stack +CONFIG_DEPRECATION_TEST=y + +CONFIG_BOOT_USB_DFU_GPIO=y +CONFIG_USB_DEVICE_MANUFACTURER="CANnectivity" +CONFIG_USB_DEVICE_PRODUCT="CANnectivity USB to CAN adapter (MCUboot DFU)" +CONFIG_USB_DEVICE_VID=0x1209 +CONFIG_USB_DEVICE_PID=0xca02 +CONFIG_USB_DEVICE_DFU_PID=0xca02 diff --git a/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_usbd_next.conf b/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_usbd_next.conf deleted file mode 100644 index 256b738..0000000 --- a/app/sysbuild/mcuboot/boards/frdm_k64f_mk64f12_usbd_next.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2025 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -# Override default y for this board -CONFIG_BOOT_USB_DFU_GPIO=n diff --git a/doc/building.rst b/doc/building.rst index b424f25..7817ced 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -37,9 +37,8 @@ After building, the firmware can be flashed to the board by running the ``west f .. note:: - Build configurations for using the experimental ``device_next`` USB device stack in Zephyr are - also provided. These can be selected by setting either ``FILE_SUFFIX=usbd_next`` or - ``FILE_SUFFIX=usbd_next_release``. + Build configurations for using the legacy USB device stack in Zephyr are also provided. These can + be selected by setting either ``FILE_SUFFIX=legacy`` or ``FILE_SUFFIX=legacy_release``. USB Device Firmware Upgrade (DFU) Mode -------------------------------------- diff --git a/scripts/run-host-tests.sh b/scripts/run-host-tests.sh index db4263e..d2ca8e4 100755 --- a/scripts/run-host-tests.sh +++ b/scripts/run-host-tests.sh @@ -54,7 +54,7 @@ candump -t a -H any > host-tests-candump.log 2>&1 & CANDUMP_PID=$! echo "Building CANnectivity" -west build -b native_sim/native/64 -S usbip-native-sim app -- -DFILE_SUFFIX=usbd_next +west build -b native_sim/native/64 -S usbip-native-sim app echo "Starting CANnectivity" valgrind --suppressions=$ZEPHYR_DIR/scripts/valgrind.supp --leak-check=full \ diff --git a/tests/subsys/usb/gs_usb/cxx/prj.conf b/tests/subsys/usb/gs_usb/cxx/prj.conf index 5e4afef..ce554a4 100644 --- a/tests/subsys/usb/gs_usb/cxx/prj.conf +++ b/tests/subsys/usb/gs_usb/cxx/prj.conf @@ -1,10 +1,7 @@ -# This is using the deprecated USB device stack -CONFIG_DEPRECATION_TEST=y - CONFIG_CPP=y -CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_STACK_NEXT=y -CONFIG_USB_DEVICE_GS_USB_IDENTIFICATION=y -CONFIG_USB_DEVICE_GS_USB_TIMESTAMP=y -CONFIG_USB_DEVICE_GS_USB_TERMINATION=y +CONFIG_USBD_GS_USB_IDENTIFICATION=y +CONFIG_USBD_GS_USB_TIMESTAMP=y +CONFIG_USBD_GS_USB_TERMINATION=y diff --git a/tests/subsys/usb/gs_usb/cxx/testcase.yaml b/tests/subsys/usb/gs_usb/cxx/testcase.yaml index 8920338..a48cad4 100644 --- a/tests/subsys/usb/gs_usb/cxx/testcase.yaml +++ b/tests/subsys/usb/gs_usb/cxx/testcase.yaml @@ -1,13 +1,12 @@ -# Copyright (c) 2024 Henrik Brix Andersen +# Copyright (c) 2024-2026 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 common: tags: - usb - can - depends_on: usb_device build_only: true - integration_platforms: + platform_allow: - native_sim - native_sim/native/64 tests: diff --git a/tests/subsys/usb/gs_usb/host/prj.conf b/tests/subsys/usb/gs_usb/host/prj.conf index b089c0a..09d2f1c 100644 --- a/tests/subsys/usb/gs_usb/host/prj.conf +++ b/tests/subsys/usb/gs_usb/host/prj.conf @@ -1,23 +1,18 @@ -# This is using the deprecated USB device stack -CONFIG_DEPRECATION_TEST=y - CONFIG_TEST=y CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_GS_USB_LOG_LEVEL_DBG=y +CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y +CONFIG_USBD_LOG_LEVEL_WRN=y +CONFIG_USBD_GS_USB_LOG_LEVEL_DBG=y CONFIG_SHELL=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_BOS=y -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n +CONFIG_USB_DEVICE_STACK_NEXT=y CONFIG_CAN=y CONFIG_CAN_FD_MODE=y -CONFIG_USB_DEVICE_GS_USB_MAX_CHANNELS=4 -CONFIG_USB_DEVICE_GS_USB_IDENTIFICATION=y -CONFIG_USB_DEVICE_GS_USB_TIMESTAMP=y -CONFIG_USB_DEVICE_GS_USB_TERMINATION=y +CONFIG_USBD_GS_USB_MAX_CHANNELS=4 +CONFIG_USBD_GS_USB_IDENTIFICATION=y +CONFIG_USBD_GS_USB_TIMESTAMP=y +CONFIG_USBD_GS_USB_TERMINATION=y diff --git a/tests/subsys/usb/gs_usb/host/prj_legacy.conf b/tests/subsys/usb/gs_usb/host/prj_legacy.conf new file mode 100644 index 0000000..b089c0a --- /dev/null +++ b/tests/subsys/usb/gs_usb/host/prj_legacy.conf @@ -0,0 +1,23 @@ +# This is using the deprecated USB device stack +CONFIG_DEPRECATION_TEST=y + +CONFIG_TEST=y + +CONFIG_LOG=y +CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_USB_DEVICE_GS_USB_LOG_LEVEL_DBG=y + +CONFIG_SHELL=y + +CONFIG_USB_DEVICE_STACK=y +CONFIG_USB_DEVICE_BOS=y +CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n + +CONFIG_CAN=y +CONFIG_CAN_FD_MODE=y + +CONFIG_USB_DEVICE_GS_USB_MAX_CHANNELS=4 +CONFIG_USB_DEVICE_GS_USB_IDENTIFICATION=y +CONFIG_USB_DEVICE_GS_USB_TIMESTAMP=y +CONFIG_USB_DEVICE_GS_USB_TERMINATION=y diff --git a/tests/subsys/usb/gs_usb/host/prj_usbd_next.conf b/tests/subsys/usb/gs_usb/host/prj_usbd_next.conf deleted file mode 100644 index 09d2f1c..0000000 --- a/tests/subsys/usb/gs_usb/host/prj_usbd_next.conf +++ /dev/null @@ -1,18 +0,0 @@ -CONFIG_TEST=y - -CONFIG_LOG=y -CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y -CONFIG_USBD_LOG_LEVEL_WRN=y -CONFIG_USBD_GS_USB_LOG_LEVEL_DBG=y - -CONFIG_SHELL=y - -CONFIG_USB_DEVICE_STACK_NEXT=y - -CONFIG_CAN=y -CONFIG_CAN_FD_MODE=y - -CONFIG_USBD_GS_USB_MAX_CHANNELS=4 -CONFIG_USBD_GS_USB_IDENTIFICATION=y -CONFIG_USBD_GS_USB_TIMESTAMP=y -CONFIG_USBD_GS_USB_TERMINATION=y diff --git a/tests/subsys/usb/gs_usb/host/testcase.yaml b/tests/subsys/usb/gs_usb/host/testcase.yaml index 15c7300..040484b 100644 --- a/tests/subsys/usb/gs_usb/host/testcase.yaml +++ b/tests/subsys/usb/gs_usb/host/testcase.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Henrik Brix Andersen +# Copyright (c) 2024-2026 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 common: @@ -10,17 +10,17 @@ common: pytest_dut_scope: session fixture: usb tests: - usb.gs_usb.host: + usb.gs_usb.legacy.host: depends_on: - usb_device - can integration_platforms: - frdm_k64f/mk64f12 - usb.gs_usb.host.usbd_next: + extra_args: + - FILE_SUFFIX=legacy + usb.gs_usb.host: depends_on: - usbd - can integration_platforms: - frdm_k64f/mk64f12 - extra_args: - - FILE_SUFFIX=usbd_next