diff --git a/core/embed/bootloader/bootui.c b/core/embed/bootloader/bootui.c index 4e24de710..ae5937073 100644 --- a/core/embed/bootloader/bootui.c +++ b/core/embed/bootloader/bootui.c @@ -248,7 +248,7 @@ void ui_screen_done(uint8_t restart_seconds, secbool full_redraw) { screen_install_success(restart_seconds, initial_setup, full_redraw); } -void ui_screen_boot_empty(bool fading) { screen_boot_empty(fading); } +void ui_screen_boot_stage_1(bool fading) { screen_boot_stage_1(fading); } // error UI void ui_screen_fail(void) { screen_install_fail(); } diff --git a/core/embed/bootloader/bootui.h b/core/embed/bootloader/bootui.h index 358795e6d..c63a6ffa3 100644 --- a/core/embed/bootloader/bootui.h +++ b/core/embed/bootloader/bootui.h @@ -67,7 +67,7 @@ void ui_fadein(void); void ui_fadeout(void); void ui_set_initial_setup(bool initial); -void ui_screen_boot_empty(bool fading); +void ui_screen_boot_stage_1(bool fading); #ifdef USE_OPTIGA uint32_t ui_screen_unlock_bootloader_confirm(void); diff --git a/core/embed/bootloader/main.c b/core/embed/bootloader/main.c index 9d0409536..99ce69171 100644 --- a/core/embed/bootloader/main.c +++ b/core/embed/bootloader/main.c @@ -350,7 +350,7 @@ void real_jump_to_firmware(void) { ui_screen_boot_click(); } - ui_screen_boot_empty(false); + ui_screen_boot_stage_1(false); } ensure_compatible_settings(); @@ -418,7 +418,7 @@ int bootloader_main(void) { #endif #endif - ui_screen_boot_empty(false); + ui_screen_boot_stage_1(false); mpu_config_bootloader(); @@ -621,7 +621,7 @@ int bootloader_main(void) { } if (ui_result == 0x11223344) { // reboot #ifndef STM32U5 - ui_screen_boot_empty(true); + ui_screen_boot_stage_1(true); #endif continue_to_firmware = firmware_present; continue_to_firmware_backup = firmware_present_backup; @@ -686,7 +686,7 @@ int bootloader_main(void) { #ifdef STM32U5 firmware_jump_fn = jump_to_fw_through_reset; #else - ui_screen_boot_empty(true); + ui_screen_boot_stage_1(true); firmware_jump_fn = real_jump_to_firmware; #endif break; diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c index 61769b000..e532c99c5 100644 --- a/core/embed/firmware/main.c +++ b/core/embed/firmware/main.c @@ -134,7 +134,7 @@ int main(void) { display_reinit(); - screen_boot_full(); + screen_boot_stage_2(); #if !defined TREZOR_MODEL_1 parse_boardloader_capabilities(); diff --git a/core/embed/rust/rust_ui_bootloader.h b/core/embed/rust/rust_ui_bootloader.h index e016591e2..09613cf03 100644 --- a/core/embed/rust/rust_ui_bootloader.h +++ b/core/embed/rust/rust_ui_bootloader.h @@ -20,7 +20,7 @@ uint32_t screen_install_success(uint8_t restart_seconds, bool initial_setup, bool complete_draw); uint32_t screen_install_fail(void); void screen_welcome(void); -void screen_boot_empty(bool fading); +void screen_boot_stage_1(bool fading); uint32_t screen_unlock_bootloader_confirm(void); void screen_unlock_bootloader_success(void); void bld_continue_label(uint16_t bg_color); diff --git a/core/embed/rust/rust_ui_common.h b/core/embed/rust/rust_ui_common.h index 4569f4c6c..4297bd39a 100644 --- a/core/embed/rust/rust_ui_common.h +++ b/core/embed/rust/rust_ui_common.h @@ -3,7 +3,7 @@ void screen_fatal_error_rust(const char* title, const char* msg, const char* footer); -void screen_boot_full(void); +void screen_boot_stage_2(void); void display_image(int16_t x, int16_t y, const uint8_t* data, uint32_t datalen); void display_icon(int16_t x, int16_t y, const uint8_t* data, uint32_t datalen, diff --git a/core/embed/rust/src/ui/api/bootloader_c.rs b/core/embed/rust/src/ui/api/bootloader_c.rs index 2117b464e..9eac86cd2 100644 --- a/core/embed/rust/src/ui/api/bootloader_c.rs +++ b/core/embed/rust/src/ui/api/bootloader_c.rs @@ -97,8 +97,8 @@ extern "C" fn screen_intro( } #[no_mangle] -extern "C" fn screen_boot_empty(fading: bool) { - ModelUI::screen_boot_empty(fading) +extern "C" fn screen_boot_stage_1(fading: bool) { + ModelUI::screen_boot_stage_1(fading) } #[no_mangle] diff --git a/core/embed/rust/src/ui/api/common_c.rs b/core/embed/rust/src/ui/api/common_c.rs index 748b02a60..51a427188 100644 --- a/core/embed/rust/src/ui/api/common_c.rs +++ b/core/embed/rust/src/ui/api/common_c.rs @@ -24,8 +24,8 @@ extern "C" fn screen_fatal_error_rust( } #[no_mangle] -extern "C" fn screen_boot_full() { - ModelUI::screen_boot_full(); +extern "C" fn screen_boot_stage_2() { + ModelUI::screen_boot_stage_2(); } #[no_mangle] diff --git a/core/embed/rust/src/ui/model_mercury/bootloader/mod.rs b/core/embed/rust/src/ui/model_mercury/bootloader/mod.rs index 6598924bf..f65f726f5 100644 --- a/core/embed/rust/src/ui/model_mercury/bootloader/mod.rs +++ b/core/embed/rust/src/ui/model_mercury/bootloader/mod.rs @@ -247,7 +247,7 @@ impl UIFeaturesBootloader for ModelMercuryFeatures { run(&mut frame) } - fn screen_boot_empty(fading: bool) { + fn screen_boot_stage_1(fading: bool) { if fading { Self::fadeout(); } diff --git a/core/embed/rust/src/ui/model_mercury/mod.rs b/core/embed/rust/src/ui/model_mercury/mod.rs index 7216de5bb..390474919 100644 --- a/core/embed/rust/src/ui/model_mercury/mod.rs +++ b/core/embed/rust/src/ui/model_mercury/mod.rs @@ -27,7 +27,7 @@ impl UIFeaturesCommon for ModelMercuryFeatures { screens::screen_fatal_error(title, msg, footer); } - fn screen_boot_full() { - screens::screen_boot_full(); + fn screen_boot_stage_2() { + screens::screen_boot_stage_2(); } } diff --git a/core/embed/rust/src/ui/model_mercury/screens.rs b/core/embed/rust/src/ui/model_mercury/screens.rs index 3738f0438..8cbc9c73c 100644 --- a/core/embed/rust/src/ui/model_mercury/screens.rs +++ b/core/embed/rust/src/ui/model_mercury/screens.rs @@ -11,7 +11,7 @@ pub fn screen_fatal_error(title: &str, msg: &str, footer: &str) { frame.paint(); } -pub fn screen_boot_full() { +pub fn screen_boot_stage_2() { let mut frame = WelcomeScreen::new(); frame.place(screen()); display::sync(); diff --git a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs index a807449f4..c6a57f693 100644 --- a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs +++ b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs @@ -260,7 +260,7 @@ impl UIFeaturesBootloader for ModelTRFeatures { run(&mut frame) } - fn screen_boot_empty(_fading: bool) { + fn screen_boot_stage_1(_fading: bool) { display::rect_fill(SCREEN, BLD_BG); let mut frame = WelcomeScreen::new(true); diff --git a/core/embed/rust/src/ui/model_tr/mod.rs b/core/embed/rust/src/ui/model_tr/mod.rs index da51b42c5..cec56de9d 100644 --- a/core/embed/rust/src/ui/model_tr/mod.rs +++ b/core/embed/rust/src/ui/model_tr/mod.rs @@ -19,7 +19,7 @@ impl UIFeaturesCommon for ModelTRFeatures { screens::screen_fatal_error(title, msg, footer); } - fn screen_boot_full() { - screens::screen_boot_full(); + fn screen_boot_stage_2() { + screens::screen_boot_stage_2(); } } diff --git a/core/embed/rust/src/ui/model_tr/screens.rs b/core/embed/rust/src/ui/model_tr/screens.rs index ab428272f..4855d3074 100644 --- a/core/embed/rust/src/ui/model_tr/screens.rs +++ b/core/embed/rust/src/ui/model_tr/screens.rs @@ -11,7 +11,7 @@ pub fn screen_fatal_error(title: &str, msg: &str, footer: &str) { display::refresh(); } -pub fn screen_boot_full() { +pub fn screen_boot_stage_2() { let mut frame = WelcomeScreen::new(false); frame.place(screen()); display::sync(); diff --git a/core/embed/rust/src/ui/model_tt/bootloader/mod.rs b/core/embed/rust/src/ui/model_tt/bootloader/mod.rs index a615a8b6a..ef7865424 100644 --- a/core/embed/rust/src/ui/model_tt/bootloader/mod.rs +++ b/core/embed/rust/src/ui/model_tt/bootloader/mod.rs @@ -245,7 +245,7 @@ impl UIFeaturesBootloader for ModelTTFeatures { run(&mut frame) } - fn screen_boot_empty(fading: bool) { + fn screen_boot_stage_1(fading: bool) { if fading { ModelTTFeatures::fadeout(); } diff --git a/core/embed/rust/src/ui/model_tt/mod.rs b/core/embed/rust/src/ui/model_tt/mod.rs index e7ecfae5a..a4f353e04 100644 --- a/core/embed/rust/src/ui/model_tt/mod.rs +++ b/core/embed/rust/src/ui/model_tt/mod.rs @@ -34,7 +34,7 @@ impl UIFeaturesCommon for ModelTTFeatures { screens::screen_fatal_error(title, msg, footer); } - fn screen_boot_full() { - screens::screen_boot_full(); + fn screen_boot_stage_2() { + screens::screen_boot_stage_2(); } } diff --git a/core/embed/rust/src/ui/model_tt/screens.rs b/core/embed/rust/src/ui/model_tt/screens.rs index 8051c7056..b21d4d2bc 100644 --- a/core/embed/rust/src/ui/model_tt/screens.rs +++ b/core/embed/rust/src/ui/model_tt/screens.rs @@ -15,7 +15,7 @@ pub fn screen_fatal_error(title: &str, msg: &str, footer: &str) { display::refresh(); } -pub fn screen_boot_full() { +pub fn screen_boot_stage_2() { let mut frame = WelcomeScreen::new(false); frame.place(screen()); display::sync(); diff --git a/core/embed/rust/src/ui/ui_features.rs b/core/embed/rust/src/ui/ui_features.rs index 2cc8022dc..2089d05e6 100644 --- a/core/embed/rust/src/ui/ui_features.rs +++ b/core/embed/rust/src/ui/ui_features.rs @@ -11,7 +11,7 @@ pub trait UIFeaturesCommon { fn screen_fatal_error(title: &str, msg: &str, footer: &str); - fn screen_boot_full(); + fn screen_boot_stage_2(); } #[cfg(feature = "bootloader")] @@ -43,7 +43,7 @@ pub trait UIFeaturesBootloader { fn screen_intro(bld_version: &str, vendor: &str, version: &str, fw_ok: bool) -> u32; - fn screen_boot_empty(fading: bool); + fn screen_boot_stage_1(fading: bool); fn screen_wipe_progress(progress: u16, initialize: bool);