M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

drtioaux_proto: removed failure, need to fix traits

Browse Source
This commit is contained in:
mwojcik 2021-08-25 13:03:54 +02:00
parent a8a2da575b
commit 39d522e1a7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libboard_artiq/src/drtioaux.rs
View File

@ -5,10 +5,10 @@ use crc;
use io::{ProtoRead, ProtoWrite, Cursor, Error as IoError}; use io::{ProtoRead, ProtoWrite, Cursor, Error as IoError};
use mem::mem::DRTIOAUX_MEM; use mem::mem::DRTIOAUX_MEM;
use pl::csr::DRTIOAUX; use pl::csr::DRTIOAUX;
use crate::drtioaux_proto::Error as ProtocolError; use drtioaux_proto::Error as ProtocolError;
use libboard_zynq::{timer::GlobalTimer, time::Milliseconds}; 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 !. // this is parametric over T because there's no impl Fail for !.
#[derive(Debug)] #[derive(Debug)]

6
src/libboard_artiq/src/drtioaux_proto.rs
View File

@ -1,11 +1,9 @@
use io::{Read, ProtoRead, Write, ProtoWrite, Error as IoError}; use io::{Read, ProtoRead, Write, ProtoWrite, Error as IoError};
#[derive(Fail, Debug)] #[derive(Debug)]
pub enum Error<T> { pub enum Error<T> {
#[fail(display = "unknown packet {:#02x}", _0)]
UnknownPacket(u8), UnknownPacket(u8),
#[fail(display = "{}", _0)] Io(IoError<T>)
Io(#[cause] IoError<T>)
} }
impl<T> From<IoError<T>> for Error<T> { impl<T> From<IoError<T>> for Error<T> {

2
src/libboard_artiq/src/lib.rs
View File

@ -15,6 +15,8 @@ extern crate io;
#[path = "../../../build/pl.rs"] #[path = "../../../build/pl.rs"]
pub mod pl; pub mod pl;
pub mod drtioaux_proto;
#[cfg(has_drtio)] #[cfg(has_drtio)]
pub mod drtioaux; pub mod drtioaux;
// for now, memory map is only needed for DRTIO firmware // for now, memory map is only needed for DRTIO firmware