m-labs · Nov 23, 2016 · Nov 23, 2016
Showing with 13 additions and 0 deletions.

+2 −0 artiq/gateware/targets/kc705.py

+1 −0 artiq/gateware/targets/pipistrello.py

+5 −0 artiq/runtime.rs/libksupport/api.rs

+1 −0 artiq/runtime.rs/libksupport/lib.rs

+4 −0 artiq/runtime.rs/libksupport/rtio.rs
diff --git a/artiq/gateware/targets/kc705.py b/artiq/gateware/targets/kc705.py
@@ -225,6 +225,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
                                                    ofifo_depth=512,
                                                    ififo_depth=4))
 
+        self.config["HAS_RTIO_LOG"] = None
         self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels)
         rtio_channels.append(rtio.LogChannel())
 
@@ -303,6 +304,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
                                                        ofifo_depth=512,
                                                        ififo_depth=4))
 
+        self.config["HAS_RTIO_LOG"] = None
         self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels)
         rtio_channels.append(rtio.LogChannel())
 

diff --git a/artiq/gateware/targets/pipistrello.py b/artiq/gateware/targets/pipistrello.py
@@ -212,6 +212,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
         rtio_channels.append(rtio.Channel.from_phy(
             phy, ofifo_depth=64, ififo_depth=64))
 
+        self.config["HAS_RTIO_LOG"] = None
         self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels)
         rtio_channels.append(rtio.LogChannel())
 

diff --git a/artiq/runtime.rs/libksupport/api.rs b/artiq/runtime.rs/libksupport/api.rs
@@ -105,9 +105,14 @@ static mut API: &'static [(&'static str, *const ())] = &[
     api!(rtio_input_timestamp = ::rtio::input_timestamp),
     api!(rtio_input_data = ::rtio::input_data),
 
+    #[cfg(has_i2c)]
     api!(i2c_init = ::i2c::init),
+    #[cfg(has_i2c)]
     api!(i2c_start = ::i2c::start),
+    #[cfg(has_i2c)]
     api!(i2c_stop = ::i2c::stop),
+    #[cfg(has_i2c)]
     api!(i2c_write = ::i2c::write),
+    #[cfg(has_i2c)]
     api!(i2c_read = ::i2c::read),
 ];
diff --git a/artiq/runtime.rs/libksupport/lib.rs b/artiq/runtime.rs/libksupport/lib.rs
@@ -50,6 +50,7 @@ macro_rules! artiq_raise {
 }
 
 mod rtio;
+#[cfg(has_i2c)]
 mod i2c;
 
 use core::{mem, ptr, slice, str};

diff --git a/artiq/runtime.rs/libksupport/rtio.rs b/artiq/runtime.rs/libksupport/rtio.rs
@@ -125,6 +125,7 @@ pub extern fn input_data(channel: u32) -> u32 {
     }
 }
 
+#[cfg(has_rtio_log)]
 pub fn log(timestamp: i64, data: &[u8]) {
     unsafe {
         csr::rtio::chan_sel_write(csr::CONFIG_RTIO_LOG_CHANNEL);
@@ -146,3 +147,6 @@ pub fn log(timestamp: i64, data: &[u8]) {
         csr::rtio::o_we_write(1);
     }
 }
+
+#[cfg(not(has_rtio_log))]
+pub fn log(timestamp: i64, data: &[u8]) {}