M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: no startup_clock config is not an error

This commit is contained in:
Sebastien Bourdeauducq 2017-12-14 12:34:30 +08:00
parent 71db953ea0
commit 5809e08686
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
artiq/firmware/runtime/rtio_mgt.rs
View File

@ -219,16 +219,25 @@ pub fn startup(io: &Io) {
let clk = config::read("startup_clock", |result| { let clk = config::read("startup_clock", |result| {
match result { match result {
Ok(b"i") => RtioClock::Internal, Ok(b"i") => {
Ok(b"e") => RtioClock::External, info!("using internal startup RTIO clock");
_ => { RtioClock::Internal
error!("unrecognized startup_clock configuration entry"); },
Ok(b"e") => {
info!("using external startup RTIO clock");
RtioClock::External
},
Err(()) => {
info!("using internal startup RTIO clock (by default)");
RtioClock::Internal
},
Ok(_) => {
error!("unrecognized startup_clock configuration entry, using internal RTIO clock");
RtioClock::Internal RtioClock::Internal
} }
} }
}); });
info!("startup RTIO clock: {:?}", clk);
if !crg::switch_clock(clk as u8) { if !crg::switch_clock(clk as u8) {
error!("startup RTIO clock failed"); error!("startup RTIO clock failed");
warn!("this may cause the system initialization to fail"); warn!("this may cause the system initialization to fail");