argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

bladerf: update bladerf to catch up with libbladeRF

This commit is contained in:
Robert Ghilduta 2018-06-26 11:28:58 -07:00 committed by Dimitri Stolnikov
parent c06db96489
commit 4d83c6067f
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/bladerf/bladerf_common.cc
View File

@ -414,7 +414,7 @@ size_t bladerf_common::get_max_channels(bladerf_direction direction)
#ifdef BLADERF_COMPATIBILITY #ifdef BLADERF_COMPATIBILITY
return 1; return 1;
#else #else
return bladerf_get_channel_count(_dev.get(), (BLADERF_TX == direction)); return bladerf_get_channel_count(_dev.get(), direction);
#endif #endif
} }
@ -526,7 +526,7 @@ osmosdr::meta_range_t bladerf_common::sample_rates(bladerf_channel ch)
#else #else
int status; int status;
bladerf_range brf_sample_rates; const bladerf_range *brf_sample_rates;
status = bladerf_get_sample_rate_range(_dev.get(), ch, &brf_sample_rates); status = bladerf_get_sample_rate_range(_dev.get(), ch, &brf_sample_rates);
if (status != 0) { if (status != 0) {
@ -534,15 +534,15 @@ osmosdr::meta_range_t bladerf_common::sample_rates(bladerf_channel ch)
} }
/* Suggest a variety of sample rates */ /* Suggest a variety of sample rates */
sample_rates += osmosdr::range_t(brf_sample_rates.min, sample_rates += osmosdr::range_t(brf_sample_rates->min,
brf_sample_rates.max / 4.0, brf_sample_rates->max / 4.0,
brf_sample_rates.max / 16.0); brf_sample_rates->max / 16.0);
sample_rates += osmosdr::range_t(brf_sample_rates.max / 4.0, sample_rates += osmosdr::range_t(brf_sample_rates->max / 4.0,
brf_sample_rates.max / 2.0, brf_sample_rates->max / 2.0,
brf_sample_rates.max / 8.0); brf_sample_rates->max / 8.0);
sample_rates += osmosdr::range_t(brf_sample_rates.max / 2.0, sample_rates += osmosdr::range_t(brf_sample_rates->max / 2.0,
brf_sample_rates.max, brf_sample_rates->max,
brf_sample_rates.max / 4.0); brf_sample_rates->max / 4.0);
#endif #endif
return sample_rates; return sample_rates;
@ -587,16 +587,16 @@ osmosdr::freq_range_t bladerf_common::freq_range(bladerf_channel ch)
#else #else
int status; int status;
struct bladerf_range range; const struct bladerf_range *range;
status = bladerf_get_frequency_range(_dev.get(), ch, &range); status = bladerf_get_frequency_range(_dev.get(), ch, &range);
if (status != 0) { if (status != 0) {
BLADERF_THROW_STATUS(status, "bladerf_get_frequency_range failed"); BLADERF_THROW_STATUS(status, "bladerf_get_frequency_range failed");
}; };
return osmosdr::freq_range_t(static_cast<double>(range.min), return osmosdr::freq_range_t(static_cast<double>(range->min),
static_cast<double>(range.max), static_cast<double>(range->max),
static_cast<double>(range.step)); static_cast<double>(range->step));
#endif #endif
} }
@ -648,14 +648,14 @@ osmosdr::freq_range_t bladerf_common::filter_bandwidths(bladerf_channel ch)
#else #else
int status; int status;
bladerf_range range; const bladerf_range *range;
status = bladerf_get_bandwidth_range(_dev.get(), ch, &range); status = bladerf_get_bandwidth_range(_dev.get(), ch, &range);
if (status != 0) { if (status != 0) {
BLADERF_THROW_STATUS(status, "bladerf_get_bandwidth_range failed"); BLADERF_THROW_STATUS(status, "bladerf_get_bandwidth_range failed");
} }
bandwidths += osmosdr::range_t(range.min, range.max, range.step); bandwidths += osmosdr::range_t(range->min, range->max, range->step);
#endif #endif
return bandwidths; return bandwidths;
@ -717,6 +717,7 @@ std::vector<std::string> bladerf_common::get_gain_names(bladerf_channel ch)
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
char *tmp = gain_names[i]; char *tmp = gain_names[i];
printf("FOUND %s\n", tmp);
names += std::string(tmp); names += std::string(tmp);
}; };
#endif #endif
@ -747,7 +748,7 @@ osmosdr::gain_range_t bladerf_common::get_gain_range(std::string const &name,
#else #else
int status; int status;
struct bladerf_range range; const bladerf_range *range;
if (name == SYSTEM_GAIN_NAME) { if (name == SYSTEM_GAIN_NAME) {
status = bladerf_get_gain_range(_dev.get(), ch, &range); status = bladerf_get_gain_range(_dev.get(), ch, &range);
@ -760,7 +761,7 @@ osmosdr::gain_range_t bladerf_common::get_gain_range(std::string const &name,
"range for stage '%s'") % name)); "range for stage '%s'") % name));
} }
return osmosdr::gain_range_t(range.min, range.max, range.step); return osmosdr::gain_range_t(range->min, range->max, range->step);
#endif #endif
} }

4
lib/bladerf/bladerf_source_c.cc
View File

@ -594,8 +594,8 @@ void bladerf_source_c::set_loopback_mode(const std::string &loopback)
mode = BLADERF_LB_RF_LNA3; mode = BLADERF_LB_RF_LNA3;
} else if (loopback == "firmware") { } else if (loopback == "firmware") {
mode = BLADERF_LB_FIRMWARE; mode = BLADERF_LB_FIRMWARE;
} else if (loopback == "ad9361_bist") { } else if (loopback == "rfic_bist") {
mode = BLADERF_LB_AD9361_BIST; mode = BLADERF_LB_RFIC_BIST;
} else if (loopback == "none") { } else if (loopback == "none") {
mode = BLADERF_LB_NONE; mode = BLADERF_LB_NONE;
} else { } else {