Graphics (#13)

Virtual Terminals

drivers/ahcid/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 
 [dependencies]
 bitflags = "*"
+dma = { path = "../dma/" }
 io = { path = "../io/" }
 spin = "*"
 syscall = { path = "../../syscall/" }

drivers/ahcid/src/ahci/disk.rs

@@ -1,8 +1,8 @@
 use std::ptr;
 
+use dma::Dma;
 use syscall::error::Result;
 
-use super::dma::Dma;
 use super::hba::{HbaPort, HbaCmdTable, HbaCmdHeader};
 
 pub struct Disk {

drivers/ahcid/src/ahci/dma.rs

@@ -1,76 +0,0 @@
-use std::{mem, ptr};
-use std::ops::{Deref, DerefMut};
-
-use syscall::{self, Result};
-
-struct PhysBox {
-    address: usize,
-    size: usize
-}
-
-impl PhysBox {
-    fn new(size: usize) -> Result<PhysBox> {
-        let address = unsafe { syscall::physalloc(size)? };
-        Ok(PhysBox {
-            address: address,
-            size: size
-        })
-    }
-}
-
-impl Drop for PhysBox {
-    fn drop(&mut self) {
-        let _ = unsafe { syscall::physfree(self.address, self.size) };
-    }
-}
-
-pub struct Dma<T> {
-    phys: PhysBox,
-    virt: *mut T
-}
-
-impl<T> Dma<T> {
-    pub fn new(value: T) -> Result<Dma<T>> {
-        let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { syscall::physmap(phys.address, phys.size, syscall::MAP_WRITE)? } as *mut T;
-        unsafe { ptr::write(virt, value); }
-        Ok(Dma {
-            phys: phys,
-            virt: virt
-        })
-    }
-
-    pub fn zeroed() -> Result<Dma<T>> {
-        let phys = PhysBox::new(mem::size_of::<T>())?;
-        let virt = unsafe { syscall::physmap(phys.address, phys.size, syscall::MAP_WRITE)? } as *mut T;
-        unsafe { ptr::write_bytes(virt as *mut u8, 0, phys.size); }
-        Ok(Dma {
-            phys: phys,
-            virt: virt
-        })
-    }
-
-    pub fn physical(&self) -> usize {
-        self.phys.address
-    }
-}
-
-impl<T> Deref for Dma<T> {
-    type Target = T;
-    fn deref(&self) -> &T {
-        unsafe { &*self.virt }
-    }
-}
-
-impl<T> DerefMut for Dma<T> {
-    fn deref_mut(&mut self) -> &mut T {
-        unsafe { &mut *self.virt }
-    }
-}
-
-impl<T> Drop for Dma<T> {
-    fn drop(&mut self) {
-        unsafe { drop(ptr::read(self.virt)); }
-        let _ = unsafe { syscall::physunmap(self.virt as usize) };
-    }
-}

drivers/ahcid/src/ahci/hba.rs

@@ -1,12 +1,11 @@
-use io::{Io, Mmio};
-
 use std::mem::size_of;
 use std::ops::DerefMut;
 use std::{ptr, u32};
 
+use dma::Dma;
+use io::{Io, Mmio};
 use syscall::error::{Error, Result, EIO};
 
-use super::dma::Dma;
 use super::fis::{FisType, FisRegH2D};
 
 const ATA_CMD_READ_DMA_EXT: u8 = 0x25;

drivers/ahcid/src/ahci/mod.rs

@@ -4,7 +4,6 @@ use self::disk::Disk;
 use self::hba::{HbaMem, HbaPortType};
 
 pub mod disk;
-pub mod dma;
 pub mod fis;
 pub mod hba;
 

drivers/ahcid/src/main.rs

@@ -3,6 +3,7 @@
 
 #[macro_use]
 extern crate bitflags;
+extern crate dma;
 extern crate io;
 extern crate spin;
 extern crate syscall;