From fe05aede7876a6f1cc2c1ccf1e241574735735ea Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 19 Apr 2017 11:11:42 +0800
Subject: [PATCH] =?UTF-8?q?firmware:=20DmaPlayback=20=E2=86=92=20DMARetrie?=
 =?UTF-8?q?ve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 artiq/firmware/ksupport/lib.rs          | 4 ++--
 artiq/firmware/libproto/kernel_proto.rs | 4 ++--
 artiq/firmware/runtime/session.rs       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/artiq/firmware/ksupport/lib.rs b/artiq/firmware/ksupport/lib.rs
index 69d6846df..0fd8c9f9b 100644
--- a/artiq/firmware/ksupport/lib.rs
+++ b/artiq/firmware/ksupport/lib.rs
@@ -369,8 +369,8 @@ struct DmaTrace {
 extern fn dma_retrieve(name: CSlice<u8>) -> DmaTrace {
     let name = str::from_utf8(name.as_ref()).unwrap();
 
-    send(&DmaPlaybackRequest { name: name });
-    recv!(&DmaPlaybackReply { trace, duration } => {
+    send(&DmaRetrieveRequest { name: name });
+    recv!(&DmaRetrieveReply { trace, duration } => {
         match trace {
             Some(bytes) => Ok(DmaTrace {
                 address:  bytes.as_ptr() as i32,
diff --git a/artiq/firmware/libproto/kernel_proto.rs b/artiq/firmware/libproto/kernel_proto.rs
index d5d6ffbe2..8688e534a 100644
--- a/artiq/firmware/libproto/kernel_proto.rs
+++ b/artiq/firmware/libproto/kernel_proto.rs
@@ -38,10 +38,10 @@ pub enum Message<'a> {
         name: &'a str
     },
 
-    DmaPlaybackRequest {
+    DmaRetrieveRequest {
         name: &'a str
     },
-    DmaPlaybackReply {
+    DmaRetrieveReply {
         trace:    Option<&'a [u8]>,
         duration: u64
     },
diff --git a/artiq/firmware/runtime/session.rs b/artiq/firmware/runtime/session.rs
index 1ec00a0c7..d38ae8570 100644
--- a/artiq/firmware/runtime/session.rs
+++ b/artiq/firmware/runtime/session.rs
@@ -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<()> {
     match request {
         &kern::LoadRequest(_) => debug!("comm->kern LoadRequest(...)"),
-        &kern::DmaPlaybackReply { trace, duration } => {
+        &kern::DmaRetrieveReply { trace, duration } => {
             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 {
                 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);
                 kern_acknowledge()
             }
-            &kern::DmaPlaybackRequest { name } => {
+            &kern::DmaRetrieveRequest { name } => {
                 session.congress.dma_manager.with_trace(name, |trace, duration| {
-                    kern_send(io, &kern::DmaPlaybackReply {
+                    kern_send(io, &kern::DmaRetrieveReply {
                         trace:    trace,
                         duration: duration
                     })