From 432a4467c3b5e58d443fc7d84dcdcfce0a2c2cb4 Mon Sep 17 00:00:00 2001 From: Andrew Shen Date: Sat, 12 Dec 2020 20:47:46 -0800 Subject: [PATCH 1/2] Copy WDT into emulator to fix build break Quick fix a build break in ticktimer-server by copying the WDT from the SoC into the emulator so that it can reference utra::wdt::WATCHDOG_RESET_CODE . Signed-off-by: Andrew Shen --- emulation/renode.svd | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/emulation/renode.svd b/emulation/renode.svd index 27d5d3378..6548ff5bf 100644 --- a/emulation/renode.svd +++ b/emulation/renode.svd @@ -5243,6 +5243,58 @@ exactly reflects the binary layout of an Engine instruction.]]> registers + + WDT + 0xF0020000 + WDT + + + WATCHDOG + 0x0000 + 0x00 + 32 + + + reset_code + 15 + [15:0] + 0 + + + + enable + 16 + [16:16] + 16 + + + + + + PERIOD + 0x0004 + 0x135f1b40 + 32 + + + period + 31 + [31:0] + 0 + + + + + + + 0 + 0x8 + registers + + From ddd57c30bdfce6c120eac4094cd78333f501b2dd Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 14 Dec 2020 17:02:58 +0800 Subject: [PATCH 2/2] kernel: fix compile error when debug-print enabled This tracks a variable that has been renamed, and was preventing the kernel from compiling when debug printing is enabled. This fixes #19. Signed-off-by: Sean Cross --- kernel/src/server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/server.rs b/kernel/src/server.rs index 3d64924ce..963f1a005 100644 --- a/kernel/src/server.rs +++ b/kernel/src/server.rs @@ -360,7 +360,7 @@ impl Server { .queue .get_mut(idx) .ok_or(xous_kernel::Error::BadAddress)?; - klog!("memory in queue[{}]: {:?}", idx, val); + klog!("memory in queue[{}]: {:?}", idx, current_val); let (pid, tid, server_addr, client_addr, len, forget, is_memory) = match *current_val { QueuedMessage::WaitingReturnMemory(pid, tid, server_addr, client_addr, len) => { (pid, tid, server_addr, client_addr, len, false, true)