srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

si5324: add bypass function

This commit is contained in:
Sebastien Bourdeauducq 2019-01-31 19:38:55 +08:00
parent 8bbd4207d8
commit 82106dcd95
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/firmware/libboard_artiq/si5324.rs
View File

@ -190,9 +190,7 @@ fn monitor_lock() -> Result<()> {
Ok(()) Ok(())
} }
pub fn setup(settings: &FrequencySettings, input: Input) -> Result<()> { fn init() -> Result<()> {
let s = map_frequency_settings(settings)?;
#[cfg(not(si5324_soft_reset))] #[cfg(not(si5324_soft_reset))]
hard_reset(); hard_reset();
@ -214,11 +212,31 @@ pub fn setup(settings: &FrequencySettings, input: Input) -> Result<()> {
#[cfg(si5324_soft_reset)] #[cfg(si5324_soft_reset)]
soft_reset()?; soft_reset()?;
Ok(())
}
pub fn bypass(input: Input) -> Result<()> {
let cksel_reg = match input { let cksel_reg = match input {
Input::Ckin1 => 0b00, Input::Ckin1 => 0b00,
Input::Ckin2 => 0b01, Input::Ckin2 => 0b01,
}; };
init()?;
write(21, read(21)? & 0xfe)?; // CKSEL_PIN=0
write(3, (read(3)? & 0x3f) | (cksel_reg << 6))?; // CKSEL_REG
write(4, (read(4)? & 0x3f) | (0b00 << 6))?; // AUTOSEL_REG=b00
write(6, (read(6)? & 0xc0) | 0b111111)?; // SFOUT2_REG=b111 SFOUT1_REG=b111
write(0, (read(0)? & 0xfd) | 0x02)?; // BYPASS_REG=1
Ok(())
}
pub fn setup(settings: &FrequencySettings, input: Input) -> Result<()> {
let s = map_frequency_settings(settings)?;
let cksel_reg = match input {
Input::Ckin1 => 0b00,
Input::Ckin2 => 0b01,
};
init()?;
if settings.crystal_ref { if settings.crystal_ref {
write(0, read(0)? | 0x40)?; // FREE_RUN=1 write(0, read(0)? | 0x40)?; // FREE_RUN=1
} }