From 1d6c1e34de5eadc1296504097b12b57ab930aaac Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 30 Jan 2023 21:55:40 +0800 Subject: [PATCH] kernel: mem: increase default mem size The default mem size got shrunk down to 4 MB earlier, but there is a lingering issue that prevents specifying virtual addresses. As a result, pddb and others don't work. Temporarily revert this change. Signed-off-by: Sean Cross --- kernel/src/mem.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index f39dedfdc..b4aab04e9 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -312,7 +312,7 @@ impl MemoryManager { kind: xous_kernel::MemoryType, ) -> Result<*mut u8, xous_kernel::Error> { // If we were supplied a perfectly good address, return that. - if virt_ptr as usize != 0 { + if !virt_ptr.is_null() { return Ok(virt_ptr); } @@ -330,7 +330,7 @@ impl MemoryManager { } xous_kernel::MemoryType::Default => ( process_inner.mem_default_base, - process_inner.mem_default_base + 0x40_0000, // Limit to one superpage + process_inner.mem_default_base + 0x1000_0000, process_inner.mem_default_last, ), xous_kernel::MemoryType::Messages => (