diff --git a/services/xous-ticktimer/Cargo.toml b/services/xous-ticktimer/Cargo.toml index 93fc57a74..0c56f3e55 100644 --- a/services/xous-ticktimer/Cargo.toml +++ b/services/xous-ticktimer/Cargo.toml @@ -25,6 +25,7 @@ num-derive = { version = "0.4.2", default-features = false } num-traits = { version = "0.2.14", default-features = false } xous-semver = "0.1.2" utralib = { version = "0.1.25", optional = true, default-features = false } +loader = { path = "../../loader", optional = true } # TODO: fix this #[target.'cfg(target_arch = "arm")'.dependencies] @@ -39,7 +40,7 @@ precursor = ["utralib/precursor", "susres/precursor", "watchdog"] hosted = ["utralib/hosted", "susres/hosted", "watchdog"] renode = ["utralib/renode", "susres/renode", "watchdog"] -cramium-soc = ["utralib/cramium-soc", "utralib/std"] +cramium-soc = ["utralib/cramium-soc", "utralib/std", "loader/cramium-soc"] cramium-fpga = ["utralib/cramium-fpga"] hosted-baosec = [] diff --git a/services/xous-ticktimer/src/platform/cramium/implementation.rs b/services/xous-ticktimer/src/platform/cramium/implementation.rs index 6bde7e8c6..0c2bcf6ad 100644 --- a/services/xous-ticktimer/src/platform/cramium/implementation.rs +++ b/services/xous-ticktimer/src/platform/cramium/implementation.rs @@ -115,7 +115,10 @@ impl XousTickTimer { wdt: CSR::new(wdt.as_mut_ptr() as *mut u32), }; // TODO: base this off of some system-level constant - xtt.csr.wo(utra::ticktimer::CLOCKS_PER_TICK, 200_000); + xtt.csr.wo( + utra::ticktimer::CLOCKS_PER_TICK, + (loader::SYSTEM_CLOCK_FREQUENCY / 2) / (1000 * TICKS_PER_MS as u32), + ); #[cfg(feature = "watchdog")] {