stevefan1999/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Issues Pull Requests Projects Releases Wiki Activity

slight cleanup, started work on master mode

Browse Source
This commit is contained in:
mwojcik 2021-09-16 15:38:51 +02:00
parent 1160676fd6
commit 0b89cf8002
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/src/main.rs
View File

@ -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());

16
src/satman/src/main.rs
View File

@ -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,