From 8e429b0352babcb6f883d128cbaed1c63da95ca3 Mon Sep 17 00:00:00 2001 From: cepetr Date: Tue, 28 May 2024 10:00:41 +0200 Subject: [PATCH] refactor(core/embed): move usb driver to its own folder [no changelog] --- core/embed/trezorhal/stm32f4/{ => usb}/usb.c | 0 core/embed/trezorhal/stm32f4/{ => usb}/usb_hid-impl.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usb_vcp-impl.h | 0 .../trezorhal/stm32f4/{ => usb}/usb_webusb-impl.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_conf.c | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_conf.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_core.c | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_core.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_ctlreq.c | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_ctlreq.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_def.h | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_ioreq.c | 0 core/embed/trezorhal/stm32f4/{ => usb}/usbd_ioreq.h | 0 core/embed/trezorhal/stm32u5/usb | 1 + core/embed/trezorhal/stm32u5/usb.c | 1 - core/embed/trezorhal/stm32u5/usb_hid-impl.h | 1 - core/embed/trezorhal/stm32u5/usb_vcp-impl.h | 1 - core/embed/trezorhal/stm32u5/usb_webusb-impl.h | 1 - core/embed/trezorhal/stm32u5/usbd_conf.c | 1 - core/embed/trezorhal/stm32u5/usbd_conf.h | 1 - core/embed/trezorhal/stm32u5/usbd_core.c | 1 - core/embed/trezorhal/stm32u5/usbd_core.h | 1 - core/embed/trezorhal/stm32u5/usbd_ctlreq.c | 1 - core/embed/trezorhal/stm32u5/usbd_ctlreq.h | 1 - core/embed/trezorhal/stm32u5/usbd_def.h | 1 - core/embed/trezorhal/stm32u5/usbd_ioreq.c | 1 - core/embed/trezorhal/stm32u5/usbd_ioreq.h | 1 - core/site_scons/models/D001/discovery.py | 10 +++++----- core/site_scons/models/D002/discovery2.py | 10 +++++----- core/site_scons/models/T1B1/trezor_1.py | 10 +++++----- core/site_scons/models/T2B1/trezor_r_v10.py | 10 +++++----- core/site_scons/models/T2B1/trezor_r_v3.py | 10 +++++----- core/site_scons/models/T2B1/trezor_r_v4.py | 10 +++++----- core/site_scons/models/T2B1/trezor_r_v6.py | 10 +++++----- core/site_scons/models/T2T1/trezor_t.py | 10 +++++----- core/site_scons/models/T3T1/trezor_t3t1_revE.py | 10 +++++----- core/site_scons/models/T3T1/trezor_t3t1_v4.py | 10 +++++----- 37 files changed, 51 insertions(+), 63 deletions(-) rename core/embed/trezorhal/stm32f4/{ => usb}/usb.c (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usb_hid-impl.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usb_vcp-impl.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usb_webusb-impl.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_conf.c (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_conf.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_core.c (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_core.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_ctlreq.c (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_ctlreq.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_def.h (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_ioreq.c (100%) rename core/embed/trezorhal/stm32f4/{ => usb}/usbd_ioreq.h (100%) create mode 120000 core/embed/trezorhal/stm32u5/usb delete mode 120000 core/embed/trezorhal/stm32u5/usb.c delete mode 120000 core/embed/trezorhal/stm32u5/usb_hid-impl.h delete mode 120000 core/embed/trezorhal/stm32u5/usb_vcp-impl.h delete mode 120000 core/embed/trezorhal/stm32u5/usb_webusb-impl.h delete mode 120000 core/embed/trezorhal/stm32u5/usbd_conf.c delete mode 120000 core/embed/trezorhal/stm32u5/usbd_conf.h delete mode 120000 core/embed/trezorhal/stm32u5/usbd_core.c delete mode 120000 core/embed/trezorhal/stm32u5/usbd_core.h delete mode 120000 core/embed/trezorhal/stm32u5/usbd_ctlreq.c delete mode 120000 core/embed/trezorhal/stm32u5/usbd_ctlreq.h delete mode 120000 core/embed/trezorhal/stm32u5/usbd_def.h delete mode 120000 core/embed/trezorhal/stm32u5/usbd_ioreq.c delete mode 120000 core/embed/trezorhal/stm32u5/usbd_ioreq.h diff --git a/core/embed/trezorhal/stm32f4/usb.c b/core/embed/trezorhal/stm32f4/usb/usb.c similarity index 100% rename from core/embed/trezorhal/stm32f4/usb.c rename to core/embed/trezorhal/stm32f4/usb/usb.c diff --git a/core/embed/trezorhal/stm32f4/usb_hid-impl.h b/core/embed/trezorhal/stm32f4/usb/usb_hid-impl.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usb_hid-impl.h rename to core/embed/trezorhal/stm32f4/usb/usb_hid-impl.h diff --git a/core/embed/trezorhal/stm32f4/usb_vcp-impl.h b/core/embed/trezorhal/stm32f4/usb/usb_vcp-impl.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usb_vcp-impl.h rename to core/embed/trezorhal/stm32f4/usb/usb_vcp-impl.h diff --git a/core/embed/trezorhal/stm32f4/usb_webusb-impl.h b/core/embed/trezorhal/stm32f4/usb/usb_webusb-impl.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usb_webusb-impl.h rename to core/embed/trezorhal/stm32f4/usb/usb_webusb-impl.h diff --git a/core/embed/trezorhal/stm32f4/usbd_conf.c b/core/embed/trezorhal/stm32f4/usb/usbd_conf.c similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_conf.c rename to core/embed/trezorhal/stm32f4/usb/usbd_conf.c diff --git a/core/embed/trezorhal/stm32f4/usbd_conf.h b/core/embed/trezorhal/stm32f4/usb/usbd_conf.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_conf.h rename to core/embed/trezorhal/stm32f4/usb/usbd_conf.h diff --git a/core/embed/trezorhal/stm32f4/usbd_core.c b/core/embed/trezorhal/stm32f4/usb/usbd_core.c similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_core.c rename to core/embed/trezorhal/stm32f4/usb/usbd_core.c diff --git a/core/embed/trezorhal/stm32f4/usbd_core.h b/core/embed/trezorhal/stm32f4/usb/usbd_core.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_core.h rename to core/embed/trezorhal/stm32f4/usb/usbd_core.h diff --git a/core/embed/trezorhal/stm32f4/usbd_ctlreq.c b/core/embed/trezorhal/stm32f4/usb/usbd_ctlreq.c similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_ctlreq.c rename to core/embed/trezorhal/stm32f4/usb/usbd_ctlreq.c diff --git a/core/embed/trezorhal/stm32f4/usbd_ctlreq.h b/core/embed/trezorhal/stm32f4/usb/usbd_ctlreq.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_ctlreq.h rename to core/embed/trezorhal/stm32f4/usb/usbd_ctlreq.h diff --git a/core/embed/trezorhal/stm32f4/usbd_def.h b/core/embed/trezorhal/stm32f4/usb/usbd_def.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_def.h rename to core/embed/trezorhal/stm32f4/usb/usbd_def.h diff --git a/core/embed/trezorhal/stm32f4/usbd_ioreq.c b/core/embed/trezorhal/stm32f4/usb/usbd_ioreq.c similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_ioreq.c rename to core/embed/trezorhal/stm32f4/usb/usbd_ioreq.c diff --git a/core/embed/trezorhal/stm32f4/usbd_ioreq.h b/core/embed/trezorhal/stm32f4/usb/usbd_ioreq.h similarity index 100% rename from core/embed/trezorhal/stm32f4/usbd_ioreq.h rename to core/embed/trezorhal/stm32f4/usb/usbd_ioreq.h diff --git a/core/embed/trezorhal/stm32u5/usb b/core/embed/trezorhal/stm32u5/usb new file mode 120000 index 0000000000..cbd91c097f --- /dev/null +++ b/core/embed/trezorhal/stm32u5/usb @@ -0,0 +1 @@ +../stm32f4/usb \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usb.c b/core/embed/trezorhal/stm32u5/usb.c deleted file mode 120000 index e05e3c0912..0000000000 --- a/core/embed/trezorhal/stm32u5/usb.c +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usb.c \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usb_hid-impl.h b/core/embed/trezorhal/stm32u5/usb_hid-impl.h deleted file mode 120000 index 89e47b5ef0..0000000000 --- a/core/embed/trezorhal/stm32u5/usb_hid-impl.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usb_hid-impl.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usb_vcp-impl.h b/core/embed/trezorhal/stm32u5/usb_vcp-impl.h deleted file mode 120000 index be4e3b8e74..0000000000 --- a/core/embed/trezorhal/stm32u5/usb_vcp-impl.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usb_vcp-impl.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usb_webusb-impl.h b/core/embed/trezorhal/stm32u5/usb_webusb-impl.h deleted file mode 120000 index 749c2f52f9..0000000000 --- a/core/embed/trezorhal/stm32u5/usb_webusb-impl.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usb_webusb-impl.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_conf.c b/core/embed/trezorhal/stm32u5/usbd_conf.c deleted file mode 120000 index 96c576f982..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_conf.c +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_conf.c \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_conf.h b/core/embed/trezorhal/stm32u5/usbd_conf.h deleted file mode 120000 index 21f3e5266e..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_conf.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_conf.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_core.c b/core/embed/trezorhal/stm32u5/usbd_core.c deleted file mode 120000 index 554c29cbfa..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_core.c +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_core.c \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_core.h b/core/embed/trezorhal/stm32u5/usbd_core.h deleted file mode 120000 index ee7585f5a3..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_core.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_core.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_ctlreq.c b/core/embed/trezorhal/stm32u5/usbd_ctlreq.c deleted file mode 120000 index a9065b0abe..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_ctlreq.c +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_ctlreq.c \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_ctlreq.h b/core/embed/trezorhal/stm32u5/usbd_ctlreq.h deleted file mode 120000 index 8f764f56a9..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_ctlreq.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_ctlreq.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_def.h b/core/embed/trezorhal/stm32u5/usbd_def.h deleted file mode 120000 index 72e5b4b70f..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_def.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_def.h \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_ioreq.c b/core/embed/trezorhal/stm32u5/usbd_ioreq.c deleted file mode 120000 index cf5c0a30e2..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_ioreq.c +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_ioreq.c \ No newline at end of file diff --git a/core/embed/trezorhal/stm32u5/usbd_ioreq.h b/core/embed/trezorhal/stm32u5/usbd_ioreq.h deleted file mode 120000 index 06da29b5c6..0000000000 --- a/core/embed/trezorhal/stm32u5/usbd_ioreq.h +++ /dev/null @@ -1 +0,0 @@ -../stm32f4/usbd_ioreq.h \ No newline at end of file diff --git a/core/site_scons/models/D001/discovery.py b/core/site_scons/models/D001/discovery.py index d4b57c3626..3dd0d2babb 100644 --- a/core/site_scons/models/D001/discovery.py +++ b/core/site_scons/models/D001/discovery.py @@ -76,11 +76,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/D002/discovery2.py b/core/site_scons/models/D002/discovery2.py index 0100883ad0..42cd6d4e12 100644 --- a/core/site_scons/models/D002/discovery2.py +++ b/core/site_scons/models/D002/discovery2.py @@ -82,11 +82,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32u5/usb.c", - "embed/trezorhal/stm32u5/usbd_conf.c", - "embed/trezorhal/stm32u5/usbd_core.c", - "embed/trezorhal/stm32u5/usbd_ctlreq.c", - "embed/trezorhal/stm32u5/usbd_ioreq.c", + "embed/trezorhal/stm32u5/usb/usb.c", + "embed/trezorhal/stm32u5/usb/usbd_conf.c", + "embed/trezorhal/stm32u5/usb/usbd_core.c", + "embed/trezorhal/stm32u5/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32u5/usb/usbd_ioreq.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T1B1/trezor_1.py b/core/site_scons/models/T1B1/trezor_1.py index a3814b05f6..a1a4da0a1d 100644 --- a/core/site_scons/models/T1B1/trezor_1.py +++ b/core/site_scons/models/T1B1/trezor_1.py @@ -42,11 +42,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T2B1/trezor_r_v10.py b/core/site_scons/models/T2B1/trezor_r_v10.py index b39bc7884f..db7e2365c3 100644 --- a/core/site_scons/models/T2B1/trezor_r_v10.py +++ b/core/site_scons/models/T2B1/trezor_r_v10.py @@ -65,11 +65,11 @@ def configure( ] if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T2B1/trezor_r_v3.py b/core/site_scons/models/T2B1/trezor_r_v3.py index d1a426f7e9..9a29a06176 100644 --- a/core/site_scons/models/T2B1/trezor_r_v3.py +++ b/core/site_scons/models/T2B1/trezor_r_v3.py @@ -62,11 +62,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T2B1/trezor_r_v4.py b/core/site_scons/models/T2B1/trezor_r_v4.py index 7654b83eb8..c11de45252 100644 --- a/core/site_scons/models/T2B1/trezor_r_v4.py +++ b/core/site_scons/models/T2B1/trezor_r_v4.py @@ -58,11 +58,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T2B1/trezor_r_v6.py b/core/site_scons/models/T2B1/trezor_r_v6.py index 1d02dc6295..790927fb41 100644 --- a/core/site_scons/models/T2B1/trezor_r_v6.py +++ b/core/site_scons/models/T2B1/trezor_r_v6.py @@ -58,11 +58,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T2T1/trezor_t.py b/core/site_scons/models/T2T1/trezor_t.py index 8a96f78284..78b9a7a32e 100644 --- a/core/site_scons/models/T2T1/trezor_t.py +++ b/core/site_scons/models/T2T1/trezor_t.py @@ -100,11 +100,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32f4/usb.c", - "embed/trezorhal/stm32f4/usbd_conf.c", - "embed/trezorhal/stm32f4/usbd_core.c", - "embed/trezorhal/stm32f4/usbd_ctlreq.c", - "embed/trezorhal/stm32f4/usbd_ioreq.c", + "embed/trezorhal/stm32f4/usb/usb.c", + "embed/trezorhal/stm32f4/usb/usbd_conf.c", + "embed/trezorhal/stm32f4/usb/usbd_core.c", + "embed/trezorhal/stm32f4/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32f4/usb/usbd_ioreq.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T3T1/trezor_t3t1_revE.py b/core/site_scons/models/T3T1/trezor_t3t1_revE.py index a36c6a3813..7e43b8171a 100644 --- a/core/site_scons/models/T3T1/trezor_t3t1_revE.py +++ b/core/site_scons/models/T3T1/trezor_t3t1_revE.py @@ -100,11 +100,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32u5/usb.c", - "embed/trezorhal/stm32u5/usbd_conf.c", - "embed/trezorhal/stm32u5/usbd_core.c", - "embed/trezorhal/stm32u5/usbd_ctlreq.c", - "embed/trezorhal/stm32u5/usbd_ioreq.c", + "embed/trezorhal/stm32u5/usb/usb.c", + "embed/trezorhal/stm32u5/usb/usbd_conf.c", + "embed/trezorhal/stm32u5/usb/usbd_core.c", + "embed/trezorhal/stm32u5/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32u5/usb/usbd_ioreq.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c", ] features_available.append("usb") diff --git a/core/site_scons/models/T3T1/trezor_t3t1_v4.py b/core/site_scons/models/T3T1/trezor_t3t1_v4.py index 95cf4d5ee3..8cb8dccbe2 100644 --- a/core/site_scons/models/T3T1/trezor_t3t1_v4.py +++ b/core/site_scons/models/T3T1/trezor_t3t1_v4.py @@ -102,11 +102,11 @@ def configure( if "usb" in features_wanted: sources += [ - "embed/trezorhal/stm32u5/usb.c", - "embed/trezorhal/stm32u5/usbd_conf.c", - "embed/trezorhal/stm32u5/usbd_core.c", - "embed/trezorhal/stm32u5/usbd_ctlreq.c", - "embed/trezorhal/stm32u5/usbd_ioreq.c", + "embed/trezorhal/stm32u5/usb/usb.c", + "embed/trezorhal/stm32u5/usb/usbd_conf.c", + "embed/trezorhal/stm32u5/usb/usbd_core.c", + "embed/trezorhal/stm32u5/usb/usbd_ctlreq.c", + "embed/trezorhal/stm32u5/usb/usbd_ioreq.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c", ] features_available.append("usb")