diff --git a/src/satman/src/dma.rs b/src/satman/src/dma.rs index 9a36634..57a5634 100644 --- a/src/satman/src/dma.rs +++ b/src/satman/src/dma.rs @@ -6,8 +6,8 @@ use libboard_artiq::{drtio_routing::RoutingTable, drtioaux_proto::{Packet, PayloadStatus, MASTER_PAYLOAD_MAX_SIZE}, pl::csr}; use libcortex_a9::cache::dcci_slice; -use routing::{Router, Sliceable}; -use subkernel::Manager as KernelManager; +use crate::routing::{Router, Sliceable}; +use crate::subkernel::Manager as KernelManager; const ALIGNMENT: usize = 64; diff --git a/src/satman/src/repeater.rs b/src/satman/src/repeater.rs index 7834007..ed9f18b 100644 --- a/src/satman/src/repeater.rs +++ b/src/satman/src/repeater.rs @@ -6,7 +6,7 @@ use libboard_artiq::{drtio_routing, drtioaux}; #[cfg(has_drtio_routing)] use libboard_zynq::time::Milliseconds; use libboard_zynq::timer::GlobalTimer; -use routing::Router; +use crate::routing::Router; #[cfg(has_drtio_routing)] fn rep_link_rx_up(repno: u8) -> bool { diff --git a/src/satman/src/subkernel.rs b/src/satman/src/subkernel.rs index 0e53f5e..53fa48b 100644 --- a/src/satman/src/subkernel.rs +++ b/src/satman/src/subkernel.rs @@ -6,7 +6,7 @@ use core::{slice, str}; use core_io::{Error as IoError, Write}; use cslice::AsCSlice; -use dma::{Error as DmaError, Manager as DmaManager}; +use crate::dma::{Error as DmaError, Manager as DmaManager}; use io::{Cursor, ProtoWrite}; use ksupport::{eh_artiq, kernel, rpc, rtio}; use libboard_artiq::{drtio_routing::RoutingTable, @@ -16,7 +16,7 @@ use libboard_artiq::{drtio_routing::RoutingTable, use libboard_zynq::{time::Milliseconds, timer::GlobalTimer}; use libcortex_a9::sync_channel::Receiver; use log::warn; -use routing::{Router, SliceMeta, Sliceable}; +use crate::routing::{Router, SliceMeta, Sliceable}; #[derive(Debug, Clone, PartialEq)] enum KernelState { @@ -53,6 +53,7 @@ enum KernelState { } #[derive(Debug)] +#[allow(dead_code)] pub enum Error { Load(String), KernelNotFound,