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.
This commit is contained in:
Jon Szymaniak 2014-10-25 15:11:57 -04:00 committed by Dimitri Stolnikov
parent 42c66fdd70
commit 23b1b9cdb1
2 changed files with 2 additions and 4 deletions

View File

@ -99,7 +99,6 @@ int bladerf_sink_c::work( int noutput_items,
gr_vector_void_star &output_items ) gr_vector_void_star &output_items )
{ {
const gr_complex *in = (const gr_complex *) input_items[0]; const gr_complex *in = (const gr_complex *) input_items[0];
struct bladerf_metadata meta;
const float scaling = 2000.0f; const float scaling = 2000.0f;
int ret; int ret;
@ -124,7 +123,7 @@ int bladerf_sink_c::work( int noutput_items,
/* Submit them to the device */ /* Submit them to the device */
ret = bladerf_sync_tx(_dev.get(), static_cast<void *>(_conv_buf), ret = bladerf_sync_tx(_dev.get(), static_cast<void *>(_conv_buf),
noutput_items, &meta, _stream_timeout_ms); noutput_items, NULL, _stream_timeout_ms);
if ( ret != 0 ) { if ( ret != 0 ) {
std::cerr << _pfx << "bladerf_sync_tx error: " std::cerr << _pfx << "bladerf_sync_tx error: "

View File

@ -140,7 +140,6 @@ int bladerf_source_c::work( int noutput_items,
gr_vector_void_star &output_items ) gr_vector_void_star &output_items )
{ {
int ret; int ret;
struct bladerf_metadata meta;
int16_t *current; int16_t *current;
const float scaling = 1.0f / 2048.0f; const float scaling = 1.0f / 2048.0f;
gr_complex *out = static_cast<gr_complex *>(output_items[0]); gr_complex *out = static_cast<gr_complex *>(output_items[0]);
@ -160,7 +159,7 @@ int bladerf_source_c::work( int noutput_items,
/* Grab all the samples into the temporary buffer */ /* Grab all the samples into the temporary buffer */
ret = bladerf_sync_rx(_dev.get(), static_cast<void *>(_conv_buf), ret = bladerf_sync_rx(_dev.get(), static_cast<void *>(_conv_buf),
noutput_items, &meta, _stream_timeout_ms); noutput_items, NULL, _stream_timeout_ms);
if ( ret != 0 ) { if ( ret != 0 ) {
std::cerr << _pfx << "bladerf_sync_rx error: " std::cerr << _pfx << "bladerf_sync_rx error: "
<< bladerf_strerror(ret) << std::endl; << bladerf_strerror(ret) << std::endl;