From 40ca42013b6165c6681d810c7aa175b53b5704f6 Mon Sep 17 00:00:00 2001
From: Dimitri Stolnikov <horiz0n@gmx.net>
Date: Sun, 2 Jun 2013 15:53:45 +0200
Subject: [PATCH] hackrf: disable start/stop as it has caused lock-ups

---
 lib/hackrf/hackrf_sink_c.cc   | 17 +++++++++++++----
 lib/hackrf/hackrf_source_c.cc | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc
index bc80945..8f16c2a 100644
--- a/lib/hackrf/hackrf_sink_c.cc
+++ b/lib/hackrf/hackrf_sink_c.cc
@@ -215,6 +215,11 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args)
   cb_init( &_cbuf, _buf_num, BUF_LEN );
 
 //  _thread = gr::thread::thread(_hackrf_wait, this);
+
+  ret = hackrf_start_tx( _dev, _hackrf_tx_callback, (void *)this );
+  if (ret != HACKRF_SUCCESS) {
+    std::cerr << "Failed to start TX streaming (" << ret << ")" << std::endl;
+  }
 }
 
 /*
@@ -224,6 +229,10 @@ hackrf_sink_c::~hackrf_sink_c ()
 {
   if (_dev) {
 //    _thread.join();
+    int ret = hackrf_stop_tx( _dev );
+    if (ret != HACKRF_SUCCESS) {
+      std::cerr << "Failed to stop TX streaming (" << ret << ")" << std::endl;
+    }
     hackrf_close( _dev );
     _dev = NULL;
 
@@ -287,13 +296,13 @@ bool hackrf_sink_c::start()
     return false;
 
   _buf_used = 0;
-
+#if 0
   int ret = hackrf_start_tx( _dev, _hackrf_tx_callback, (void *)this );
   if (ret != HACKRF_SUCCESS) {
     std::cerr << "Failed to start TX streaming (" << ret << ")" << std::endl;
     return false;
   }
-
+#endif
   return true;
 }
 
@@ -301,13 +310,13 @@ bool hackrf_sink_c::stop()
 {
   if ( ! _dev )
     return false;
-
+#if 0
   int ret = hackrf_stop_tx( _dev );
   if (ret != HACKRF_SUCCESS) {
     std::cerr << "Failed to stop TX streaming (" << ret << ")" << std::endl;
     return false;
   }
-
+#endif
   return true;
 }
 
diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc
index 2d6532c..add2ae0 100644
--- a/lib/hackrf/hackrf_source_c.cc
+++ b/lib/hackrf/hackrf_source_c.cc
@@ -173,6 +173,11 @@ hackrf_source_c::hackrf_source_c (const std::string &args)
   }
 
 //  _thread = gr::thread::thread(_hackrf_wait, this);
+
+  ret = hackrf_start_rx( _dev, _hackrf_rx_callback, (void *)this );
+  if (ret != HACKRF_SUCCESS) {
+    std::cerr << "Failed to start RX streaming (" << ret << ")" << std::endl;
+  }
 }
 
 /*
@@ -182,6 +187,10 @@ hackrf_source_c::~hackrf_source_c ()
 {
   if (_dev) {
 //    _thread.join();
+    int ret = hackrf_stop_rx( _dev );
+    if (ret != HACKRF_SUCCESS) {
+      std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl;
+    }
     hackrf_close( _dev );
     _dev = NULL;
 
@@ -246,13 +255,13 @@ bool hackrf_source_c::start()
 {
   if ( ! _dev )
     return false;
-
+#if 0
   int ret = hackrf_start_rx( _dev, _hackrf_rx_callback, (void *)this );
   if (ret != HACKRF_SUCCESS) {
     std::cerr << "Failed to start RX streaming (" << ret << ")" << std::endl;
     return false;
   }
-
+#endif
   return true;
 }
 
@@ -260,13 +269,13 @@ bool hackrf_source_c::stop()
 {
   if ( ! _dev )
     return false;
-
+#if 0
   int ret = hackrf_stop_rx( _dev );
   if (ret != HACKRF_SUCCESS) {
     std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl;
     return false;
   }
-
+#endif
   return true;
 }