mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
root-keys: use platform-neutral ux-api instead of graphics-server
This commit is contained in:
parent
9cbe4a9721
commit
ac673425da
2 changed files with 4 additions and 4 deletions
|
|
@ -44,7 +44,7 @@ locales = { path = "../../locales" }
|
||||||
modals = { path = "../modals" }
|
modals = { path = "../modals" }
|
||||||
|
|
||||||
# to access font maps for signing verification
|
# to access font maps for signing verification
|
||||||
graphics-server = { path = "../graphics-server" }
|
ux-api = { path = "../../libs/ux-api" }
|
||||||
|
|
||||||
# for reboots and fuse operations
|
# for reboots and fuse operations
|
||||||
jtag = { path = "../jtag" }
|
jtag = { path = "../jtag" }
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ use curve25519_dalek::scalar::Scalar;
|
||||||
use curve25519_dalek::{EdwardsPoint, edwards::CompressedEdwardsY};
|
use curve25519_dalek::{EdwardsPoint, edwards::CompressedEdwardsY};
|
||||||
use ed25519_dalek::{DigestSigner, Signature, Signer, SigningKey, VerifyingKey};
|
use ed25519_dalek::{DigestSigner, Signature, Signer, SigningKey, VerifyingKey};
|
||||||
use gam::modal::{ActionType, Modal, ProgressBar, Slider};
|
use gam::modal::{ActionType, Modal, ProgressBar, Slider};
|
||||||
use graphics_server::BulkRead;
|
|
||||||
use keywrap::*;
|
use keywrap::*;
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
|
@ -22,6 +21,7 @@ use rand_core::RngCore;
|
||||||
use root_keys::key2bits::*;
|
use root_keys::key2bits::*;
|
||||||
use sha2::{Digest, Sha256, Sha512_256Sw, Sha512Hw, Sha512Sw};
|
use sha2::{Digest, Sha256, Sha512_256Sw, Sha512Hw, Sha512Sw};
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
|
use ux_api::service::api::BulkRead;
|
||||||
use xous::KERNEL_BACKUP_OFFSET;
|
use xous::KERNEL_BACKUP_OFFSET;
|
||||||
use xous_semver::SemVer;
|
use xous_semver::SemVer;
|
||||||
|
|
||||||
|
|
@ -169,7 +169,7 @@ pub(crate) struct RootKeys {
|
||||||
* layer */
|
* layer */
|
||||||
susres: susres::Susres, // for disabling suspend/resume
|
susres: susres::Susres, // for disabling suspend/resume
|
||||||
trng: trng::Trng,
|
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,
|
spinor: spinor::Spinor,
|
||||||
ticktimer: ticktimer_server::Ticktimer,
|
ticktimer: ticktimer_server::Ticktimer,
|
||||||
gam: gam::Gam,
|
gam: gam::Gam,
|
||||||
|
|
@ -306,7 +306,7 @@ impl<'a> RootKeys {
|
||||||
cur_password_type: None,
|
cur_password_type: None,
|
||||||
susres: susres::Susres::new_without_hook(&xns).expect("couldn't connect to susres without hook"),
|
susres: susres::Susres::new_without_hook(&xns).expect("couldn't connect to susres without hook"),
|
||||||
trng,
|
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,
|
spinor,
|
||||||
ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"),
|
ticktimer: ticktimer_server::Ticktimer::new().expect("couldn't connect to ticktimer"),
|
||||||
gam: gam::Gam::new(&xns).expect("couldn't connect to GAM"),
|
gam: gam::Gam::new(&xns).expect("couldn't connect to GAM"),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue