other crates affected by api migration

This commit is contained in:
bunnie 2025-05-04 18:34:17 +08:00
parent 7c6ecf308e
commit 2c47db081d
4 changed files with 6 additions and 4 deletions

View file

@ -31,6 +31,7 @@ aes = { path = "../aes" }
cipher = "0.4.4"
spinor = { path = "../spinor" }
root-keys = { path = "../root-keys" }
keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] }
jtag = { path = "../jtag" }
net = { path = "../net" }
dns = { path = "../dns" }

View file

@ -1,5 +1,5 @@
use String;
use root_keys::api::{AesRootkeyType, Block};
use keystore_api::rootkeys_api::{AesRootkeyType, Block};
use crate::{CommonEnv, ShellCmdApi};

View file

@ -22,6 +22,7 @@ gam = { path = "../gam" }
locales = { path = "../../locales" }
susres = { package = "xous-api-susres", version = "0.9.63" }
root-keys = { path = "../root-keys" }
keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] }
modals = { path = "../modals" }
pddb = { path = "../pddb" }
net = { path = "../net" }

View file

@ -24,9 +24,9 @@ use chrono::prelude::*;
use com::api::*;
use crossbeam::channel::{Receiver, Sender, at, select, unbounded};
use gam::{GamObjectList, GamObjectType};
use keystore_api::rootkeys_api::{BackupKeyboardLayout, BackupOp};
use locales::t;
use num_traits::*;
use root_keys::api::{BackupKeyboardLayout, BackupOp};
use ux_api::minigfx::*;
use ux_api::service::api::*;
use xous::{CID, Message, msg_scalar_unpack, send_message};
@ -655,7 +655,7 @@ fn wrapped_main() -> ! {
.expect("couldn't exit the gutter server");
gutter.join().expect("status boot gutter server did not exit gracefully");
// allocate some storage for backup checksums
let checksums: Arc<Mutex<Option<root_keys::api::Checksums>>> = Arc::new(Mutex::new(None));
let checksums: Arc<Mutex<Option<keystore_api::rootkeys_api::Checksums>>> = Arc::new(Mutex::new(None));
// --------------------------- graphical loop timing
let mut stats_phase: usize = 0;
@ -1590,7 +1590,7 @@ fn wrapped_main() -> ! {
});
}
Some(StatusOpcode::PrepareBackupPhase2) => {
let mut metadata = root_keys::api::BackupHeader::default();
let mut metadata = keystore_api::rootkeys_api::BackupHeader::default();
// note: default() should set the language correctly by default since it's a systemwide
// constant
metadata.timestamp = localtime.get_local_time_ms().unwrap_or(0);