mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
other crates affected by api migration
This commit is contained in:
parent
7c6ecf308e
commit
2c47db081d
4 changed files with 6 additions and 4 deletions
|
|
@ -31,6 +31,7 @@ aes = { path = "../aes" }
|
||||||
cipher = "0.4.4"
|
cipher = "0.4.4"
|
||||||
spinor = { path = "../spinor" }
|
spinor = { path = "../spinor" }
|
||||||
root-keys = { path = "../root-keys" }
|
root-keys = { path = "../root-keys" }
|
||||||
|
keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] }
|
||||||
jtag = { path = "../jtag" }
|
jtag = { path = "../jtag" }
|
||||||
net = { path = "../net" }
|
net = { path = "../net" }
|
||||||
dns = { path = "../dns" }
|
dns = { path = "../dns" }
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
use String;
|
use String;
|
||||||
use root_keys::api::{AesRootkeyType, Block};
|
use keystore_api::rootkeys_api::{AesRootkeyType, Block};
|
||||||
|
|
||||||
use crate::{CommonEnv, ShellCmdApi};
|
use crate::{CommonEnv, ShellCmdApi};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ gam = { path = "../gam" }
|
||||||
locales = { path = "../../locales" }
|
locales = { path = "../../locales" }
|
||||||
susres = { package = "xous-api-susres", version = "0.9.63" }
|
susres = { package = "xous-api-susres", version = "0.9.63" }
|
||||||
root-keys = { path = "../root-keys" }
|
root-keys = { path = "../root-keys" }
|
||||||
|
keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] }
|
||||||
modals = { path = "../modals" }
|
modals = { path = "../modals" }
|
||||||
pddb = { path = "../pddb" }
|
pddb = { path = "../pddb" }
|
||||||
net = { path = "../net" }
|
net = { path = "../net" }
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,9 @@ use chrono::prelude::*;
|
||||||
use com::api::*;
|
use com::api::*;
|
||||||
use crossbeam::channel::{Receiver, Sender, at, select, unbounded};
|
use crossbeam::channel::{Receiver, Sender, at, select, unbounded};
|
||||||
use gam::{GamObjectList, GamObjectType};
|
use gam::{GamObjectList, GamObjectType};
|
||||||
|
use keystore_api::rootkeys_api::{BackupKeyboardLayout, BackupOp};
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
use root_keys::api::{BackupKeyboardLayout, BackupOp};
|
|
||||||
use ux_api::minigfx::*;
|
use ux_api::minigfx::*;
|
||||||
use ux_api::service::api::*;
|
use ux_api::service::api::*;
|
||||||
use xous::{CID, Message, msg_scalar_unpack, send_message};
|
use xous::{CID, Message, msg_scalar_unpack, send_message};
|
||||||
|
|
@ -655,7 +655,7 @@ fn wrapped_main() -> ! {
|
||||||
.expect("couldn't exit the gutter server");
|
.expect("couldn't exit the gutter server");
|
||||||
gutter.join().expect("status boot gutter server did not exit gracefully");
|
gutter.join().expect("status boot gutter server did not exit gracefully");
|
||||||
// allocate some storage for backup checksums
|
// 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
|
// --------------------------- graphical loop timing
|
||||||
let mut stats_phase: usize = 0;
|
let mut stats_phase: usize = 0;
|
||||||
|
|
@ -1590,7 +1590,7 @@ fn wrapped_main() -> ! {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Some(StatusOpcode::PrepareBackupPhase2) => {
|
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
|
// note: default() should set the language correctly by default since it's a systemwide
|
||||||
// constant
|
// constant
|
||||||
metadata.timestamp = localtime.get_local_time_ms().unwrap_or(0);
|
metadata.timestamp = localtime.get_local_time_ms().unwrap_or(0);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue