diff --git a/.gitmodules b/.gitmodules index c3e65f676..c22c07c20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,9 +43,6 @@ [submodule "installer"] path = installer url = https://github.com/redox-os/installer.git -[submodule "syscall"] - path = syscall - url = https://github.com/redox-os/syscall.git [submodule "crates/docgen"] path = crates/docgen url = https://github.com/redox-os/docgen.git diff --git a/Cargo.toml b/Cargo.toml index 4ec2cc3ed..f191a7fc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,13 +26,11 @@ members = [ "programs/tar", "programs/userutils", "schemes/ethernetd", - "schemes/example", "schemes/ipd", "schemes/orbital", "schemes/ptyd", "schemes/randd", "schemes/redoxfs", "schemes/tcpd", - "schemes/udpd", - "syscall" + "schemes/udpd" ] diff --git a/drivers b/drivers index 778852f92..4bb229959 160000 --- a/drivers +++ b/drivers @@ -1 +1 @@ -Subproject commit 778852f92d835c17327819bde28c19db8096a4b1 +Subproject commit 4bb229959e7c662a0686c7986f5ad28c8fb4de12 diff --git a/kernel b/kernel index 35c229772..04d9d6b40 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 35c22977240597d656979fd5d9bdb25a755bb372 +Subproject commit 04d9d6b40a8fbd5e21200dabfdaa128a4c809727 diff --git a/programs/contain/Cargo.toml b/programs/contain/Cargo.toml index baf2a4e00..a11d6d0fa 100644 --- a/programs/contain/Cargo.toml +++ b/programs/contain/Cargo.toml @@ -3,4 +3,4 @@ name = "contain" version = "0.1.0" [dependencies] -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +redox_syscall = "0.1" diff --git a/programs/coreutils b/programs/coreutils index 30dae30ee..86464b0b1 160000 --- a/programs/coreutils +++ b/programs/coreutils @@ -1 +1 @@ -Subproject commit 30dae30ee0c4d4628f08b04db9d7f986cc975763 +Subproject commit 86464b0b198c490b8e958c587e179c7aa8f24065 diff --git a/programs/extrautils b/programs/extrautils index f371a0684..2a770bdf6 160000 --- a/programs/extrautils +++ b/programs/extrautils @@ -1 +1 @@ -Subproject commit f371a0684e816d8ebf12446c3f6c799bd276efa6 +Subproject commit 2a770bdf6b2979a89e7b128830083fa1d049357a diff --git a/programs/init/Cargo.toml b/programs/init/Cargo.toml index 0ababa4c6..955abf76a 100644 --- a/programs/init/Cargo.toml +++ b/programs/init/Cargo.toml @@ -3,4 +3,4 @@ name = "init" version = "0.1.0" [dependencies] -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +redox_syscall = "0.1" diff --git a/programs/orbutils b/programs/orbutils index cf1e1f8e6..44027c23b 160000 --- a/programs/orbutils +++ b/programs/orbutils @@ -1 +1 @@ -Subproject commit cf1e1f8e6406e9b01a2c62e46260e82a7aa33395 +Subproject commit 44027c23b7cb58d03e3408ff7a87a76d57a47ff8 diff --git a/programs/userutils b/programs/userutils index 2fdef1755..201197638 160000 --- a/programs/userutils +++ b/programs/userutils @@ -1 +1 @@ -Subproject commit 2fdef17559bd25d7f6cd5c2a0a4d1b7897e0beaf +Subproject commit 2011976381b9eb1264ae90218106fa36a19427c8 diff --git a/rust b/rust index 82a3f9fbe..ca2ade1d3 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 82a3f9fbecd3b4cfac2ac4821ce330227dbdedb0 +Subproject commit ca2ade1d36d0b33d60ff1973ab6c8f3b09bc4c41 diff --git a/schemes/ethernetd/Cargo.toml b/schemes/ethernetd/Cargo.toml index c99cae5af..835b07e01 100644 --- a/schemes/ethernetd/Cargo.toml +++ b/schemes/ethernetd/Cargo.toml @@ -5,4 +5,4 @@ version = "0.1.0" [dependencies] 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" } +redox_syscall = "0.1" diff --git a/schemes/example/Cargo.toml b/schemes/example/Cargo.toml deleted file mode 100644 index 9ddf8dd6a..000000000 --- a/schemes/example/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "example" -version = "0.1.0" - -[dependencies] -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } diff --git a/schemes/example/src/main.rs b/schemes/example/src/main.rs deleted file mode 100644 index 1ba8d5910..000000000 --- a/schemes/example/src/main.rs +++ /dev/null @@ -1,39 +0,0 @@ -extern crate syscall; - -use std::fs::File; -use std::io::{Read, Write}; -use std::str; - -use syscall::{Packet, Result, Scheme}; - -struct ExampleScheme; - -impl Scheme for ExampleScheme { - fn open(&self, path: &[u8], _flags: usize, uid: u32, gid: u32) -> Result { - println!("{} from {}:{}", unsafe { str::from_utf8_unchecked(path) }, uid, gid); - Ok(0) - } - - fn dup(&self, file: usize, _buf: &[u8]) -> Result { - Ok(file) - } - - fn close(&self, _file: usize) -> Result { - Ok(0) - } -} - -fn main(){ - // Daemonize - if unsafe { syscall::clone(0).unwrap() } == 0 { - let mut socket = File::create(":example").expect("example: failed to create example scheme"); - let scheme = ExampleScheme; - loop { - let mut packet = Packet::default(); - socket.read(&mut packet).expect("example: failed to read events from example scheme"); - println!("{:?}", packet); - scheme.handle(&mut packet); - socket.write(&packet).expect("example: failed to write responses to example scheme"); - } - } -} diff --git a/schemes/ipd/Cargo.toml b/schemes/ipd/Cargo.toml index 16f947a70..31929118b 100644 --- a/schemes/ipd/Cargo.toml +++ b/schemes/ipd/Cargo.toml @@ -5,4 +5,4 @@ version = "0.1.0" [dependencies] 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" } +redox_syscall = "0.1" diff --git a/schemes/orbital b/schemes/orbital index baa69a2fa..c70e11f9e 160000 --- a/schemes/orbital +++ b/schemes/orbital @@ -1 +1 @@ -Subproject commit baa69a2fa69b827645e59abc389f5a162d76f035 +Subproject commit c70e11f9e94a0bf445aa1c96243a514ee5b46d3e diff --git a/schemes/ptyd/Cargo.toml b/schemes/ptyd/Cargo.toml index 69b4365f0..093da85bc 100644 --- a/schemes/ptyd/Cargo.toml +++ b/schemes/ptyd/Cargo.toml @@ -3,4 +3,4 @@ name = "ptyd" version = "0.1.0" [dependencies] -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +redox_syscall = "0.1" diff --git a/schemes/randd/Cargo.toml b/schemes/randd/Cargo.toml index 2222cf5a7..3b7ebf249 100644 --- a/schemes/randd/Cargo.toml +++ b/schemes/randd/Cargo.toml @@ -3,5 +3,5 @@ name = "randd" version = "0.1.0" [dependencies] -raw-cpuid = "2.*" -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +raw-cpuid = "2.0" +redox_syscall = "0.1" diff --git a/schemes/tcpd/Cargo.toml b/schemes/tcpd/Cargo.toml index 8d9c55fea..f756ee2c0 100644 --- a/schemes/tcpd/Cargo.toml +++ b/schemes/tcpd/Cargo.toml @@ -6,4 +6,4 @@ version = "0.1.0" netutils = { git = "https://github.com/redox-os/netutils.git" } rand = "0.3" redox_event = { git = "https://github.com/redox-os/event.git" } -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +redox_syscall = "0.1" diff --git a/schemes/udpd/Cargo.toml b/schemes/udpd/Cargo.toml index b33c74e68..d7dc3e3e5 100644 --- a/schemes/udpd/Cargo.toml +++ b/schemes/udpd/Cargo.toml @@ -6,4 +6,4 @@ version = "0.1.0" netutils = { git = "https://github.com/redox-os/netutils.git" } rand = "0.3" redox_event = { git = "https://github.com/redox-os/event.git" } -redox_syscall = { git = "https://github.com/redox-os/syscall.git" } +redox_syscall = "0.1" diff --git a/syscall b/syscall deleted file mode 160000 index 6188e4d04..000000000 --- a/syscall +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6188e4d040c14d221aebebb942d424edada47671