[Commit-gnuradio] r6067 - gnuradio/branches/releases/3.0/usrp/host/lib

[jcorgan]

Author: jcorgan
Date: 2007-07-26 08:29:24 -0600 (Thu, 26 Jul 2007)
New Revision: 6067

Modified:
   gnuradio/branches/releases/3.0/usrp/host/lib/usrp_basic.cc
Log:
Applied changeset r5576 on trunk to release branch.

Modified: gnuradio/branches/releases/3.0/usrp/host/lib/usrp_basic.cc
===================================================================
--- gnuradio/branches/releases/3.0/usrp/host/lib/usrp_basic.cc  2007-07-26 
14:20:01 UTC (rev 6066)
+++ gnuradio/branches/releases/3.0/usrp/host/lib/usrp_basic.cc  2007-07-26 
14:29:24 UTC (rev 6067)
@@ -541,17 +541,19 @@
 {
   bool ok = usrp_basic::stop();
 
-  if (!d_ephandle->stop()){
-    fprintf (stderr, "usrp_basic_rx: failed to stop end point streaming");
+  if (!set_rx_enable(false)){
+    fprintf (stderr, "usrp_basic_rx: set_rx_enable(false) failed\n");
     usb_strerror ();
     ok = false;
   }
-  if (!set_rx_enable(false)){
-    fprintf (stderr, "usrp_basic_rx: set_rx_enable(false) failed\n");
+
+  if (!d_ephandle->stop()){
+    fprintf (stderr, "usrp_basic_rx: failed to stop end point streaming");
     usb_strerror ();
     ok = false;
   }
-  return false;
+
+  return ok;
 }
 
 usrp_basic_rx *
@@ -970,16 +972,18 @@
 {
   bool ok = usrp_basic::stop ();
 
-  if (!set_tx_enable (false)){
-    fprintf (stderr, "usrp_basic_tx: set_tx_enable(false) failed\n");
+  if (!d_ephandle->stop ()){
+    fprintf (stderr, "usrp_basic_tx: failed to stop end point streaming");
     usb_strerror ();
     ok = false;
   }
-  if (!d_ephandle->stop ()){
-    fprintf (stderr, "usrp_basic_tx: failed to stop end point streaming");
+
+  if (!set_tx_enable (false)){
+    fprintf (stderr, "usrp_basic_tx: set_tx_enable(false) failed\n");
     usb_strerror ();
     ok = false;
   }
+
   return ok;
 }