Commit 60840376 authored by Jeremy Soller's avatar Jeremy Soller

Refactor to move io into syscall, and use git for crate references

parent 9eeade88
......@@ -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" }
use std::ptr;
use dma::Dma;
use syscall::io::Dma;
use syscall::error::Result;
use super::hba::{HbaPort, HbaCmdTable, HbaCmdHeader};
......
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};
......
use io::Io;
use syscall::io::Io;
use self::disk::Disk;
use self::hba::{HbaMem, HbaPortType};
......
#![deny(warnings)]
#![feature(asm)]
#[macro_use]
extern crate bitflags;
extern crate dma;
extern crate io;
extern crate spin;
extern crate syscall;
......
#![deny(warnings)]
use std::env;
fn main() {
......
......@@ -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" }
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;
......
#![feature(asm)]
extern crate dma;
extern crate event;
extern crate netutils;
extern crate syscall;
......
......@@ -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"
#![deny(warnings)]
#![feature(asm)]
extern crate rustc_serialize;
......
......@@ -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" }
use io::{Io, Pio, ReadOnly, WriteOnly};
use syscall::io::{Io, Pio, ReadOnly, WriteOnly};
bitflags! {
flags StatusFlags: u8 {
......
#![deny(warnings)]
#![feature(asm)]
#[macro_use]
extern crate bitflags;
extern crate event;
extern crate io;
extern crate orbclient;
extern crate syscall;
......
......@@ -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" }
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)]
......
#![feature(asm)]
extern crate dma;
extern crate event;
extern crate io;
extern crate netutils;
extern crate syscall;
......
......@@ -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 = []
#![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))
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment