mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
clean up warnings, and fix some hosted mode issues
This commit is contained in:
parent
20a6244687
commit
a19fc87687
7 changed files with 22 additions and 7 deletions
|
|
@ -1,3 +1,4 @@
|
||||||
|
#[cfg_attr(not(any(target_os = "none", target_os = "xous")), allow(dead_code))]
|
||||||
pub const LOGO_MAP: [u32; 11 * 160] = [
|
pub const LOGO_MAP: [u32; 11 * 160] = [
|
||||||
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0000,
|
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0000,
|
||||||
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0000,
|
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffff0000,
|
||||||
|
|
|
||||||
|
|
@ -493,7 +493,7 @@ mod implementation {
|
||||||
JtagPhy {
|
JtagPhy {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn sync(&mut self, tdi: bool, tms: bool) -> bool {
|
pub fn sync(&mut self, _tdi: bool, _tms: bool) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ pub enum PasswordType {
|
||||||
Boot = 1,
|
Boot = 1,
|
||||||
Update = 2,
|
Update = 2,
|
||||||
}
|
}
|
||||||
|
#[cfg_attr(not(any(target_os = "none", target_os = "xous")), allow(dead_code))]
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||||
pub enum RootkeyResult {
|
pub enum RootkeyResult {
|
||||||
AlignmentError,
|
AlignmentError,
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,6 @@ pub struct MetadataInFlash {
|
||||||
// a stub to try to avoid breaking hosted mode for as long as possible.
|
// a stub to try to avoid breaking hosted mode for as long as possible.
|
||||||
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
||||||
mod implementation {
|
mod implementation {
|
||||||
use crate::ROOTKEY_MODAL_NAME;
|
|
||||||
use crate::PasswordRetentionPolicy;
|
use crate::PasswordRetentionPolicy;
|
||||||
use crate::PasswordType;
|
use crate::PasswordType;
|
||||||
use gam::modal::{Modal, Slider};
|
use gam::modal::{Modal, Slider};
|
||||||
|
|
@ -121,7 +120,7 @@ mod implementation {
|
||||||
}
|
}
|
||||||
pub fn is_initialized(&self) -> bool {true}
|
pub fn is_initialized(&self) -> bool {true}
|
||||||
pub fn setup_key_init(&mut self) {}
|
pub fn setup_key_init(&mut self) {}
|
||||||
pub fn do_key_init(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
fn fake_progress(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID, msg: &str) -> Result<(), RootkeyResult> {
|
||||||
let mut progress_action = Slider::new(main_cid, Opcode::UxGutter.to_u32().unwrap(),
|
let mut progress_action = Slider::new(main_cid, Opcode::UxGutter.to_u32().unwrap(),
|
||||||
0, 100, 10, Some("%"), 0, true, true
|
0, 100, 10, Some("%"), 0, true, true
|
||||||
);
|
);
|
||||||
|
|
@ -129,7 +128,7 @@ mod implementation {
|
||||||
// now show the init wait note...
|
// now show the init wait note...
|
||||||
rootkeys_modal.modify(
|
rootkeys_modal.modify(
|
||||||
Some(ActionType::Slider(progress_action)),
|
Some(ActionType::Slider(progress_action)),
|
||||||
Some(t!("rootkeys.setup_wait", xous::LANG)), false,
|
Some(msg), false,
|
||||||
None, true, None);
|
None, true, None);
|
||||||
rootkeys_modal.activate();
|
rootkeys_modal.activate();
|
||||||
|
|
||||||
|
|
@ -145,17 +144,28 @@ mod implementation {
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
pub fn do_key_init(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
||||||
|
self.fake_progress(rootkeys_modal, main_cid, t!("rootkeys.setup_wait", xous::LANG))
|
||||||
|
}
|
||||||
|
pub fn do_gateware_update(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
||||||
|
self.fake_progress(rootkeys_modal, main_cid, t!("rootkeys.gwup_starting", xous::LANG))
|
||||||
|
}
|
||||||
|
pub fn do_sign_xous(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
||||||
|
self.fake_progress(rootkeys_modal, main_cid, t!("rootkeys.init.signing_kernel", xous::LANG))
|
||||||
|
}
|
||||||
|
pub fn purge_password(&mut self, _ptype: PasswordType) {}
|
||||||
|
|
||||||
pub fn get_ux_password_type(&self) -> Option<PasswordType> {self.password_type}
|
pub fn get_ux_password_type(&self) -> Option<PasswordType> {self.password_type}
|
||||||
pub fn finish_key_init(&mut self) {}
|
pub fn finish_key_init(&mut self) {}
|
||||||
pub fn verify_gateware_self_signature(&mut self) -> bool {
|
pub fn verify_gateware_self_signature(&mut self) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
pub fn test(&mut self, rootkeys_modal: &mut Modal, main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
pub fn test(&mut self, _rootkeys_modal: &mut Modal, _main_cid: xous::CID) -> Result<(), RootkeyResult> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn is_jtag_working(&self) -> bool {false}
|
pub fn is_jtag_working(&self) -> bool {false}
|
||||||
pub fn is_efuse_secured(&self) -> Option<bool> {None}
|
pub fn is_efuse_secured(&self) -> Option<bool> {None}
|
||||||
pub fn check_gateware_signature(&mut self, region_enum: GatewareRegion) -> SignatureResult {
|
pub fn check_gateware_signature(&mut self, _region_enum: GatewareRegion) -> SignatureResult {
|
||||||
log::info!("faking gateware check...");
|
log::info!("faking gateware check...");
|
||||||
self.ticktimer.sleep_ms(4000).unwrap();
|
self.ticktimer.sleep_ms(4000).unwrap();
|
||||||
log::info!("done");
|
log::info!("done");
|
||||||
|
|
@ -164,6 +174,7 @@ mod implementation {
|
||||||
pub fn is_pcache_update_password_valid(&self) -> bool {
|
pub fn is_pcache_update_password_valid(&self) -> bool {
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn fetch_gw_metadata(&self, _region_enum: GatewareRegion) -> MetadataInFlash {
|
pub fn fetch_gw_metadata(&self, _region_enum: GatewareRegion) -> MetadataInFlash {
|
||||||
MetadataInFlash {
|
MetadataInFlash {
|
||||||
magic: 0x6174656d,
|
magic: 0x6174656d,
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ pub(crate) const SERVER_NAME_SPINOR: &str = "_SPINOR Hardware Interface Serv
|
||||||
|
|
||||||
#[cfg(any(target_os = "none", target_os = "xous"))]
|
#[cfg(any(target_os = "none", target_os = "xous"))]
|
||||||
pub const SPINOR_SIZE_BYTES: u32 = 128 * 1024 * 1024; // physical size of the device, used for hardware sanity checks on requests
|
pub const SPINOR_SIZE_BYTES: u32 = 128 * 1024 * 1024; // physical size of the device, used for hardware sanity checks on requests
|
||||||
|
#[cfg_attr(not(any(target_os = "none", target_os = "xous")), allow(dead_code))]
|
||||||
pub const SPINOR_ERASE_SIZE: u32 = 0x1000; // this is the smallest sector size. 64k sectors also exist, but this implementation does not use them.
|
pub const SPINOR_ERASE_SIZE: u32 = 0x1000; // this is the smallest sector size. 64k sectors also exist, but this implementation does not use them.
|
||||||
// note: logical lengths of regions are in xous::definitions
|
// note: logical lengths of regions are in xous::definitions
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ use graphics_server::*;
|
||||||
use locales::t;
|
use locales::t;
|
||||||
|
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
#[cfg_attr(not(any(target_os = "none", target_os = "xous")), allow(unused_imports))]
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ pub fn map_memory_post(
|
||||||
_virt: Option<MemoryAddress>,
|
_virt: Option<MemoryAddress>,
|
||||||
_size: usize,
|
_size: usize,
|
||||||
_flags: MemoryFlags,
|
_flags: MemoryFlags,
|
||||||
|
#[cfg_attr(not(any(target_os = "none", target_os = "xous")), allow(unused_mut))]
|
||||||
mut range: MemoryRange,
|
mut range: MemoryRange,
|
||||||
) -> core::result::Result<MemoryRange, Error> {
|
) -> core::result::Result<MemoryRange, Error> {
|
||||||
let layout = Layout::from_size_align(range.len(), 4096).unwrap();
|
let layout = Layout::from_size_align(range.len(), 4096).unwrap();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue