From 4df39797c14a6befaee80103cdbc36550d9bf999 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 15 Feb 2022 17:36:53 +0800 Subject: [PATCH] fix issue #101 based on @xobs changes --- services/graphics-server/src/backend/betrusted.rs | 2 +- services/susres/src/api.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/graphics-server/src/backend/betrusted.rs b/services/graphics-server/src/backend/betrusted.rs index dc3aa2943..ebe09ed69 100644 --- a/services/graphics-server/src/backend/betrusted.rs +++ b/services/graphics-server/src/backend/betrusted.rs @@ -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::() }>, csr: utralib::CSR, susres: RegManager<{ utra::memlcd::MEMLCD_NUMREGS }>, } diff --git a/services/susres/src/api.rs b/services/susres/src/api.rs index 44ad630d3..8cdc73895 100644 --- a/services/susres/src/api.rs +++ b/services/susres/src/api.rs @@ -227,13 +227,13 @@ impl ManagedMem { impl SuspendResume for ManagedMem { fn suspend(&mut self) { let src = self.mem.as_ptr() as *const u32; - for words in 0..(self.mem.len() / core::mem::size_of::()) { + for words in 0..(N / core::mem::size_of::()) { 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::()) { + for words in 0..(N / core::mem::size_of::()) { unsafe{dst.add(words).write_volatile(self.backing[words])}; } }