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

wrpll: adpll -> set_adpll

This commit is contained in:
Sebastien Bourdeauducq 2020-01-13 20:46:36 +08:00
parent e7ef23d30c
commit d5895b8999
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq/firmware/libboard_artiq/wrpll.rs
View File

@ -263,7 +263,7 @@ mod si549 {
Ok(()) Ok(())
} }
pub fn adpll(dcxo: i2c::Dcxo, adpll: i32) -> Result<(), &'static str> { pub fn set_adpll(dcxo: i2c::Dcxo, adpll: i32) -> Result<(), &'static str> {
write(dcxo, 231, adpll as u8)?; write(dcxo, 231, adpll as u8)?;
write(dcxo, 232, (adpll >> 8) as u8)?; write(dcxo, 232, (adpll >> 8) as u8)?;
write(dcxo, 233, (adpll >> 16) as u8)?; write(dcxo, 233, (adpll >> 16) as u8)?;
@ -337,11 +337,11 @@ pub fn diagnostics() {
info!("ADPLL test:"); info!("ADPLL test:");
// +/-10ppm // +/-10ppm
si549::adpll(i2c::Dcxo::Helper, -85911).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Helper, -85911).expect("ADPLL write failed");
si549::adpll(i2c::Dcxo::Main, 85911).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Main, 85911).expect("ADPLL write failed");
log_frequencies(); log_frequencies();
si549::adpll(i2c::Dcxo::Helper, 0).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Helper, 0).expect("ADPLL write failed");
si549::adpll(i2c::Dcxo::Main, 0).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Main, 0).expect("ADPLL write failed");
let mut tags = [0; 10]; let mut tags = [0; 10];
for i in 0..tags.len() { for i in 0..tags.len() {
@ -401,8 +401,8 @@ fn select_recovered_clock_int(rc: bool) -> Result<(), &'static str> {
let (f_helper, f_main, f_cdr) = log_frequencies(); let (f_helper, f_main, f_cdr) = log_frequencies();
if rc { if rc {
let (helper_adpll, main_adpll) = trim_dcxos(f_helper, f_main, f_cdr)?; let (helper_adpll, main_adpll) = trim_dcxos(f_helper, f_main, f_cdr)?;
si549::adpll(i2c::Dcxo::Helper, helper_adpll).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Helper, helper_adpll).expect("ADPLL write failed");
si549::adpll(i2c::Dcxo::Main, main_adpll).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Main, main_adpll).expect("ADPLL write failed");
unsafe { unsafe {
csr::wrpll::adpll_offset_helper_write(helper_adpll as u32); csr::wrpll::adpll_offset_helper_write(helper_adpll as u32);
csr::wrpll::adpll_offset_main_write(main_adpll as u32); csr::wrpll::adpll_offset_main_write(main_adpll as u32);
@ -414,8 +414,8 @@ fn select_recovered_clock_int(rc: bool) -> Result<(), &'static str> {
} }
info!("DDMTD helper tags: {:?}", tags); info!("DDMTD helper tags: {:?}", tags);
} else { } else {
si549::adpll(i2c::Dcxo::Helper, 0).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Helper, 0).expect("ADPLL write failed");
si549::adpll(i2c::Dcxo::Main, 0).expect("ADPLL write failed"); si549::set_adpll(i2c::Dcxo::Main, 0).expect("ADPLL write failed");
} }
Ok(()) Ok(())
} }