srenblad
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Pull Requests Activity

fix errors

This commit is contained in:
Simon Renblad 2024-10-28 15:35:40 +08:00
parent 4d3895094d
commit 78ee3a96d1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/src/comms.rs
View File

@ -488,14 +488,14 @@ async fn handle_run_kernel(
kernel::Message::RpcRecvRequest(slot) => slot,
other => panic!("expected root value slot from core1, not {:?}", other),
};
let remaining_tags = rpc::recv_return(&mut reader, &current_tags, slot, &mut |size| {
let remaining_tags = rpc::recv_return(&mut reader, &current_tags, slot, &mut |size| -> Result<*mut ()> {
if size == 0 {
0 as *mut ()
Ok(0 as *mut ())
} else {
let mut control = control.borrow_mut();
control.tx.send(kernel::Message::RpcRecvReply(Ok(size)));
match control.rx.recv() {
kernel::Message::RpcRecvRequest(slot) => slot,
kernel::Message::RpcRecvRequest(slot) => Ok(slot),
other => {
panic!("expected nested value slot from kernel CPU, not {:?}", other)
}

4
src/runtime/src/rtio_mgt.rs
View File

@ -55,8 +55,8 @@ pub mod drtio {
}
}
impl From<DrtioError> for Error {
fn from(_error: DrtioError) -> Self {
impl<T> From<DrtioError<T>> for Error {
fn from(_error: DrtioError<T>) -> Self {
Error::AuxError
}
}

2
src/satman/src/subkernel.rs
View File

@ -9,7 +9,7 @@ use core::{slice, str};
use cslice::AsCSlice;
use dma::{Error as DmaError, Manager as DmaManager};
use io::{Cursor, Error as IoError, ProtoWrite, Write};
use ksupport::{eh_artiq, kernel, rpc};
use ksupport::{eh_artiq, kernel, rpc, rtio};
use libboard_artiq::{
drtio_routing::RoutingTable,
drtioaux,