Verified Commit 0c5c45c5 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Update redox_syscall

parent 328b88a4
Pipeline #9005 failed with stages
in 22 seconds
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "ipcd"
version = "0.1.0"
......@@ -9,6 +15,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.1.57"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
dependencies = [
"bitflags",
]
......@@ -3,4 +3,4 @@ edition = "2018"
name = "ipcd"
version = "0.1.0"
[dependencies]
redox_syscall = "0.1.49"
redox_syscall = "0.2.4"
......@@ -347,9 +347,9 @@ impl SchemeBlockMut for ChanScheme {
_ => Err(Error::new(EINVAL))
}
}
fn fevent(&mut self, id: usize, _flags: usize) -> Result<Option<usize>> {
fn fevent(&mut self, id: usize, _flags: EventFlags) -> Result<Option<EventFlags>> {
let handle = self.handles.get_mut(&id).ok_or(Error::new(EBADF))?;
let mut events = 0;
let mut events = EventFlags::empty();
match handle.extra {
Extra::Client(ref client) => {
if let Connection::Open(_) = client.remote {
......
......@@ -20,7 +20,7 @@ const TOKEN_CHAN: usize = 0;
const TOKEN_SHM: usize = 1;
fn main() -> Result<(), Box<dyn std::error::Error>> {
if unsafe { syscall::clone(0) }.map_err(from_syscall_error)? != 0 {
if unsafe { syscall::clone(CloneFlags::empty()) }.map_err(from_syscall_error)? != 0 {
return Ok(());
}
......@@ -136,11 +136,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}
fn post_fevent(file: &mut File, id: usize, flag: usize) -> syscall::Result<()> {
fn post_fevent(file: &mut File, id: usize, flag: EventFlags) -> syscall::Result<()> {
file.write(&syscall::Packet {
a: syscall::SYS_FEVENT,
b: id,
c: flag,
c: flag.bits(),
d: 1,
..Default::default()
})
......
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