From 4fda1c4dfbf5caf1543d495b89a6a4fb48a7a2df Mon Sep 17 00:00:00 2001 From: cepetr Date: Mon, 13 Jan 2025 19:08:16 +0100 Subject: [PATCH] feat(core): introduce USE_USB feature [no changelog] --- core/embed/sys/powerctl/stm32u5/powerctl_suspend.c | 4 ++++ core/site_scons/models/D001/discovery.py | 1 + core/site_scons/models/D002/discovery2.py | 1 + core/site_scons/models/T2B1/trezor_r_v10.py | 1 + core/site_scons/models/T2T1/trezor_t.py | 1 + core/site_scons/models/T3B1/trezor_t3b1_revB.py | 1 + core/site_scons/models/T3T1/trezor_t3t1_revE.py | 1 + core/site_scons/models/T3W1/trezor_t3w1_revA.py | 1 + 8 files changed, 11 insertions(+) diff --git a/core/embed/sys/powerctl/stm32u5/powerctl_suspend.c b/core/embed/sys/powerctl/stm32u5/powerctl_suspend.c index 3ea2e47f93..d3d0cdf40d 100644 --- a/core/embed/sys/powerctl/stm32u5/powerctl_suspend.c +++ b/core/embed/sys/powerctl/stm32u5/powerctl_suspend.c @@ -54,7 +54,9 @@ void powerctl_suspend(void) { // Deinitialize all drivers that are not required in low-power mode // (e.g., USB, display, touch, haptic, etc.). +#ifdef USE_USB usb_stop(); +#endif #ifdef USE_HAPTIC haptic_deinit(); #endif @@ -118,7 +120,9 @@ void powerctl_suspend(void) { #ifdef USE_HAPTIC haptic_init(); #endif +#ifdef USE_USB usb_start(); +#endif } #endif // KERNEL_MODE diff --git a/core/site_scons/models/D001/discovery.py b/core/site_scons/models/D001/discovery.py index 1b7f8359ac..644495b2fc 100644 --- a/core/site_scons/models/D001/discovery.py +++ b/core/site_scons/models/D001/discovery.py @@ -94,6 +94,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] defines += [("USE_PVD", "1")] diff --git a/core/site_scons/models/D002/discovery2.py b/core/site_scons/models/D002/discovery2.py index 71e5b87320..51265b7e5d 100644 --- a/core/site_scons/models/D002/discovery2.py +++ b/core/site_scons/models/D002/discovery2.py @@ -73,6 +73,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] defines += [ "FRAMEBUFFER", diff --git a/core/site_scons/models/T2B1/trezor_r_v10.py b/core/site_scons/models/T2B1/trezor_r_v10.py index 002775b511..e4031c3975 100644 --- a/core/site_scons/models/T2B1/trezor_r_v10.py +++ b/core/site_scons/models/T2B1/trezor_r_v10.py @@ -82,6 +82,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] if "optiga" in features_wanted: sources += ["embed/io/i2c_bus/stm32f4/i2c_bus.c"] diff --git a/core/site_scons/models/T2T1/trezor_t.py b/core/site_scons/models/T2T1/trezor_t.py index 39718b7b14..d64cb03755 100644 --- a/core/site_scons/models/T2T1/trezor_t.py +++ b/core/site_scons/models/T2T1/trezor_t.py @@ -100,6 +100,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] if "dma2d" in features_wanted: defines += ["USE_DMA2D"] diff --git a/core/site_scons/models/T3B1/trezor_t3b1_revB.py b/core/site_scons/models/T3B1/trezor_t3b1_revB.py index 8aa3229818..a734ae63fe 100644 --- a/core/site_scons/models/T3B1/trezor_t3b1_revB.py +++ b/core/site_scons/models/T3B1/trezor_t3b1_revB.py @@ -73,6 +73,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] if "optiga" in features_wanted: sources += ["embed/io/i2c_bus/stm32u5/i2c_bus.c"] diff --git a/core/site_scons/models/T3T1/trezor_t3t1_revE.py b/core/site_scons/models/T3T1/trezor_t3t1_revE.py index a9473d669b..9aa2b9ea8d 100644 --- a/core/site_scons/models/T3T1/trezor_t3t1_revE.py +++ b/core/site_scons/models/T3T1/trezor_t3t1_revE.py @@ -110,6 +110,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] if "dma2d" in features_wanted: defines += [("USE_DMA2D", "1")] diff --git a/core/site_scons/models/T3W1/trezor_t3w1_revA.py b/core/site_scons/models/T3W1/trezor_t3w1_revA.py index 2c796e7c07..2eb7b9d8f2 100644 --- a/core/site_scons/models/T3W1/trezor_t3w1_revA.py +++ b/core/site_scons/models/T3W1/trezor_t3w1_revA.py @@ -130,6 +130,7 @@ def configure( ] features_available.append("usb") paths += ["embed/io/usb/inc"] + defines += [("USE_USB", "1")] defines += [ "FRAMEBUFFER",