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

[gnychis]

Author: gnychis
Date: 2007-09-06 10:35:40 -0600 (Thu, 06 Sep 2007)
New Revision: 6342

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
Log:
Underrun work in progress still


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
      2007-09-06 02:20:16 UTC (rev 6341)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_underrun.cc
      2007-09-06 16:35:40 UTC (rev 6342)
@@ -129,7 +129,7 @@
   d_rx_chan(PMT_NIL),
   d_which_usrp(pmt_from_long(0)),
   d_state(INIT),
-  d_nsamples_to_send((long) 50e6),
+  d_nsamples_to_send((long) 10e6),
   d_nsamples_xmitted(0),
   d_nframes_xmitted(0),
   d_samples_per_frame(d_nsamples_to_send),     // full packet
@@ -145,12 +145,12 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("merge4.rbf"));
+               pmt_intern("stop2.rbf"));
 
   // Set TX and RX interpolations
   pmt_dict_set(usrp_dict,
                pmt_intern("interp-tx"),
-               pmt_from_long(16));
+               pmt_from_long(128));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("interp-rx"),
@@ -265,7 +265,7 @@
           // If the RX has also been allocated already, we can continue
           if(!pmt_eqv(d_rx_chan, PMT_NIL)) {
             enter_receiving();
-            //enter_transmitting();
+            enter_transmitting();
           }
 
           return;
@@ -294,7 +294,7 @@
           // If the TX has also been allocated already, we can continue
           if(!pmt_eqv(d_tx_chan, PMT_NIL)) {
             enter_receiving();
-            //enter_transmitting();
+            enter_transmitting();
           }
 
           return;
@@ -618,7 +618,7 @@
   if (d_done_sending &&
       pmt_to_long(handle) == (d_nframes_xmitted - 1)){
     // We're done sending and have received all responses
-    //closing_channels();
+    closing_channels();
     return;
   }
 

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-09-06 02:20:16 UTC (rev 6341)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-09-06 16:35:40 UTC (rev 6342)
@@ -119,7 +119,7 @@
       return;
     }
 
-    if(underrun)
+    if(underrun && verbose)
       std::cout << "[usrp_rx] Underrun\n";
 
     d_cs->send(s_response_usrp_rx_read,