diff --git a/emulation/renode.svd b/emulation/renode.svd index 8f67283ac..f6ce99d35 100644 --- a/emulation/renode.svd +++ b/emulation/renode.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x79550678 + 0x933d6807 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x03 + 0x04 32 @@ -2155,26 +2155,18 @@ register to disable individual events.]]> 32 - reset + pause 0 [0:0] 0 - - - - pause - 1 - [1:1] - 1 load - 2 - [2:2] - 2 + 1 + [1:1] + 1 @@ -2183,7 +2175,7 @@ paused, this bit is ignored.]]> RESUME_TIME1 0x0004 0x00 @@ -3109,7 +3101,7 @@ inject too fast.]]> SEED1 0x0000 - 0x1cbd6891 + 0xd1ce410 32 @@ -3124,7 +3116,7 @@ inject too fast.]]> SEED0 0x0004 - 0x3d2e31ed + 0x23175a86 32 diff --git a/precursors/soc.svd b/precursors/soc.svd index 8f67283ac..f6ce99d35 100644 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x79550678 + 0x933d6807 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x03 + 0x04 32 @@ -2155,26 +2155,18 @@ register to disable individual events.]]> 32 - reset + pause 0 [0:0] 0 - - - - pause - 1 - [1:1] - 1 load - 2 - [2:2] - 2 + 1 + [1:1] + 1 @@ -2183,7 +2175,7 @@ paused, this bit is ignored.]]> RESUME_TIME1 0x0004 0x00 @@ -3109,7 +3101,7 @@ inject too fast.]]> SEED1 0x0000 - 0x1cbd6891 + 0xd1ce410 32 @@ -3124,7 +3116,7 @@ inject too fast.]]> SEED0 0x0004 - 0x3d2e31ed + 0x23175a86 32 diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index feeb98f90..e23ef327a 100644 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ diff --git a/services/rkyv-test-client/src/main.rs b/services/rkyv-test-client/src/main.rs index 1b4ba4565..b01639f45 100644 --- a/services/rkyv-test-client/src/main.rs +++ b/services/rkyv-test-client/src/main.rs @@ -78,7 +78,7 @@ fn rkyv_test_client() -> ! { } // let the loop run a bit, then try a suspend - if idx == 3 { + if idx == 1 { // TODO: add a self-wakeup RTC alarm once we're beyond the touch-and-go phase susres.initiate_suspend().unwrap(); } diff --git a/services/susres/src/main.rs b/services/susres/src/main.rs index 0635f9882..c37be5260 100644 --- a/services/susres/src/main.rs +++ b/services/susres/src/main.rs @@ -327,7 +327,7 @@ mod implementation { self.csr.ms(utra::susres::CONTROL_PAUSE, 1) | self.csr.ms(utra::susres::CONTROL_LOAD, 1) ); - println!("Ticktimer loaded"); + println!("Ticktimer loaded with {}", time); // set up pre-emption timer let ms = SYSTEM_TICK_INTERVAL_MS; @@ -343,6 +343,12 @@ mod implementation { self.os_timer.wfo(utra::timer0::EN_EN, 0b1); // start the tickttimer running + self.csr.wo(utra::susres::CONTROL, + self.csr.ms(utra::susres::CONTROL_PAUSE, 1) | + self.csr.ms(utra::susres::CONTROL_LOAD, 1) + ); + log::info!("Resume {} / control {}", self.csr.r(utra::susres::RESUME_TIME0), self.csr.r(utra::susres::CONTROL)); + log::info!("Ticktimer loaded with {} / {}", time, self.csr.r(utra::susres::TIME0)); self.csr.wo(utra::susres::CONTROL, 0); println!("Ticktimer and OS timer now running"); diff --git a/services/ticktimer-server/src/main.rs b/services/ticktimer-server/src/main.rs index c7fa383f8..584850125 100644 --- a/services/ticktimer-server/src/main.rs +++ b/services/ticktimer-server/src/main.rs @@ -295,7 +295,7 @@ mod implementation { } log::trace!("ticktimer enable: {}", self.csr.r(utra::ticktimer::EV_ENABLE)); - log::trace!("ticktimer target: {}", self.csr.r(utra::ticktimer::MSLEEP_TARGET0)); + log::info!("ticktimer time/target: {}/{}", self.csr.r(utra::ticktimer::TIME0), self.csr.r(utra::ticktimer::MSLEEP_TARGET0)); } } } @@ -493,7 +493,7 @@ fn xmain() -> ! { let mut sleep_heap: BinaryHeap = BinaryHeap::new(); log_server::init_wait().unwrap(); - log::set_max_level(log::LevelFilter::Trace); + log::set_max_level(log::LevelFilter::Info); info!("my PID is {}", xous::process::id()); let ticktimer_server = xous::create_server_with_address(b"ticktimer-server") diff --git a/svd2utra/examples/soc.svd b/svd2utra/examples/soc.svd index 8f67283ac..f6ce99d35 100644 --- a/svd2utra/examples/soc.svd +++ b/svd2utra/examples/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1070,10 +1070,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x79550678 + 0x933d6807 32 @@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]> is ``1``, then the repository this was built from has one additional commit beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]> 0x0018 - 0x03 + 0x04 32 @@ -2155,26 +2155,18 @@ register to disable individual events.]]> 32 - reset + pause 0 [0:0] 0 - - - - pause - 1 - [1:1] - 1 load - 2 - [2:2] - 2 + 1 + [1:1] + 1 @@ -2183,7 +2175,7 @@ paused, this bit is ignored.]]> RESUME_TIME1 0x0004 0x00 @@ -3109,7 +3101,7 @@ inject too fast.]]> SEED1 0x0000 - 0x1cbd6891 + 0xd1ce410 32 @@ -3124,7 +3116,7 @@ inject too fast.]]> SEED0 0x0004 - 0x3d2e31ed + 0x23175a86 32