From d81936d90755ceecf4c3c893cf41fdfa9d10b72f Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Fri, 4 Oct 2013 18:31:39 +0200 Subject: [PATCH] bladerf: use newstyle version getters --- lib/bladerf/bladerf_sink_c.cc | 10 +++++----- lib/bladerf/bladerf_source_c.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/bladerf/bladerf_sink_c.cc b/lib/bladerf/bladerf_sink_c.cc index 244284c..7754679 100644 --- a/lib/bladerf/bladerf_sink_c.cc +++ b/lib/bladerf/bladerf_sink_c.cc @@ -135,12 +135,12 @@ bladerf_sink_c::bladerf_sink_c (const std::string &args) if ( bladerf_get_serial( _dev, serial ) == 0 ) std::cerr << " SN " << serial; - unsigned int major, minor; - if ( bladerf_get_fw_version( _dev, &major, &minor) == 0 ) - std::cerr << " FW v" << major << "." << minor; + struct bladerf_version ver; + if ( bladerf_fw_version( _dev, &ver ) == 0 ) + std::cerr << " FW v" << ver.major << "." << ver.minor << "." << ver.patch; - if ( bladerf_get_fpga_version( _dev, &major, &minor) == 0 ) - std::cerr << " FPGA v" << major << "." << minor; + if ( bladerf_fpga_version( _dev, &ver ) == 0 ) + std::cerr << " FPGA v" << ver.major << "." << ver.minor << "." << ver.patch; std::cerr << std::endl; diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc index 5196044..e0f84b0 100644 --- a/lib/bladerf/bladerf_source_c.cc +++ b/lib/bladerf/bladerf_source_c.cc @@ -132,12 +132,12 @@ bladerf_source_c::bladerf_source_c (const std::string &args) if ( bladerf_get_serial( _dev, serial ) == 0 ) std::cerr << " SN " << serial; - unsigned int major, minor; - if ( bladerf_get_fw_version( _dev, &major, &minor) == 0 ) - std::cerr << " FW v" << major << "." << minor; + struct bladerf_version ver; + if ( bladerf_fw_version( _dev, &ver ) == 0 ) + std::cerr << " FW v" << ver.major << "." << ver.minor << "." << ver.patch; - if ( bladerf_get_fpga_version( _dev, &major, &minor) == 0 ) - std::cerr << " FPGA v" << major << "." << minor; + if ( bladerf_fpga_version( _dev, &ver ) == 0 ) + std::cerr << " FPGA v" << ver.major << "." << ver.minor << "." << ver.patch; std::cerr << std::endl;