[Commit-gnuradio] r9650 - gnuradio/trunk/gr-usrp2/src

[eb]

Author: eb
Date: 2008-09-23 18:20:41 -0600 (Tue, 23 Sep 2008)
New Revision: 9650

Modified:
   gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc
Log:
return -1 (DONE flag) if source or sink sees an error

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc      2008-09-24 00:14:47 UTC 
(rev 9649)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
@@ -64,8 +64,10 @@
 
   bool ok = d_u2->tx_16sc(0,  // FIXME: someday, streams will have channel 
numbers
                          in, noutput_items, &metadata);
-  if (!ok)
+  if (!ok){
     std::cerr << "usrp2_sink_16sc: tx_complex_int16 failed" << std::endl;
+    return -1; // say we're done
+  }
 
   return noutput_items;
 }

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc      2008-09-24 00:14:47 UTC 
(rev 9649)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
@@ -64,8 +64,10 @@
 
   bool ok = d_u2->tx_32fc(0,  // FIXME: someday, streams will have channel 
numbers
                          in, noutput_items, &metadata);
-  if (!ok)
+  if (!ok){
     std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;
+    return -1; // say we're done
+  }
 
   return noutput_items;
 }

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc    2008-09-24 00:14:47 UTC 
(rev 9649)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc    2008-09-24 00:20:41 UTC 
(rev 9650)
@@ -59,8 +59,10 @@
   rx_16sc_handler::sptr handler = rx_16sc_handler::make(noutput_items, 
USRP2_MIN_RX_SAMPLES, out);
 
   bool ok = d_u2->rx_samples(0, handler.get());
-  if (!ok)
+  if (!ok){
     std::cerr << "usrp2::rx_samples() failed" << std::endl;
+    return -1; // say we're done
+  }
 
   return handler->nsamples();
 }

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc    2008-09-24 00:14:47 UTC 
(rev 9649)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc    2008-09-24 00:20:41 UTC 
(rev 9650)
@@ -59,8 +59,10 @@
   rx_32fc_handler::sptr handler = rx_32fc_handler::make(noutput_items, 
USRP2_MIN_RX_SAMPLES, out);
 
   bool ok = d_u2->rx_samples(0, handler.get());
-  if (!ok)
+  if (!ok){
     std::cerr << "usrp2::rx_samples() failed" << std::endl;
+    return -1; // say we're done
+  }
 
   return handler->nsamples();
 }