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

artiq/firmware/libboard/hmc830_7043.rs: some cleanup, don't use hmc830 for now

This commit is contained in:
Florent Kermarrec 2017-11-18 18:08:31 +01:00
parent f003566e52
commit 39a8fc682d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/firmware/libboard/hmc830_7043.rs
View File

@ -17,14 +17,13 @@ mod clock_mux {
const REF_CLK_SRC_SEL : u8 = 1 << 1; const REF_CLK_SRC_SEL : u8 = 1 << 1;
const DAC_CLK_SRC_SEL : u8 = 1 << 2; const DAC_CLK_SRC_SEL : u8 = 1 << 2;
pub fn init() -> Result<(), &'static str> { pub fn init() {
unsafe { unsafe {
csr::clock_mux::out_write( csr::clock_mux::out_write(
1*CLK_SRC_EXT_SEL | // use ext clk from sma 1*CLK_SRC_EXT_SEL | // use ext clk from sma
1*REF_CLK_SRC_SEL | // 1*REF_CLK_SRC_SEL | //
0*DAC_CLK_SRC_SEL); // use clk from dac_clk // FIXME (should use hmc830 output) 0*DAC_CLK_SRC_SEL); // use clk from dac_clk // FIXME (should use hmc830 output)
} }
Ok(())
} }
} }
@ -181,6 +180,6 @@ mod hmc7043 {
pub fn init() -> Result<(), &'static str> { pub fn init() -> Result<(), &'static str> {
clock_mux::init(); clock_mux::init();
hmc830::init()?; //hmc830::init()?; // FIXME
hmc7043::init() hmc7043::init()
} }