M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 03:08:27 +08:00
Code Issues Projects Releases Wiki Activity

firmware: fix build without DRTIO

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2018-09-14 20:38:41 +08:00
parent d19550daf8
commit 65da1fee4a
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/libboard_artiq/drtio_routing.rs
View File

@ -1,4 +1,6 @@
use board_misoc::{csr, config};
use board_misoc::config;
#[cfg(has_drtio_routing)]
use board_misoc::csr;
use core::fmt;
pub const DEST_COUNT: usize = 256;

1
artiq/firmware/runtime/main.rs
View File

@ -34,7 +34,6 @@ use board_misoc::{csr, irq, ident, clock, boot, config};
use board_misoc::ethmac;
#[cfg(has_drtio)]
use board_artiq::drtioaux;
#[cfg(has_drtio_routing)]
use board_artiq::drtio_routing;
use board_artiq::{mailbox, rpc_queue};
use proto_artiq::{mgmt_proto, moninj_proto, rpc_proto, session_proto, kernel_proto};

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

@ -125,7 +125,7 @@ macro_rules! dispatch {
#[cfg(not(has_drtio))]
macro_rules! dispatch {
($routing_table:ident, $channel:expr, $func:ident $(, $param:expr)*) => {{
let channel = $channel as u8;
let channel = $channel as u16;
local_moninj::$func(channel, $($param, )*)
}}
}

4
artiq/firmware/runtime/rtio_mgt.rs
View File

@ -1,6 +1,8 @@
use core::cell::RefCell;
use urc::Urc;
use board_misoc::{csr, clock};
use board_misoc::csr;
#[cfg(has_drtio))]
use board_misoc::clock;
#[cfg(has_rtio_clock_switch)]
use board_misoc::config;
use board_artiq::drtio_routing;