From 8763cf3133adf922c14a79565fc0f8dfe280bf7c Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 24 Mar 2021 22:48:23 +0800 Subject: [PATCH] stash before merge --- services/kernel-test/src/main.rs | 6 +++--- services/llio/src/main.rs | 2 +- xtask/src/main.rs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/kernel-test/src/main.rs b/services/kernel-test/src/main.rs index 3ddaa06e9..1a45e8ccc 100644 --- a/services/kernel-test/src/main.rs +++ b/services/kernel-test/src/main.rs @@ -6,9 +6,9 @@ fn sleep_loop(sleep_ms: usize) { let ticktimer_conn = xous::connect(ticktimer_server_id).unwrap(); let tid = xous::current_tid().unwrap(); let sleep_ms = match tid { - 4 => 50, - 2 => 10, - 3 => 20, + 4 => 500, + 2 => 100, + 3 => 200, _ => panic!("Unknown TID"), }; // log::info!("My thread number is {}, sleeping 0x{:08x} ({}) ms", tid, sleep_ms, sleep_ms); diff --git a/services/llio/src/main.rs b/services/llio/src/main.rs index 32fe04063..abcd20a15 100644 --- a/services/llio/src/main.rs +++ b/services/llio/src/main.rs @@ -70,7 +70,7 @@ mod implementation { .expect("couldn't map GPIO CSR range"); let mut gpio_csr = CSR::new(gpio_base.as_mut_ptr() as *mut u32); // setup the initial logging output - gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 1); // 0 = kernel, 1 = log, 2 = app_uart + gpio_csr.wfo(utra::gpio::UARTSEL_UARTSEL, 0); // 0 = kernel, 1 = log, 2 = app_uart gpio_base.as_mut_ptr() as *mut u32 } diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 77507aead..3d574ac53 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -50,6 +50,7 @@ fn try_main() -> Result<(), DynError> { "keyboard", "trng", "llio", + "kernel-test", ]; let fcc_pkgs = [ "shell",