aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Szymaniak <jon.szymaniak@gmail.com>2014-01-11 21:18:11 -0500
committerDimitri Stolnikov <horiz0n@gmx.net>2014-01-13 17:19:44 +0100
commit8bbd2b5bb5f1ddab4ecb26747d5d9f4cc1c0755f (patch)
tree38436c056c01f96097b7268d6b450d0e2e78ce24
parent7ae3e985e2a48130e95ae1f8e93268309633cc4c (diff)
bladerf: Added start()/stop() implementations
-rw-r--r--lib/bladerf/bladerf_sink_c.cc102
-rw-r--r--lib/bladerf/bladerf_sink_c.h3
-rw-r--r--lib/bladerf/bladerf_source_c.cc74
-rw-r--r--lib/bladerf/bladerf_source_c.h3
4 files changed, 109 insertions, 73 deletions
diff --git a/lib/bladerf/bladerf_sink_c.cc b/lib/bladerf/bladerf_sink_c.cc
index aee9b31..cf046fe 100644
--- a/lib/bladerf/bladerf_sink_c.cc
+++ b/lib/bladerf/bladerf_sink_c.cc
@@ -72,8 +72,6 @@ bladerf_sink_c::bladerf_sink_c (const std::string &args)
gr::io_signature::make (MIN_IN, MAX_IN, sizeof (gr_complex)),
gr::io_signature::make (MIN_OUT, MAX_OUT, sizeof (gr_complex)))
{
- int ret;
-
dict_t dict = params_to_dict(args);
/* Perform src/sink agnostic initializations */
@@ -85,36 +83,11 @@ bladerf_sink_c::bladerf_sink_c (const std::string &args)
/* Set the range of VGA2, VGA2GAIN[4:0] */
_vga2_range = osmosdr::gain_range_t( 0, 25, 1 );
- /* Initialize the stream */
- ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
- &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q12,
- _samples_per_buffer, _num_transfers, this );
- if ( ret != 0 )
- std::cerr << _pfx << "bladerf_init_stream failed:"
- << bladerf_strerror(ret) << std::endl;
-
- /* Initialize buffer management */
- _buf_index = _next_to_tx = 0;
- _next_value = static_cast<int16_t*>(_buffers[0]);
- _samples_left = _samples_per_buffer;
-
_filled = new bool[_num_buffers];
if (!_filled) {
throw std::runtime_error( std::string(__FUNCTION__) + " " +
"Failed to allocate _filled[]" );
}
-
- for (size_t i = 0; i < _num_buffers; ++i) {
- _filled[i] = false;
- }
-
- ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_TX, true );
- if ( ret != 0 )
- std::cerr << _pfx << "bladerf_enable_module has failed:"
- << bladerf_strerror(ret) << std::endl;
-
- set_running( true );
- _thread = gr::thread::thread( boost::bind(&bladerf_sink_c::write_task, this) );
}
/*
@@ -124,15 +97,11 @@ bladerf_sink_c::~bladerf_sink_c ()
{
int ret;
- set_running(false);
-
- /* Ensure work() or callbacks return from wait() calls */
- _buf_status_lock.lock();
- _buffer_filled.notify_all();
- _buffer_emptied.notify_all();
- _buf_status_lock.unlock();
-
- _thread.join();
+ if( is_running() == true ) {
+ std::cerr << _pfx << "Still running when destructor called!"
+ << std::endl;
+ stop();
+ }
ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_TX, false );
if ( ret != 0 )
@@ -205,20 +174,63 @@ void bladerf_sink_c::write_task()
int status;
/* Start stream and stay there until we kill the stream */
+ set_running(true);
status = bladerf_stream(_stream, BLADERF_MODULE_TX);
if ( status < 0 ) {
- std::cerr << _pfx << "Sink stream error: "
- << bladerf_strerror(status) << std::endl;
+ set_running(false);
+ std::cerr << _pfx << "Sink stream error: "
+ << bladerf_strerror(status) << std::endl;
+
+ if ( status == BLADERF_ERR_TIMEOUT ) {
+ std::cerr << _pfx << "Try adjusting your sample rate or the "
+ << "\"buffers\", \"buflen\", and \"transfers\" parameters. "
+ << std::endl;
+ }
+ }
+}
- if ( status == BLADERF_ERR_TIMEOUT ) {
- std::cerr << _pfx << "Try adjusting your sample rate or the "
- << "\"buffers\", \"buflen\", and \"transfers\" parameters. "
- << std::endl;
- }
+bool bladerf_sink_c::start()
+{
+ int ret;
+
+ /* Initialize the stream */
+ ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
+ &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q12,
+ _samples_per_buffer, _num_transfers, this );
+ if ( ret != 0 ) {
+ throw std::runtime_error( std::string(__FUNCTION__) + " " +
+ "bladerf_init_stream failed" ) ;
+ }
+
+ /* Initialize buffer management */
+ _buf_index = _next_to_tx = 0;
+ _next_value = static_cast<int16_t*>(_buffers[0]);
+ _samples_left = _samples_per_buffer;
+
+ for (size_t i = 0; i < _num_buffers; ++i) {
+ _filled[i] = false;
+ }
+
+ ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_TX, true );
+ if ( ret != 0 ) {
+ throw std::runtime_error(std::string(__FUNCTION__) + " " +
+ "bladerf_enable_module has failed:" + bladerf_strerror(ret) );
}
- set_running( false );
+ _thread = gr::thread::thread( boost::bind(&bladerf_sink_c::write_task, this) );
+ while(is_running() == false) {
+ /* Not quite started up just yet, so wait for a short period of time */
+ boost::this_thread::sleep( boost::posix_time::milliseconds(1) );
+ }
+ return true;
+}
+
+bool bladerf_sink_c::stop()
+{
+ set_running(false);
+ _thread.join();
+ return true;
}
int bladerf_sink_c::work( int noutput_items,
@@ -549,7 +561,7 @@ void bladerf_sink_c::set_iq_balance( const std::complex<double> &balance, size_t
int ret = 0;
int16_t val_gain,val_phase;
- //FPGA gain correction defines 0.0 as BLADERF_GAIN_ZERO, scale the offset range to +/- BLADERF_GAIN_RANGE
+ //FPGA gain correction defines 0.0 as BLADERF_GAIN_ZERO, scale the offset range to +/- BLADERF_GAIN_RANGE
val_gain = (int16_t)(balance.real() * (int16_t)BLADERF_GAIN_RANGE) + BLADERF_GAIN_ZERO;
//FPGA phase correction steps from -45 to 45 degrees
val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE);
diff --git a/lib/bladerf/bladerf_sink_c.h b/lib/bladerf/bladerf_sink_c.h
index 0408a5a..9885092 100644
--- a/lib/bladerf/bladerf_sink_c.h
+++ b/lib/bladerf/bladerf_sink_c.h
@@ -68,6 +68,9 @@ private:
public:
~bladerf_sink_c (); // public destructor
+ bool start();
+ bool stop();
+
int work( int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items );
diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc
index 15d1c7e..ba31a02 100644
--- a/lib/bladerf/bladerf_source_c.cc
+++ b/lib/bladerf/bladerf_source_c.cc
@@ -139,21 +139,6 @@ bladerf_source_c::bladerf_source_c (const std::string &args)
/* Set the range of VGA2 VGA2GAIN[4:0], not recommended to be used above 30dB */
_vga2_range = osmosdr::gain_range_t( 0, 60, 3 );
- /* Initialize the stream */
- _buf_index = 0;
- ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
- &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q12,
- _samples_per_buffer, _num_buffers, this );
- if ( ret != 0 )
- std::cerr << _pfx << "bladerf_init_stream failed: "
- << bladerf_strerror(ret) << std::endl;
-
- ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_RX, true );
- if ( ret != 0 )
- std::cerr << _pfx << "bladerf_enable_module failed:"
- << bladerf_strerror(ret) << std::endl;
-
- _thread = gr::thread::thread( boost::bind(&bladerf_source_c::read_task, this) );
}
/*
@@ -163,8 +148,11 @@ bladerf_source_c::~bladerf_source_c ()
{
int ret;
- set_running(false);
- _thread.join();
+ if (is_running()) {
+ std::cerr << _pfx << "Still running when destructor called!"
+ << std::endl;
+ stop();
+ }
ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_RX, false );
if ( ret != 0 )
@@ -249,16 +237,49 @@ void bladerf_source_c::read_task()
status = bladerf_stream(_stream, BLADERF_MODULE_RX);
if ( status < 0 ) {
- std::cerr << "Source stream error: " << bladerf_strerror(status) << std::endl;
+ set_running( false );
+ std::cerr << "Source stream error: " << bladerf_strerror(status) << std::endl;
- if ( status == BLADERF_ERR_TIMEOUT ) {
- std::cerr << _pfx << "Try adjusting your sample rate or the "
- << "\"buffers\", \"buflen\", and \"transfers\" parameters. "
- << std::endl;
- }
+ if ( status == BLADERF_ERR_TIMEOUT ) {
+ std::cerr << _pfx << "Try adjusting your sample rate or the "
+ << "\"buffers\", \"buflen\", and \"transfers\" parameters. "
+ << std::endl;
+ }
}
+}
+
+bool bladerf_source_c::start()
+{
+ int ret;
- set_running( false );
+ /* Initialize the stream */
+ _buf_index = 0;
+ ret = bladerf_init_stream( &_stream, _dev.get(), stream_callback,
+ &_buffers, _num_buffers, BLADERF_FORMAT_SC16_Q12,
+ _samples_per_buffer, _num_buffers, this );
+ if ( ret != 0 )
+ std::cerr << _pfx << "bladerf_init_stream failed: "
+ << bladerf_strerror(ret) << std::endl;
+
+ ret = bladerf_enable_module( _dev.get(), BLADERF_MODULE_RX, true );
+ if ( ret != 0 )
+ std::cerr << _pfx << "bladerf_enable_module failed:"
+ << bladerf_strerror(ret) << std::endl;
+
+ _thread = gr::thread::thread( boost::bind(&bladerf_source_c::read_task, this) );
+
+ while( is_running() == false ) {
+ boost::this_thread::sleep( boost::posix_time::milliseconds(1) );
+ }
+
+ return true;
+}
+
+bool bladerf_source_c::stop()
+{
+ set_running(false);
+ _thread.join();
+ return true;
}
/* Main work function, pull samples from the sample fifo */
@@ -286,8 +307,6 @@ int bladerf_source_c::work( int noutput_items,
out[i] = _fifo->at(0);
_fifo->pop_front();
}
-
- //std::cerr << "-" << std::flush;
}
return noutput_items;
@@ -313,7 +332,6 @@ double bladerf_source_c::set_sample_rate( double rate )
{
int ret;
uint32_t actual;
- /* Set the Si5338 to be 2x this sample rate */
/* Check to see if the sample rate is an integer */
if( (uint32_t)round(rate) == (uint32_t)rate )
@@ -612,7 +630,7 @@ void bladerf_source_c::set_iq_balance( const std::complex<double> &balance, size
int ret = 0;
int16_t val_gain,val_phase;
- //FPGA gain correction defines 0.0 as BLADERF_GAIN_ZERO, scale the offset range to +/- BLADERF_GAIN_RANGE
+ //FPGA gain correction defines 0.0 as BLADERF_GAIN_ZERO, scale the offset range to +/- BLADERF_GAIN_RANGE
val_gain = (int16_t)(balance.real() * (int16_t)BLADERF_GAIN_RANGE) + BLADERF_GAIN_ZERO;
//FPGA phase correction steps from -45 to 45 degrees
val_phase = (int16_t)(balance.imag() * BLADERF_PHASE_RANGE);
diff --git a/lib/bladerf/bladerf_source_c.h b/lib/bladerf/bladerf_source_c.h
index 7bb8982..658ccad 100644
--- a/lib/bladerf/bladerf_source_c.h
+++ b/lib/bladerf/bladerf_source_c.h
@@ -68,6 +68,9 @@ private:
public:
~bladerf_source_c (); // public destructor
+ bool start();
+ bool stop();
+
int work( int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items );