[Commit-gnuradio] r7691 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband

[gnychis]

Author: gnychis
Date: 2008-02-14 15:20:30 -0700 (Thu, 14 Feb 2008)
New Revision: 7691

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
Log:
the channel should be carried with all incoming samples without having to dig
into a dictionary to find it, it is a mandatory property of the data just like
the timestamp


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2008-02-14 22:07:24 UTC (rev 7690)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2008-02-14 22:20:30 UTC (rev 7691)
@@ -1293,10 +1293,11 @@
                  PMT_T);
 
   d_rx[port]->send(s_response_recv_raw_samples,
-                   pmt_list5(invocation_handle,
+                   pmt_list6(invocation_handle,
                              status,
                              v_samples,
                              pmt_from_long(pkt->timestamp()),
+                             pmt_from_long(channel),
                              properties));
   return;
 }

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
    2008-02-14 22:07:24 UTC (rev 7690)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
    2008-02-14 22:20:30 UTC (rev 7691)
@@ -202,7 +202,7 @@
 
   (:incoming
 
-   (response-recv-raw-samples invocation-handle status samples timestamp 
properties)
+   (response-recv-raw-samples invocation-handle status samples timestamp 
channel properties)
 
    ;; samples is a uniform numeric vector.  The contents of the sample
    ;; vector is treated as opaque and is passed from the FPGA