[Commit-gnuradio] r6405 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps-inband lib/inband

[gnychis]

Author: gnychis
Date: 2007-09-11 13:10:10 -0600 (Tue, 11 Sep 2007)
New Revision: 6405

Modified:
   gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/gmac.cc
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_gmac_tx.cc
   
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:
Work in progress on deadline testing


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/gmac.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/gmac.cc   
2007-09-11 18:34:44 UTC (rev 6404)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/gmac.cc   
2007-09-11 19:10:10 UTC (rev 6405)
@@ -360,7 +360,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("cs1.rbf"));
+               pmt_intern("test2.rbf"));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("interp-tx"),

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_gmac_tx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_gmac_tx.cc
   2007-09-11 18:34:44 UTC (rev 6404)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_gmac_tx.cc
   2007-09-11 19:10:10 UTC (rev 6405)
@@ -189,6 +189,10 @@
   d_state = TRANSMITTING;
   d_nsamples_xmitted = 0;
 
+  d_cs->send(s_cmd_carrier_sense_deadline,
+             pmt_list2(PMT_NIL,
+                       pmt_from_long(100000000)));
+
   build_and_send_next_frame(); // fire off 4 to start pipeline
   build_and_send_next_frame();
   build_and_send_next_frame();
@@ -241,7 +245,7 @@
     
   // Per packet properties
   pmt_t tx_properties = pmt_make_dict();
-    
+
   if(d_nframes_xmitted > 25000) {
     pmt_dict_set(tx_properties,
                  pmt_intern("carrier-sense"),
@@ -276,6 +280,14 @@
                  pmt_intern("carrier-sense"),
                  PMT_T);
   }
+  
+//  if(d_nframes_xmitted > 110000) {
+//
+//    if(d_nframes_xmitted % 10 == 0)
+//      pmt_dict_set(tx_properties,
+//                   pmt_intern("carrier-sense"),
+//                   PMT_T);
+//  }
 
   pmt_t timestamp = pmt_from_long(0xffffffff); // NOW
   d_tx->send(s_cmd_tx_pkt,

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-09-11 18:34:44 UTC (rev 6404)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc 
    2007-09-11 19:10:10 UTC (rev 6405)
@@ -660,7 +660,7 @@
 
   pkts[n_packets-1].set_end_of_burst(); // set the last packet's end of burst
 
-  if (verbose)
+  if (verbose && 0)
     std::cout << "[USRP_SERVER] Received raw frame invocation: " 
               << invocation_handle << std::endl;
     

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-09-11 18:34:44 UTC (rev 6404)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.mbh
    2007-09-11 19:10:10 UTC (rev 6405)
@@ -106,7 +106,7 @@
 ;;   (op-ping-fixed-reply rid ping-value)
 ;;   (op-write-reg reg-number reg-value)
 ;;   (op-write-reg-masked reg-number reg-value mask-value)
-;;   (op-read-reg rid reg-number reg-value)
+;;   (op-read-reg rid reg-number)
 ;;   (op-read-reg-reply rid reg-number reg-value)
 ;;   (op-i2c-write i2c-addr u8-vec)
 ;;   (op-i2c-read rid i2c-addr nbytes)