Refactor to move io into syscall, and use git for crate references
This commit is contained in:
+1
-3
@@ -4,7 +4,5 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
bitflags = "*"
|
||||
dma = { path = "../../crates/dma/" }
|
||||
io = { path = "../../crates/io/" }
|
||||
spin = "*"
|
||||
redox_syscall = { path = "../../syscall/" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use std::ptr;
|
||||
|
||||
use dma::Dma;
|
||||
use syscall::io::Dma;
|
||||
use syscall::error::Result;
|
||||
|
||||
use super::hba::{HbaPort, HbaCmdTable, HbaCmdHeader};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use io::Mmio;
|
||||
use syscall::io::Mmio;
|
||||
|
||||
#[repr(u8)]
|
||||
pub enum FisType {
|
||||
|
||||
@@ -2,8 +2,7 @@ use std::mem::size_of;
|
||||
use std::ops::DerefMut;
|
||||
use std::{ptr, u32};
|
||||
|
||||
use dma::Dma;
|
||||
use io::{Io, Mmio};
|
||||
use syscall::io::{Dma, Io, Mmio};
|
||||
use syscall::error::{Error, Result, EIO};
|
||||
|
||||
use super::fis::{FisType, FisRegH2D};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use io::Io;
|
||||
use syscall::io::Io;
|
||||
|
||||
use self::disk::Disk;
|
||||
use self::hba::{HbaMem, HbaPortType};
|
||||
|
||||
+1
-2
@@ -1,9 +1,8 @@
|
||||
#![deny(warnings)]
|
||||
#![feature(asm)]
|
||||
|
||||
#[macro_use]
|
||||
extern crate bitflags;
|
||||
extern crate dma;
|
||||
extern crate io;
|
||||
extern crate spin;
|
||||
extern crate syscall;
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#![deny(warnings)]
|
||||
|
||||
use std::env;
|
||||
|
||||
fn main() {
|
||||
|
||||
+3
-5
@@ -4,8 +4,6 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
bitflags = "*"
|
||||
dma = { path = "../../crates/dma/" }
|
||||
event = { path = "../../crates/event/" }
|
||||
io = { path = "../../crates/io/" }
|
||||
netutils = { path = "../../programs/netutils/" }
|
||||
redox_syscall = { path = "../../syscall/" }
|
||||
netutils = { git = "https://github.com/redox-os/netutils.git" }
|
||||
redox_event = { git = "https://github.com/redox-os/event.git" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use std::{cmp, mem, ptr, slice};
|
||||
|
||||
use dma::Dma;
|
||||
use netutils::setcfg;
|
||||
use syscall::error::{Error, EACCES, EWOULDBLOCK, Result};
|
||||
use syscall::flag::O_NONBLOCK;
|
||||
use syscall::io::Dma;
|
||||
use syscall::scheme::Scheme;
|
||||
|
||||
const CTRL: u32 = 0x00;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#![feature(asm)]
|
||||
|
||||
extern crate dma;
|
||||
extern crate event;
|
||||
extern crate netutils;
|
||||
extern crate syscall;
|
||||
|
||||
+1
-1
@@ -3,6 +3,6 @@ name = "pcid"
|
||||
version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
redox_syscall = { path = "../../syscall/" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
rustc-serialize = "0.3"
|
||||
toml = "0.2"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![deny(warnings)]
|
||||
#![feature(asm)]
|
||||
|
||||
extern crate rustc_serialize;
|
||||
|
||||
+2
-3
@@ -4,7 +4,6 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
bitflags = "*"
|
||||
event = { path = "../../crates/event/" }
|
||||
io = { path = "../../crates/io/" }
|
||||
orbclient = "0.2"
|
||||
redox_syscall = { path = "../../syscall/" }
|
||||
redox_event = { git = "https://github.com/redox-os/event.git" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
use io::{Io, Pio, ReadOnly, WriteOnly};
|
||||
use syscall::io::{Io, Pio, ReadOnly, WriteOnly};
|
||||
|
||||
bitflags! {
|
||||
flags StatusFlags: u8 {
|
||||
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
#![deny(warnings)]
|
||||
#![feature(asm)]
|
||||
|
||||
#[macro_use]
|
||||
extern crate bitflags;
|
||||
extern crate event;
|
||||
extern crate io;
|
||||
extern crate orbclient;
|
||||
extern crate syscall;
|
||||
|
||||
|
||||
+3
-5
@@ -4,8 +4,6 @@ version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
bitflags = "*"
|
||||
dma = { path = "../../crates/dma/" }
|
||||
event = { path = "../../crates/event/" }
|
||||
io = { path = "../../crates/io/" }
|
||||
netutils = { path = "../../programs/netutils/" }
|
||||
redox_syscall = { path = "../../syscall/" }
|
||||
netutils = { git = "https://github.com/redox-os/netutils.git" }
|
||||
redox_event = { git = "https://github.com/redox-os/event.git" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
use std::mem;
|
||||
|
||||
use dma::Dma;
|
||||
use io::{Mmio, Io, ReadOnly};
|
||||
use netutils::setcfg;
|
||||
use syscall::error::{Error, EACCES, EWOULDBLOCK, Result};
|
||||
use syscall::flag::O_NONBLOCK;
|
||||
use syscall::io::{Dma, Mmio, Io, ReadOnly};
|
||||
use syscall::scheme::SchemeMut;
|
||||
|
||||
#[repr(packed)]
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#![feature(asm)]
|
||||
|
||||
extern crate dma;
|
||||
extern crate event;
|
||||
extern crate io;
|
||||
extern crate netutils;
|
||||
extern crate syscall;
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ version = "0.1.0"
|
||||
orbclient = "0.2"
|
||||
ransid = "0.2"
|
||||
rusttype = { version = "0.2", optional = true }
|
||||
redox_syscall = { path = "../../syscall" }
|
||||
redox_syscall = { git = "https://github.com/redox-os/syscall.git" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![deny(warnings)]
|
||||
#![feature(alloc)]
|
||||
#![feature(asm)]
|
||||
#![feature(heap_api)]
|
||||
|
||||
@@ -48,7 +48,7 @@ impl Screen for TextScreen {
|
||||
Ok(0)
|
||||
}
|
||||
|
||||
fn map(&self, offset: usize, size: usize) -> Result<usize> {
|
||||
fn map(&self, _offset: usize, _size: usize) -> Result<usize> {
|
||||
Err(Error::new(EBADF))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user