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

[gnychis]

Author: gnychis
Date: 2007-08-05 10:35:48 -0600 (Sun, 05 Aug 2007)
New Revision: 6117

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:
Adding timestamps to the response from control packets


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 
    2007-08-04 18:52:08 UTC (rev 6116)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2007-08-05 16:35:48 UTC (rev 6117)
@@ -1142,10 +1142,11 @@
       // FIXME: should be 1 response for all subpackets here ?
       if((port = tx_port_index(owner)) != -1)
         d_tx[port]->send(s_response_from_control_channel,
-                         pmt_list3(invocation_handle,
+                         pmt_list4(invocation_handle,
                                    PMT_T,
                                    pmt_list2(s_op_ping_fixed_reply, // subp
-                                             pmt_list2(rid, pingval))));
+                                             pmt_list2(rid, pingval)),
+                                   pmt_from_long(pkt->timestamp())));
     }
     
     //----------------- READ REG RESPONSE ------------------//
@@ -1172,10 +1173,11 @@
       // FIXME: should be 1 response for all subpackets here ?
       if((port = tx_port_index(owner)) != -1)
         d_tx[port]->send(s_response_from_control_channel,
-                         pmt_list3(invocation_handle,
+                         pmt_list4(invocation_handle,
                                    PMT_T,
                                    pmt_list2(s_op_read_reg_reply, // subp
-                                             pmt_list3(rid, reg_num, 
reg_val))));
+                                             pmt_list3(rid, reg_num, reg_val)),
+                                   pmt_from_long(pkt->timestamp())));
     }
 
     //------------------ I2C READ REPLY -------------------//
@@ -1201,10 +1203,11 @@
 
       if((port = tx_port_index(owner)) != -1)
         d_tx[port]->send(s_response_from_control_channel,
-                         pmt_list3(invocation_handle,
+                         pmt_list4(invocation_handle,
                                    PMT_T,
                                    pmt_list2(s_op_i2c_read_reply,
-                                             pmt_list3(rid, i2c_addr, 
i2c_data))));
+                                             pmt_list3(rid, i2c_addr, 
i2c_data)),
+                                   pmt_from_long(pkt->timestamp())));
     }
 
     //------------------ SPI READ REPLY -------------------//
@@ -1228,10 +1231,11 @@
 
       if((port = tx_port_index(owner)) != -1)
         d_tx[port]->send(s_response_from_control_channel,
-                         pmt_list3(invocation_handle,
+                         pmt_list4(invocation_handle,
                                    PMT_T,
                                    pmt_list2(s_op_spi_read_reply,
-                                             pmt_list2(rid, spi_data))));
+                                             pmt_list2(rid, spi_data)),
+                                   pmt_from_long(pkt->timestamp())));
     }
 
     // Each subpacket has an unaccounted for 2 bytes which is the opcode

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
    2007-08-04 18:52:08 UTC (rev 6116)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
    2007-08-05 16:35:48 UTC (rev 6117)
@@ -127,7 +127,7 @@
 
   (:incoming
 
-   (response-from-control-channel invocation-handle status list-of-subpackets)
+   (response-from-control-channel invocation-handle status list-of-subpackets 
timestamp)
 
    )
   )