From 54295b1699014683cec37903609b0cc73e6b1834 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 30 Jan 2017 11:03:55 +0800 Subject: [PATCH] firmware: use has_ad9154 instead of has_converter_spi for conditional compilation DRTIO designs do not have a JESD core yet, so we need to support converter SPI buses with only the clock chip. --- artiq/firmware/libboard/lib.rs | 4 ++-- artiq/firmware/runtime/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/firmware/libboard/lib.rs b/artiq/firmware/libboard/lib.rs index 2fb2cbec8..ee3406b72 100644 --- a/artiq/firmware/libboard/lib.rs +++ b/artiq/firmware/libboard/lib.rs @@ -26,10 +26,10 @@ pub mod si5324; mod ad9516_reg; #[cfg(has_ad9516)] pub mod ad9516; -#[cfg(has_converter_spi)] +#[cfg(has_ad9154)] #[allow(dead_code)] mod ad9154_reg; -#[cfg(has_converter_spi)] +#[cfg(has_ad9154)] pub mod ad9154; #[cfg(feature = "uart_console")] diff --git a/artiq/firmware/runtime/lib.rs b/artiq/firmware/runtime/lib.rs index 48a269348..bee69d4dc 100644 --- a/artiq/firmware/runtime/lib.rs +++ b/artiq/firmware/runtime/lib.rs @@ -79,7 +79,7 @@ fn startup() { board::i2c::init(); #[cfg(has_ad9516)] board::ad9516::init().expect("cannot initialize ad9516"); - #[cfg(has_converter_spi)] + #[cfg(has_ad9154)] board::ad9154::init().expect("cannot initialize ad9154"); let hardware_addr;