mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
do not crash hosted mode
This commit is contained in:
parent
7cb2ec73f2
commit
28846d69ec
1 changed files with 30 additions and 11 deletions
|
|
@ -31,15 +31,19 @@ impl Slot {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(gsora): implement this so that it's a no-op on hosted mode
|
|
||||||
struct State {
|
struct State {
|
||||||
settings_page: MemoryRange,
|
settings_page: Option<MemoryRange>,
|
||||||
spinor: Spinor,
|
spinor: Spinor,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl State {
|
impl State {
|
||||||
fn set(&self, data: &[u8], slot: &Slot) {
|
fn set(&self, data: &[u8], slot: &Slot) {
|
||||||
let settings: &[u8] = self.settings_page.as_slice();
|
let settings = match self.settings_page {
|
||||||
|
Some(page) => page,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
|
let settings: &[u8] = settings.as_slice();
|
||||||
|
|
||||||
let new_data_u32 = u32::from_le_bytes(data.try_into().unwrap());
|
let new_data_u32 = u32::from_le_bytes(data.try_into().unwrap());
|
||||||
|
|
||||||
|
|
@ -53,7 +57,12 @@ impl State {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get(&self, slot: &Slot) -> u32 {
|
fn get(&self, slot: &Slot) -> u32 {
|
||||||
let settings: &[u8] = self.settings_page.as_slice();
|
let settings = match self.settings_page {
|
||||||
|
Some(page) => page,
|
||||||
|
None => return 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
let settings: &[u8] = settings.as_slice();
|
||||||
|
|
||||||
u32::from_le_bytes(settings[slot.range()].try_into().unwrap())
|
u32::from_le_bytes(settings[slot.range()].try_into().unwrap())
|
||||||
}
|
}
|
||||||
|
|
@ -67,13 +76,7 @@ fn main() -> ! {
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
|
||||||
let state = State {
|
let state = State {
|
||||||
settings_page: xous::syscall::map_memory(
|
settings_page: page_provider(),
|
||||||
xous::MemoryAddress::new((xous::EARLY_SETTINGS + xous::FLASH_PHYS_BASE) as usize),
|
|
||||||
None,
|
|
||||||
4096,
|
|
||||||
xous::MemoryFlags::R,
|
|
||||||
)
|
|
||||||
.unwrap(),
|
|
||||||
spinor: spinor::Spinor::new(&xns).unwrap(),
|
spinor: spinor::Spinor::new(&xns).unwrap(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -105,3 +108,19 @@ fn main() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn page_provider() -> Option<xous::MemoryRange> {
|
||||||
|
#[cfg(not(target_os = "xous"))]
|
||||||
|
return None;
|
||||||
|
|
||||||
|
#[cfg(target_os = "xous")]
|
||||||
|
return Some(
|
||||||
|
xous::syscall::map_memory(
|
||||||
|
xous::MemoryAddress::new((xous::EARLY_SETTINGS + xous::FLASH_PHYS_BASE) as usize),
|
||||||
|
None,
|
||||||
|
4096,
|
||||||
|
xous::MemoryFlags::R,
|
||||||
|
)
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue