Unverified Commit 2dca446a authored by zyno42's avatar zyno42
Browse files

Fix compilation errors after rebasing on develop

parent 2bc63792
......@@ -530,7 +530,7 @@ impl Device {
"Trying to acquire PE of type {} without exclusive access.",
id
);
let pe = self.scheduler.acquire_pe(id).context(SchedulerError)?;
let pe = self.scheduler.acquire_pe(id).context(SchedulerSnafu)?;
trace!(
"Successfully acquired PE of type {} without exclusive access.",
id
......@@ -720,7 +720,7 @@ impl Device {
let d = NonDebugGenerator {};
let debug = d
.new(&self.platform, "Unused".to_string(), 0, 0)
.context(DebugError)?;
.context(DebugSnafu)?;
if !p.interrupts.is_empty() {
return PE::new(
......@@ -735,7 +735,7 @@ impl Device {
debug,
false, // TODO: Is this correct?
)
.context(PEError);
.context(PESnafu);
} else {
return Err(Error::MissingInterrupt {
name: name.to_string(),
......
......@@ -95,7 +95,7 @@ impl Interrupt {
if e == nix::errno::Errno::EAGAIN {
std::thread::yield_now();
} else {
r.context(ErrorEventFDRead)?;
r.context(ErrorEventFDReadSnafu)?;
}
}
}
......@@ -120,7 +120,7 @@ impl Interrupt {
if e == nix::errno::Errno::EAGAIN {
return Ok(0);
} else {
r.context(ErrorEventFDRead)?;
r.context(ErrorEventFDReadSnafu)?;
}
}
}
......
Supports Markdown
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