From ad3e4616ddb38f528cc375255d92ef6c6ad37bc6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 11 May 2025 12:40:56 +0800 Subject: [PATCH] incorporate xous-rs to hal migration into keystore-api --- libs/keystore-api/Cargo.toml | 1 + libs/keystore-api/src/rootkeys_api.rs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/keystore-api/Cargo.toml b/libs/keystore-api/Cargo.toml index e9da3d9db..918131198 100644 --- a/libs/keystore-api/Cargo.toml +++ b/libs/keystore-api/Cargo.toml @@ -18,6 +18,7 @@ cipher = "0.4.3" locales = { path = "../../locales", optional = true } # needed for backups to save/restore keymaps keyboard = { path = "../../services/keyboard", optional = true } +precursor-hal = { path = "../../libs/precursor-hal" } [features] gen1 = ["keyboard"] diff --git a/libs/keystore-api/src/rootkeys_api.rs b/libs/keystore-api/src/rootkeys_api.rs index f343a8282..2e0ec2193 100644 --- a/libs/keystore-api/src/rootkeys_api.rs +++ b/libs/keystore-api/src/rootkeys_api.rs @@ -1,6 +1,7 @@ use core::mem::size_of; use core::ops::{Deref, DerefMut}; +use precursor_hal::board::*; pub use rkyv_enum::*; use crate::rkyv_enum; @@ -278,7 +279,7 @@ pub const CHECKSUM_BLOCKLEN_PAGE: u32 = 0x100; /// plaintext + ciphertext header itself. /// /// Total number of checksums has to divide evenly into the size of the PDDB region -pub const TOTAL_CHECKSUMS: u32 = xous::PDDB_LEN / (CHECKSUM_BLOCKLEN_PAGE * 4096); +pub const TOTAL_CHECKSUMS: u32 = PDDB_LEN / (CHECKSUM_BLOCKLEN_PAGE * 4096); #[repr(C, align(8))] #[derive(Copy, Clone, Debug)] @@ -313,7 +314,7 @@ pub struct BackupHeader { impl Default for BackupHeader { fn default() -> Self { assert!( - xous::PDDB_LEN & ((CHECKSUM_BLOCKLEN_PAGE * 0x1000) - 1) == 0, + PDDB_LEN & ((CHECKSUM_BLOCKLEN_PAGE * 0x1000) - 1) == 0, "PDDB_LEN is not an integer multiple of CHECKSUM_LEN_PAGE" ); BackupHeader {