diff options
author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-08-27 22:37:08 +0200 |
---|---|---|
committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-08-27 22:41:54 +0200 |
commit | 265de87c45cb546f656f810be7c01d182c65f03f (patch) | |
tree | 14d524349caefeb8f7c9513b9d20d2c7074f34a2 /lib/bladerf/bladerf_common.cc | |
parent | e97339c137c71f26291b31c4167a6e41b67c3b45 (diff) |
bladerf: follow recent API changes
tested against aea04c5f119288370166ece05166a8a4157da6fa
Diffstat (limited to 'lib/bladerf/bladerf_common.cc')
-rw-r--r-- | lib/bladerf/bladerf_common.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc index 72db844..43b58ec 100644 --- a/lib/bladerf/bladerf_common.cc +++ b/lib/bladerf/bladerf_common.cc @@ -123,7 +123,7 @@ osmosdr::freq_range_t bladerf_common::filter_bandwidths() std::vector< std::string > bladerf_common::devices() { - struct ::bladerf_devinfo *devices; + struct bladerf_devinfo *devices; ssize_t n_devices; std::vector< std::string > ret; @@ -133,16 +133,20 @@ std::vector< std::string > bladerf_common::devices() for (ssize_t i = 0; i < n_devices; i++) { std::stringstream s; - std::string dev(devices[i].path); + std::string serial(devices[i].serial); - s << "bladerf=" << dev.substr(dev.find_first_of("01234567890")) << "," - << "label='nuand bladeRF SN " << std::setfill('0') << std::setw(16) - << devices[i].serial << "'"; + s << "bladerf=" << devices[i].instance << "," + << "label='nuand bladeRF"; + + if ( serial.length() ) + s << " SN " << serial; + + s << "'"; ret.push_back(s.str()); } - bladerf_free_device_list(devices, n_devices); + bladerf_free_device_list(devices); } return ret; |