From 39a8fc682d0c28088454007fe7e497a585e15044 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 18 Nov 2017 18:08:31 +0100 Subject: [PATCH] artiq/firmware/libboard/hmc830_7043.rs: some cleanup, don't use hmc830 for now --- artiq/firmware/libboard/hmc830_7043.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/artiq/firmware/libboard/hmc830_7043.rs b/artiq/firmware/libboard/hmc830_7043.rs index bdd60360a..0e00a21a0 100644 --- a/artiq/firmware/libboard/hmc830_7043.rs +++ b/artiq/firmware/libboard/hmc830_7043.rs @@ -17,14 +17,13 @@ mod clock_mux { const REF_CLK_SRC_SEL : u8 = 1 << 1; const DAC_CLK_SRC_SEL : u8 = 1 << 2; - pub fn init() -> Result<(), &'static str> { + pub fn init() { unsafe { csr::clock_mux::out_write( 1*CLK_SRC_EXT_SEL | // use ext clk from sma 1*REF_CLK_SRC_SEL | // 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> { clock_mux::init(); - hmc830::init()?; + //hmc830::init()?; // FIXME hmc7043::init() }