From 44bbb302cf029addcd0e755b49a79f2a64874fc8 Mon Sep 17 00:00:00 2001 From: 4lDO2 <4lDO2@protonmail.com> Date: Tue, 18 Jul 2023 13:48:38 +0200 Subject: [PATCH] Switch to common::dma::Dma in ided. --- ided/Cargo.toml | 1 + ided/src/ide.rs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ided/Cargo.toml b/ided/Cargo.toml index 27052da67e..e1dc341aae 100644 --- a/ided/Cargo.toml +++ b/ided/Cargo.toml @@ -5,6 +5,7 @@ edition = "2018" [dependencies] block-io-wrapper = { path = "../block-io-wrapper" } +common = { path = "../common" } log = "0.4" partitionlib = { git = "https://gitlab.redox-os.org/redox-os/partitionlib.git" } pcid = { path = "../pcid" } diff --git a/ided/src/ide.rs b/ided/src/ide.rs index 65376e2df5..dff603f90e 100644 --- a/ided/src/ide.rs +++ b/ided/src/ide.rs @@ -4,11 +4,14 @@ use std::{ thread, time::{Duration, Instant}, }; + use syscall::{ error::{Error, Result, EIO}, - io::{Dma, Io, Pio, PhysBox, ReadOnly, WriteOnly}, + io::{Io, Pio, ReadOnly, WriteOnly}, }; +use common::dma::{Dma, PhysBox}; + static TIMEOUT: Duration = Duration::new(1, 0); #[repr(u8)]