arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-06 23:02:33 +00:00
Code Issues Releases Wiki Activity

fix(core): stay_in_bootloader should default to false, not true

Browse Source
This commit is contained in:
Pavol Rusnak 2021-03-06 20:09:56 +01:00
parent efac5d56f5
commit ebfd51d818
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/embed/bootloader/main.c
View File

@ -260,7 +260,7 @@ int main(void) {
vendor_header vhdr; vendor_header vhdr;
image_header hdr; image_header hdr;
secbool stay_in_bootloader = sectrue; // flag to stay in bootloader secbool stay_in_bootloader = secfalse; // flag to stay in bootloader
// detect whether the devices contains a valid firmware // detect whether the devices contains a valid firmware
@ -308,18 +308,18 @@ int main(void) {
if (bootloader_usb_loop(NULL, NULL) != sectrue) { if (bootloader_usb_loop(NULL, NULL) != sectrue) {
return 1; return 1;
} }
} else { }
// ... or if user touched the screen on start
// ... or we have stay_in_bootloader flag to force it
if (touched || stay_in_bootloader == sectrue) {
// no ui_fadeout(); - we already start from black screen
ui_screen_info(secfalse, &vhdr, &hdr);
ui_fadein();
// and start the usb loop // ... or if user touched the screen on start
if (bootloader_usb_loop(&vhdr, &hdr) != sectrue) { // ... or we have stay_in_bootloader flag to force it
return 1; if (touched || stay_in_bootloader == sectrue) {
} // no ui_fadeout(); - we already start from black screen
ui_screen_info(secfalse, &vhdr, &hdr);
ui_fadein();
// and start the usb loop
if (bootloader_usb_loop(&vhdr, &hdr) != sectrue) {
return 1;
} }
} }