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

firmware/ad9154: cleanup sysref scan and run everytime

This commit is contained in:
Sebastien Bourdeauducq 2018-05-16 23:01:19 +08:00
parent 1364cd2948
commit fedf7f0c87
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
artiq/firmware/libboard_artiq/ad9154.rs
View File

@ -608,13 +608,10 @@ fn dac_cfg_retry(dacno: u8) -> Result<(), &'static str> {
dac_cfg(dacno) dac_cfg(dacno)
} }
#[allow(dead_code)]
fn dac_sysref_scan(dacno: u8) { fn dac_sysref_scan(dacno: u8) {
let mut sync_error_last = 0u16; let mut sync_error_last = 0;
let mut phase_min_found = false; let mut phase_min = None;
let mut phase_min = 0u16; let mut phase_max = None;
let mut _phase_max_found = false;
let mut phase_max = 0u16;
info!("AD9154-{} SYSREF scan/conf...", dacno); info!("AD9154-{} SYSREF scan/conf...", dacno);
for phase in 0..512 { for phase in 0..512 {
@ -628,23 +625,19 @@ fn dac_sysref_scan(dacno: u8) {
info!(" phase: {}, sync error: {}", phase, sync_error); info!(" phase: {}, sync error: {}", phase, sync_error);
} }
if sync_error != 0 { if sync_error != 0 {
if phase_min_found { if phase_min.is_some() {
if sync_error != sync_error_last { if sync_error != sync_error_last {
_phase_max_found = true; phase_max = Some(phase - 1);
phase_max = phase - 1;
break; break;
} }
} else { } else {
phase_min_found = true; phase_min = Some(phase);
phase_min = phase;
} }
} }
sync_error_last = sync_error; sync_error_last = sync_error;
} }
let phase_opt = phase_min + (phase_max-phase_min)/2; info!(" phase min: {:?}, phase max: {:?}", phase_min, phase_max);
info!(" phase min: {}, phase max: {}, phase opt: {}", phase_min, phase_max, phase_opt);
hmc7043::cfg_dac_sysref(dacno, phase_opt);
} }
fn dac_sysref_cfg(dacno: u8, phase: u16) { fn dac_sysref_cfg(dacno: u8, phase: u16) {
@ -660,6 +653,7 @@ pub fn init() -> Result<(), &'static str> {
for dacno in 0..csr::AD9154.len() { for dacno in 0..csr::AD9154.len() {
let dacno = dacno as u8; let dacno = dacno as u8;
debug!("setting up AD9154-{} DAC...", dacno); debug!("setting up AD9154-{} DAC...", dacno);
dac_sysref_scan(dacno);
dac_sysref_cfg(dacno, 88); dac_sysref_cfg(dacno, 88);
dac_cfg_retry(dacno)?; dac_cfg_retry(dacno)?;
dac_prbs(dacno)?; dac_prbs(dacno)?;