M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

firmware: DmaPlayback → DMARetrieve

This commit is contained in:
Sebastien Bourdeauducq 2017-04-19 11:11:42 +08:00
parent badbd72beb
commit fe05aede78
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/ksupport/lib.rs
View File

@ -369,8 +369,8 @@ struct DmaTrace {
extern fn dma_retrieve(name: CSlice<u8>) -> DmaTrace { extern fn dma_retrieve(name: CSlice<u8>) -> DmaTrace {
let name = str::from_utf8(name.as_ref()).unwrap(); let name = str::from_utf8(name.as_ref()).unwrap();
send(&DmaPlaybackRequest { name: name }); send(&DmaRetrieveRequest { name: name });
recv!(&DmaPlaybackReply { trace, duration } => { recv!(&DmaRetrieveReply { trace, duration } => {
match trace { match trace {
Some(bytes) => Ok(DmaTrace { Some(bytes) => Ok(DmaTrace {
address: bytes.as_ptr() as i32, address: bytes.as_ptr() as i32,

4
artiq/firmware/libproto/kernel_proto.rs
View File

@ -38,10 +38,10 @@ pub enum Message<'a> {
name: &'a str name: &'a str
}, },
DmaPlaybackRequest { DmaRetrieveRequest {
name: &'a str name: &'a str
}, },
DmaPlaybackReply { DmaRetrieveReply {
trace: Option<&'a [u8]>, trace: Option<&'a [u8]>,
duration: u64 duration: u64
}, },

8
artiq/firmware/runtime/session.rs
View File

@ -128,9 +128,9 @@ fn host_write(stream: &mut Write, reply: host::Reply) -> io::Result<()> {
fn kern_send(io: &Io, request: &kern::Message) -> io::Result<()> { fn kern_send(io: &Io, request: &kern::Message) -> io::Result<()> {
match request { match request {
&kern::LoadRequest(_) => debug!("comm->kern LoadRequest(...)"), &kern::LoadRequest(_) => debug!("comm->kern LoadRequest(...)"),
&kern::DmaPlaybackReply { trace, duration } => { &kern::DmaRetrieveReply { trace, duration } => {
if trace.map(|data| data.len() > 100).unwrap_or(false) { if trace.map(|data| data.len() > 100).unwrap_or(false) {
debug!("comm->kern DmaPlaybackReply {{ trace: ..., duration: {:?} }}", duration) debug!("comm->kern DmaRetrieveReply {{ trace: ..., duration: {:?} }}", duration)
} else { } else {
debug!("comm->kern {:?}", request) debug!("comm->kern {:?}", request)
} }
@ -410,9 +410,9 @@ fn process_kern_message(io: &Io, mut stream: Option<&mut TcpStream>,
session.congress.dma_manager.erase(name); session.congress.dma_manager.erase(name);
kern_acknowledge() kern_acknowledge()
} }
&kern::DmaPlaybackRequest { name } => { &kern::DmaRetrieveRequest { name } => {
session.congress.dma_manager.with_trace(name, |trace, duration| { session.congress.dma_manager.with_trace(name, |trace, duration| {
kern_send(io, &kern::DmaPlaybackReply { kern_send(io, &kern::DmaRetrieveReply {
trace: trace, trace: trace,
duration: duration duration: duration
}) })