From e4292c38e7c5a05a5860e0acc62f568f2c7f8c42 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 18 Feb 2025 23:21:14 +0800 Subject: [PATCH] cleanup path specifiers to methods to improve portability --- services/modals/Cargo.toml | 7 +++++-- services/modals/src/lib.rs | 13 +++++++++---- services/modals/src/main.rs | 21 +++++++++++++++------ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/services/modals/Cargo.toml b/services/modals/Cargo.toml index 0e9c6d6ec..7a6cf5fc9 100644 --- a/services/modals/Cargo.toml +++ b/services/modals/Cargo.toml @@ -28,6 +28,8 @@ bit_field = "0.9.0" cramium-hal = { path = "../../libs/cramium-hal", optional = true, features = [ "std", ] } +cramium-emu = { path = "../../libs/cramium-emu", optional = true } +blitstr2 = { path = "../../libs/blitstr2" } ux-api = { path = "../../libs/ux-api", optional = true, features = ["std"] } utralib = { version = "0.1.25", optional = true, default-features = false } @@ -35,9 +37,10 @@ utralib = { version = "0.1.25", optional = true, default-features = false } [features] precursor = ["utralib/precursor", "trng", "gam", "tts-frontend"] hosted = ["utralib/hosted", "trng", "gam", "tts-frontend"] -hosted-baosec = ["ux-api/hosted-baosec"] renode = ["utralib/renode", "trng", "gam", "tts-frontend"] + cramium-soc = ["utralib/cramium-soc", "cram-hal-service"] +hosted-baosec = ["ux-api/hosted-baosec", "cramium-emu"] board-baosec = ["ux-api/board-baosec"] doc-deps = ["gam"] @@ -45,4 +48,4 @@ tts = [] ditherpunk = [] hazardous-debug = [] # "gam" is required for cargo doc to run successfully -default = ["trng"] +default = [] diff --git a/services/modals/src/lib.rs b/services/modals/src/lib.rs index a004c233b..7750d9487 100644 --- a/services/modals/src/lib.rs +++ b/services/modals/src/lib.rs @@ -12,9 +12,15 @@ use std::cmp::max; use std::convert::TryInto; use bit_field::BitField; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng::Trng; +#[cfg(feature = "hosted-baosec")] +use cramium_emu::trng::Trng; #[cfg(not(any(feature = "hosted-baosec", feature = "cramium-soc")))] use gam::*; use num_traits::*; +#[cfg(all(not(feature = "cramium-soc"), not(feature = "doc-deps"), not(feature = "hosted-baosec")))] +use trng::Trng; #[cfg(any(feature = "hosted-baosec", feature = "cramium-soc"))] use ux_api::widgets::*; use xous::{CID, Message, send_message}; @@ -183,11 +189,10 @@ impl Modals { REFCOUNT.fetch_add(1, Ordering::Relaxed); let conn = xns.request_connection_blocking(api::SERVER_NAME_MODALS).expect("Can't connect to Modals server"); - #[cfg(feature = "cramium-soc")] - let trng = cram_hal_service::trng::Trng::new(&xns).unwrap(); - #[cfg(not(feature = "cramium-soc"))] - let trng = trng::Trng::new(&xns).unwrap(); + let trng = Trng::new(&xns).unwrap(); + #[allow(unused_mut)] let mut token = [0u32; 4]; + #[cfg(not(feature = "doc-deps"))] trng.fill_buf(&mut token).unwrap(); Ok(Modals { conn, token, have_lock: Cell::new(false) }) } diff --git a/services/modals/src/main.rs b/services/modals/src/main.rs index 98ff69941..4d0b8c0fe 100644 --- a/services/modals/src/main.rs +++ b/services/modals/src/main.rs @@ -29,11 +29,18 @@ /// a `TextResponseValid` message which pumps the work queue. mod api; use api::*; +use blitstr2::GlyphStyle; +#[cfg(feature = "cramium-soc")] +use cram_hal_service::trng::Trng; +#[cfg(feature = "hosted-baosec")] +use cramium_emu::trng::Trng; #[cfg(feature = "ditherpunk")] use gam::Bitmap; #[cfg(not(any(feature = "hosted-baosec", feature = "cramium-soc")))] use gam::modal::*; use locales::t; +#[cfg(all(not(feature = "cramium-soc"), not(feature = "doc-deps"), not(feature = "hosted-baosec")))] +use trng::Trng; #[cfg(feature = "tts")] use tts_frontend::TtsFrontend; #[cfg(any(feature = "hosted-baosec", feature = "cramium-soc"))] @@ -42,6 +49,7 @@ use ux_api::minigfx::*; use ux_api::widgets::*; use xous::{Message, msg_blocking_scalar_unpack, msg_scalar_unpack, send_message}; use xous_ipc::Buffer; + #[cfg(feature = "tts")] const TICK_INTERVAL: u64 = 2500; @@ -126,6 +134,7 @@ fn wrapped_main() -> ! { let mut last_percentage = 0; let mut start_work: u32 = 0; let mut end_work: u32 = 100; + #[cfg(not(any(feature = "hosted-baosec", feature = "cramium-soc")))] let mut renderer_modal = Modal::new( gam::SHARED_MODAL_NAME, ActionType::TextEntry(text_action.clone()), @@ -134,6 +143,9 @@ fn wrapped_main() -> ! { DEFAULT_STYLE, 8, ); + #[cfg(any(feature = "hosted-baosec", feature = "cramium-soc"))] + let mut renderer_modal = + Modal::new(ActionType::TextEntry(text_action.clone()), Some("Placeholder"), None, DEFAULT_STYLE, 8); #[cfg(not(any(feature = "hosted-baosec", feature = "cramium-soc")))] renderer_modal.spawn_helper( modals_sid, @@ -147,10 +159,7 @@ fn wrapped_main() -> ! { let mut list_selected = 0u32; let mut token_lock: Option<[u32; 4]> = None; - #[cfg(feature = "cramium-soc")] - let trng = cram_hal_service::trng::Trng::new(&xns).unwrap(); - #[cfg(not(feature = "cramium-soc"))] - let trng = trng::Trng::new(&xns).unwrap(); + let trng = Trng::new(&xns).unwrap(); // this is a random number that serves as a "default" that cannot be guessed let default_nonce = [trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap(), trng.get_u32().unwrap()]; @@ -799,7 +808,7 @@ fn wrapped_main() -> ! { renderer_modal.set_growable(false); // reset the growable state, it's assumed to be default false log::trace!("validating text entry modal"); let buf = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let text = buf.to_original::().unwrap(); + let text = buf.to_original::().unwrap(); if let Some(mut origin) = dr.take() { let mut response = unsafe { Buffer::from_memory_message_mut(origin.body.memory_message_mut().unwrap()) @@ -856,7 +865,7 @@ fn wrapped_main() -> ! { Some(Opcode::Bip39Return) => match op { RendererState::RunBip39Input(_config) => { let buf = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let b39 = buf.to_original::().unwrap(); + let b39 = buf.to_original::().unwrap(); if let Some(mut origin) = dr.take() { let mut response = unsafe { Buffer::from_memory_message_mut(origin.body.memory_message_mut().unwrap())