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

clean up in dependencies

Browse Source
This commit is contained in:
mwojcik 2021-08-26 13:16:51 +02:00
parent ff7ba56d26
commit 10cbea72a2
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libboard_artiq/Cargo.toml
View File

@ -12,6 +12,7 @@ build_zynq = { path = "../libbuild_zynq" }
[dependencies] [dependencies]
log = "0.4" log = "0.4"
log_buffer = { version = "1.2" } log_buffer = { version = "1.2" }
crc = { version = "1.7", default-features = false }
io = { path = "../libio", features = ["byteorder"] } io = { path = "../libio", features = ["byteorder"] }
libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git"} libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git"}

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

@ -2,7 +2,7 @@ use core::slice;
use crc; use crc;
use io::{ProtoRead, ProtoWrite, Cursor, Error as IoError}; use io::{proto::ProtoRead, proto::ProtoWrite, Cursor, Error as IoError};
use mem::mem::DRTIOAUX_MEM; use mem::mem::DRTIOAUX_MEM;
use pl::csr::DRTIOAUX; use pl::csr::DRTIOAUX;
use drtioaux_proto::Error as ProtocolError; use drtioaux_proto::Error as ProtocolError;

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

@ -1,4 +1,4 @@
use io::{Read, ProtoRead, Write, ProtoWrite, Error as IoError}; use io::{Read, proto::ProtoRead, Write, proto::ProtoWrite, Error as IoError};
#[derive(Debug)] #[derive(Debug)]
pub enum Error<T> { pub enum Error<T> {
@ -58,7 +58,7 @@ pub enum Packet {
impl Packet { impl Packet {
pub fn read_from<R>(reader: &mut R) -> Result<Self, Error<R::ReadError>> pub fn read_from<R>(reader: &mut R) -> Result<Self, Error<R::ReadError>>
where R: Read + ?Sized where R: io::Read + ?Sized
{ {
Ok(match reader.read_u8()? { Ok(match reader.read_u8()? {
0x00 => Packet::EchoRequest, 0x00 => Packet::EchoRequest,

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

@ -3,8 +3,6 @@
extern crate log; extern crate log;
extern crate crc; extern crate crc;
extern crate failure;
extern crate failure_derive;
extern crate libboard_zynq; extern crate libboard_zynq;
extern crate libconfig; extern crate libconfig;
extern crate libcortex_a9; extern crate libcortex_a9;