From ac673425da4c61531c7a6512d538a3b17326b921 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 21 Feb 2025 17:48:48 +0800 Subject: [PATCH] root-keys: use platform-neutral ux-api instead of graphics-server --- services/root-keys/Cargo.toml | 2 +- services/root-keys/src/implementation.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 4dc8074dd..bf846b300 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -44,7 +44,7 @@ locales = { path = "../../locales" } modals = { path = "../modals" } # to access font maps for signing verification -graphics-server = { path = "../graphics-server" } +ux-api = { path = "../../libs/ux-api" } # for reboots and fuse operations jtag = { path = "../jtag" } diff --git a/services/root-keys/src/implementation.rs b/services/root-keys/src/implementation.rs index 22bb3a11d..32abe1b72 100644 --- a/services/root-keys/src/implementation.rs +++ b/services/root-keys/src/implementation.rs @@ -13,7 +13,6 @@ use curve25519_dalek::scalar::Scalar; use curve25519_dalek::{EdwardsPoint, edwards::CompressedEdwardsY}; use ed25519_dalek::{DigestSigner, Signature, Signer, SigningKey, VerifyingKey}; use gam::modal::{ActionType, Modal, ProgressBar, Slider}; -use graphics_server::BulkRead; use keywrap::*; use locales::t; use num_traits::*; @@ -22,6 +21,7 @@ use rand_core::RngCore; use root_keys::key2bits::*; use sha2::{Digest, Sha256, Sha512_256Sw, Sha512Hw, Sha512Sw}; use utralib::generated::*; +use ux_api::service::api::BulkRead; use xous::KERNEL_BACKUP_OFFSET; use xous_semver::SemVer; @@ -169,7 +169,7 @@ pub(crate) struct RootKeys { * layer */ susres: susres::Susres, // for disabling suspend/resume trng: trng::Trng, - gfx: graphics_server::Gfx, // for reading out font planes for signing verification + gfx: ux_api::service::gfx::Gfx, // for reading out font planes for signing verification spinor: spinor::Spinor, ticktimer: ticktimer_server::Ticktimer, gam: gam::Gam, @@ -306,7 +306,7 @@ impl<'a> RootKeys { cur_password_type: None, susres: susres::Susres::new_without_hook(&xns).expect("couldn't connect to susres without hook"), trng, - gfx: graphics_server::Gfx::new(&xns).expect("couldn't connect to gfx"), + gfx: ux_api::service::gfx::Gfx::new(&xns).expect("couldn't connect to gfx"), spinor, ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"), gam: gam::Gam::new(&xns).expect("couldn't connect to GAM"),