From 0b89cf80023bb2f530b2161641b74d6fe898cada Mon Sep 17 00:00:00 2001 From: mwojcik Date: Thu, 16 Sep 2021 15:38:51 +0200 Subject: [PATCH] slight cleanup, started work on master mode --- src/runtime/src/main.rs | 8 ++++++++ src/satman/src/main.rs | 16 +--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index 6be2867b..21cad7a9 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -172,6 +172,14 @@ pub fn main_core0() { } }; + #[cfg(has_drtio)] + let drtio_routing_table = drtio_routing::config_routing_table(csr::DRTIO.len(), cfg); + #[cfg(not(has_drtio))] + let drtio_routing_table = drtio_routing::RoutingTable::default_empty(); + let up_destinations = [false; drtio_routing::DEST_COUNT]; + #[cfg(has_drtio_routing)] + drtio_routing::interconnect_disable_all(); + init_rtio(&mut timer, &cfg); task::spawn(report_async_rtio_errors()); diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs index 79ed20da..5d27635e 100644 --- a/src/satman/src/main.rs +++ b/src/satman/src/main.rs @@ -406,21 +406,7 @@ fn hardware_tick(ts: &mut u64, timer: &mut GlobalTimer) { } } -#[cfg(all(has_si5324, rtio_frequency = "150.0"))] -const SI5324_SETTINGS: si5324::FrequencySettings - = si5324::FrequencySettings { - n1_hs : 6, - nc1_ls : 6, - n2_hs : 10, - n2_ls : 270, - n31 : 75, - n32 : 75, - bwsel : 4, - crystal_ref: true -}; - -// rtio frequencies other than 125 MHz won't be supported? -#[cfg(all(has_si5324, rtio_frequency = "125.0"))] +#[cfg(has_si5324)] const SI5324_SETTINGS: si5324::FrequencySettings = si5324::FrequencySettings { n1_hs : 5,