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

WIP - remove toif feature

Browse Source
This commit is contained in:
grdddj 2023-05-12 14:44:20 +02:00
parent f742318a08
commit c9a164c52e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ build = "build.rs"
default = ["model_tt"] default = ["model_tt"]
bitcoin_only = [] bitcoin_only = []
model_tt = ["jpeg"] model_tt = ["jpeg"]
model_tr = ["toif"] model_tr = []
micropython = [] micropython = []
protobuf = ["micropython"] protobuf = ["micropython"]
ui = [] ui = []
@ -21,7 +21,6 @@ button = []
touch = [] touch = []
clippy = [] clippy = []
jpeg = [] jpeg = []
toif = []
disp_i8080_8bit_dw = [] # write pixels directly to peripheral disp_i8080_8bit_dw = [] # write pixels directly to peripheral
disp_i8080_16bit_dw = [] # write pixels directly to peripheral disp_i8080_16bit_dw = [] # write pixels directly to peripheral
debug = ["ui_debug"] debug = ["ui_debug"]

15
core/embed/rust/src/ui/layout/util.rs
View File

@ -19,15 +19,15 @@ use crate::{
use cstr_core::cstr; use cstr_core::cstr;
use heapless::Vec; use heapless::Vec;
#[cfg(any(feature = "toif", feature = "jpeg"))]
use crate::micropython::{
buffer::get_buffer,
ffi::{mp_obj_new_int, mp_obj_new_tuple},
};
#[cfg(feature = "jpeg")] #[cfg(feature = "jpeg")]
use crate::ui::display::tjpgd::{jpeg_info, jpeg_test}; use crate::ui::display::tjpgd::{jpeg_info, jpeg_test};
#[cfg(feature = "toif")] use crate::{
use crate::ui::display::toif::Toif; micropython::{
buffer::get_buffer,
ffi::{mp_obj_new_int, mp_obj_new_tuple},
},
ui::display::toif::Toif,
};
pub fn iter_into_objs<const N: usize>(iterable: Obj) -> Result<[Obj; N], Error> { pub fn iter_into_objs<const N: usize>(iterable: Obj) -> Result<[Obj; N], Error> {
let err = Error::ValueError(cstr!("Invalid iterable length")); let err = Error::ValueError(cstr!("Invalid iterable length"));
@ -251,7 +251,6 @@ pub extern "C" fn upy_jpeg_info(data: Obj) -> Obj {
unsafe { try_or_raise(block) } unsafe { try_or_raise(block) }
} }
#[cfg(feature = "toif")]
pub extern "C" fn upy_toif_info(data: Obj) -> Obj { pub extern "C" fn upy_toif_info(data: Obj) -> Obj {
let block = || { let block = || {
let buffer = unsafe { get_buffer(data) }; let buffer = unsafe { get_buffer(data) };