From 7488018e2282c94b43663089390d668431eb2837 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 13 Dec 2020 02:03:15 +0800 Subject: [PATCH] get wdt mods compiling into xtask run --- services/ticktimer-server/src/main.rs | 2 +- xtask/src/main.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/ticktimer-server/src/main.rs b/services/ticktimer-server/src/main.rs index e5b5015f9..427305096 100644 --- a/services/ticktimer-server/src/main.rs +++ b/services/ticktimer-server/src/main.rs @@ -265,7 +265,7 @@ mod implementation { .unwrap(); } - pub fn reset_wdt() { + pub fn reset_wdt(&self) { // dummy function, does nothing } } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 9f0fccc9a..5e3dba4f1 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -145,7 +145,7 @@ fn renode_image(debug: bool) -> Result<(), DynError> { std::env::set_var("XOUS_SVD_FILE", path.canonicalize().unwrap()); let kernel = build_kernel(debug)?; let mut init = vec![]; - for pkg in &["shell", "log-server", "graphics-server", "ticktimer-server", "com", "xous-names"] { + for pkg in &["shell", "log-server", "graphics-server", "ticktimer-server", "com"] { init.push(build(pkg, debug, Some(TARGET), None)?); } build("loader", debug, Some(TARGET), Some("loader".into()))?; @@ -162,7 +162,7 @@ fn renode_image(debug: bool) -> Result<(), DynError> { fn run(debug: bool) -> Result<(), DynError> { let stream = if debug { "debug" } else { "release" }; - let init = ["shell", "log-server", "graphics-server", "ticktimer-server", "com", "xous-names"]; + let init = ["shell", "log-server", "graphics-server", "ticktimer-server", "com"]; // , "xous-names" // let mut init_paths = vec![]; for pkg in &init {