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

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.
This commit is contained in:
Sebastien Bourdeauducq 2017-01-30 11:03:55 +08:00
parent f6024b6c9a
commit 54295b1699
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/libboard/lib.rs
View File

@ -26,10 +26,10 @@ pub mod si5324;
mod ad9516_reg; mod ad9516_reg;
#[cfg(has_ad9516)] #[cfg(has_ad9516)]
pub mod ad9516; pub mod ad9516;
#[cfg(has_converter_spi)] #[cfg(has_ad9154)]
#[allow(dead_code)] #[allow(dead_code)]
mod ad9154_reg; mod ad9154_reg;
#[cfg(has_converter_spi)] #[cfg(has_ad9154)]
pub mod ad9154; pub mod ad9154;
#[cfg(feature = "uart_console")] #[cfg(feature = "uart_console")]

2
artiq/firmware/runtime/lib.rs
View File

@ -79,7 +79,7 @@ fn startup() {
board::i2c::init(); board::i2c::init();
#[cfg(has_ad9516)] #[cfg(has_ad9516)]
board::ad9516::init().expect("cannot initialize ad9516"); board::ad9516::init().expect("cannot initialize ad9516");
#[cfg(has_converter_spi)] #[cfg(has_ad9154)]
board::ad9154::init().expect("cannot initialize ad9154"); board::ad9154::init().expect("cannot initialize ad9154");
let hardware_addr; let hardware_addr;