fix issue #101 based on @xobs changes

This commit is contained in:
bunnie 2022-02-15 17:36:53 +08:00
parent 122221227b
commit 4df39797c1
2 changed files with 3 additions and 3 deletions

View file

@ -14,7 +14,7 @@ const CONFIG_CLOCK_FREQUENCY: u32 = 100_000_000;
pub struct XousDisplay {
fb: MemoryRange,
hwfb: MemoryRange,
srfb: ManagedMem<{ utralib::generated::HW_MEMLCD_MEM_LEN }>,
srfb: ManagedMem<{ utralib::generated::HW_MEMLCD_MEM_LEN / core::mem::size_of::<u32>() }>,
csr: utralib::CSR<u32>,
susres: RegManager<{ utra::memlcd::MEMLCD_NUMREGS }>,
}

View file

@ -227,13 +227,13 @@ impl<const N: usize> ManagedMem<N> {
impl<const N: usize> SuspendResume for ManagedMem<N> {
fn suspend(&mut self) {
let src = self.mem.as_ptr() as *const u32;
for words in 0..(self.mem.len() / core::mem::size_of::<u32>()) {
for words in 0..(N / core::mem::size_of::<u32>()) {
self.backing[words] = unsafe{src.add(words).read_volatile()};
}
}
fn resume(&mut self) {
let dst = self.mem.as_ptr() as *mut u32;
for words in 0..(self.mem.len() / core::mem::size_of::<u32>()) {
for words in 0..(N / core::mem::size_of::<u32>()) {
unsafe{dst.add(words).write_volatile(self.backing[words])};
}
}