From 23b1b9cdb1349bb61b9fa2acae6482c654d2a8f6 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Sat, 25 Oct 2014 15:11:57 -0400 Subject: [PATCH] bladeRF: Removed unused bladerf_metadata parameter from rx/tx calls It is safe (and preferred) to pass NULL for the metadata paremeter when using a format that does utilize the metadata structure. --- lib/bladerf/bladerf_sink_c.cc | 3 +-- lib/bladerf/bladerf_source_c.cc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bladerf/bladerf_sink_c.cc b/lib/bladerf/bladerf_sink_c.cc index c230e41..4003235 100644 --- a/lib/bladerf/bladerf_sink_c.cc +++ b/lib/bladerf/bladerf_sink_c.cc @@ -99,7 +99,6 @@ int bladerf_sink_c::work( int noutput_items, gr_vector_void_star &output_items ) { const gr_complex *in = (const gr_complex *) input_items[0]; - struct bladerf_metadata meta; const float scaling = 2000.0f; int ret; @@ -124,7 +123,7 @@ int bladerf_sink_c::work( int noutput_items, /* Submit them to the device */ ret = bladerf_sync_tx(_dev.get(), static_cast(_conv_buf), - noutput_items, &meta, _stream_timeout_ms); + noutput_items, NULL, _stream_timeout_ms); if ( ret != 0 ) { std::cerr << _pfx << "bladerf_sync_tx error: " diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc index d7eaeeb..4c698f1 100644 --- a/lib/bladerf/bladerf_source_c.cc +++ b/lib/bladerf/bladerf_source_c.cc @@ -140,7 +140,6 @@ int bladerf_source_c::work( int noutput_items, gr_vector_void_star &output_items ) { int ret; - struct bladerf_metadata meta; int16_t *current; const float scaling = 1.0f / 2048.0f; gr_complex *out = static_cast(output_items[0]); @@ -160,7 +159,7 @@ int bladerf_source_c::work( int noutput_items, /* Grab all the samples into the temporary buffer */ ret = bladerf_sync_rx(_dev.get(), static_cast(_conv_buf), - noutput_items, &meta, _stream_timeout_ms); + noutput_items, NULL, _stream_timeout_ms); if ( ret != 0 ) { std::cerr << _pfx << "bladerf_sync_rx error: " << bladerf_strerror(ret) << std::endl;