diff --git a/ahcid/src/ahci/disk_ata.rs b/ahcid/src/ahci/disk_ata.rs index adb0fa4045..d9dcef1769 100644 --- a/ahcid/src/ahci/disk_ata.rs +++ b/ahcid/src/ahci/disk_ata.rs @@ -1,9 +1,10 @@ use std::convert::TryInto; use std::ptr; -use syscall::io::Dma; use syscall::error::Result; +use common::dma::Dma; + use super::hba::{HbaPort, HbaCmdTable, HbaCmdHeader}; use super::Disk; diff --git a/ahcid/src/ahci/disk_atapi.rs b/ahcid/src/ahci/disk_atapi.rs index c414b8480f..a7abf2e1d6 100644 --- a/ahcid/src/ahci/disk_atapi.rs +++ b/ahcid/src/ahci/disk_atapi.rs @@ -5,9 +5,10 @@ use std::ptr; use byteorder::{ByteOrder, BigEndian}; -use syscall::io::Dma; use syscall::error::{Result, EBADF, Error}; +use common::dma::Dma; + use super::hba::{HbaPort, HbaCmdTable, HbaCmdHeader}; use super::Disk; diff --git a/ahcid/src/ahci/hba.rs b/ahcid/src/ahci/hba.rs index 2bb122ff39..6f9217aa05 100644 --- a/ahcid/src/ahci/hba.rs +++ b/ahcid/src/ahci/hba.rs @@ -3,11 +3,13 @@ use std::mem::size_of; use std::ops::DerefMut; use std::{ptr, u32}; -use syscall::io::{Dma, Io, Mmio}; +use syscall::io::{Io, Mmio}; use syscall::error::{Error, Result, EIO}; use super::fis::{FisType, FisRegH2D}; +use common::dma::Dma; + const ATA_CMD_READ_DMA_EXT: u8 = 0x25; const ATA_CMD_WRITE_DMA_EXT: u8 = 0x35; const ATA_CMD_IDENTIFY: u8 = 0xEC;