diff --git a/src/libboard_artiq/src/drtioaux.rs b/src/libboard_artiq/src/drtioaux.rs index 85706217..d43f6921 100644 --- a/src/libboard_artiq/src/drtioaux.rs +++ b/src/libboard_artiq/src/drtioaux.rs @@ -5,10 +5,10 @@ use crc; use io::{ProtoRead, ProtoWrite, Cursor, Error as IoError}; use mem::mem::DRTIOAUX_MEM; use pl::csr::DRTIOAUX; -use crate::drtioaux_proto::Error as ProtocolError; +use drtioaux_proto::Error as ProtocolError; use libboard_zynq::{timer::GlobalTimer, time::Milliseconds}; -pub use crate::drtioaux_proto::Packet; +pub use drtioaux_proto::Packet; // this is parametric over T because there's no impl Fail for !. #[derive(Debug)] diff --git a/src/libboard_artiq/src/drtioaux_proto.rs b/src/libboard_artiq/src/drtioaux_proto.rs index bd487565..9dba05ce 100644 --- a/src/libboard_artiq/src/drtioaux_proto.rs +++ b/src/libboard_artiq/src/drtioaux_proto.rs @@ -1,11 +1,9 @@ use io::{Read, ProtoRead, Write, ProtoWrite, Error as IoError}; -#[derive(Fail, Debug)] +#[derive(Debug)] pub enum Error { - #[fail(display = "unknown packet {:#02x}", _0)] UnknownPacket(u8), - #[fail(display = "{}", _0)] - Io(#[cause] IoError) + Io(IoError) } impl From> for Error { diff --git a/src/libboard_artiq/src/lib.rs b/src/libboard_artiq/src/lib.rs index 764af64a..c9217afb 100644 --- a/src/libboard_artiq/src/lib.rs +++ b/src/libboard_artiq/src/lib.rs @@ -15,6 +15,8 @@ extern crate io; #[path = "../../../build/pl.rs"] pub mod pl; +pub mod drtioaux_proto; + #[cfg(has_drtio)] pub mod drtioaux; // for now, memory map is only needed for DRTIO firmware