arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-19 12:58:13 +00:00
Code Issues Releases Wiki Activity

fix(core): introduce ui_overlay feature - fixes T3T1 bootloader compilation with new rendering

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-08-16 14:56:46 +02:00 committed by TychoVrahe
parent 77eeabf7f5
commit 5417ec15df
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/SConscript.firmware
View File

@ -845,6 +845,7 @@ def cargo_build():
if NEW_RENDERING and TREZOR_MODEL in ('T3T1', 'DISC2'): if NEW_RENDERING and TREZOR_MODEL in ('T3T1', 'DISC2'):
features.append('ui_image_buffer') features.append('ui_image_buffer')
features.append('ui_overlay')
features.extend(FEATURES_AVAILABLE) features.extend(FEATURES_AVAILABLE)

1
core/SConscript.unix
View File

@ -888,6 +888,7 @@ def cargo_build():
if NEW_RENDERING and TREZOR_MODEL in ('T3T1', ): if NEW_RENDERING and TREZOR_MODEL in ('T3T1', ):
features.append('ui_image_buffer') features.append('ui_image_buffer')
features.append('ui_overlay')
if NEW_RENDERING: if NEW_RENDERING:
features.append('new_rendering') features.append('new_rendering')

2
core/embed/rust/Cargo.toml
View File

@ -27,6 +27,7 @@ ui_blurring = []
ui_jpeg_decoder = ["jpeg"] ui_jpeg_decoder = ["jpeg"]
ui_image_buffer = [] ui_image_buffer = []
ui_color_32bit = [] ui_color_32bit = []
ui_overlay = []
new_rendering = [] new_rendering = []
bootloader = [] bootloader = []
button = [] button = []
@ -62,6 +63,7 @@ test = [
"ui_jpeg_decoder", "ui_jpeg_decoder",
"ui_blurring", "ui_blurring",
"ui_image_buffer", "ui_image_buffer",
"ui_overlay",
"universal_fw", "universal_fw",
] ]
universal_fw = [] universal_fw = []

4
core/embed/rust/src/ui/model_mercury/cshape/mod.rs
View File

@ -1,11 +1,15 @@
mod loader; mod loader;
#[cfg(feature = "ui_overlay")]
mod unlock_overlay; mod unlock_overlay;
#[cfg(feature = "ui_overlay")]
mod keyboard_overlay; mod keyboard_overlay;
#[cfg(feature = "ui_overlay")]
pub use unlock_overlay::UnlockOverlay; pub use unlock_overlay::UnlockOverlay;
#[cfg(feature = "ui_overlay")]
pub use keyboard_overlay::KeyboardOverlay; pub use keyboard_overlay::KeyboardOverlay;
pub use loader::{render_loader, LoaderRange}; pub use loader::{render_loader, LoaderRange};

9
core/embed/rust/src/ui/shape/cache/drawing_cache.rs vendored
View File

@ -16,17 +16,22 @@ const ZLIB_CACHE_SLOTS: usize = 1;
#[cfg(not(feature = "xframebuffer"))] #[cfg(not(feature = "xframebuffer"))]
const ZLIB_CACHE_SLOTS: usize = 3; const ZLIB_CACHE_SLOTS: usize = 3;
#[cfg(not(feature = "xframebuffer"))]
const RENDER_BUFF_SIZE: usize = (240 * 2 * 16) + ALIGN_PAD; const RENDER_BUFF_SIZE: usize = (240 * 2 * 16) + ALIGN_PAD;
#[cfg(feature = "model_mercury")] #[cfg(feature = "ui_overlay")]
const IMAGE_BUFF_SIZE: usize = 240 * 240 + ALIGN_PAD; const IMAGE_BUFF_SIZE: usize = 240 * 240 + ALIGN_PAD;
#[cfg(not(feature = "model_mercury"))] #[cfg(not(feature = "ui_overlay"))]
const IMAGE_BUFF_SIZE: usize = 2048 + ALIGN_PAD; const IMAGE_BUFF_SIZE: usize = 2048 + ALIGN_PAD;
pub type ImageBuff = [u8; IMAGE_BUFF_SIZE]; pub type ImageBuff = [u8; IMAGE_BUFF_SIZE];
#[cfg(not(feature = "xframebuffer"))]
pub type RenderBuff = [u8; RENDER_BUFF_SIZE]; pub type RenderBuff = [u8; RENDER_BUFF_SIZE];
pub type ImageBuffRef<'a> = RefMut<'a, ImageBuff>; pub type ImageBuffRef<'a> = RefMut<'a, ImageBuff>;
#[cfg(not(feature = "xframebuffer"))]
pub type RenderBuffRef<'a> = RefMut<'a, RenderBuff>; pub type RenderBuffRef<'a> = RefMut<'a, RenderBuff>;
pub struct DrawingCache<'a> { pub struct DrawingCache<'a> {