- osmocom-sdr - lists.osmocom.org

[PATCH] Remove disabled OsmoSDR and MiriSDR code

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> OsmoSDR and MiriSDR support was disabled in v0.2.1 because the hardware is rare and obsolete. I think it would be useful to completely remove the associated code, since this will reduce the future maintenance burden for gr-osmosdr. --- CMakeLists.txt | 2 - README | 2 - cmake/Modules/FindLibMiriSDR.cmake | 27 -- cmake/Modules/FindLibOsmoSDR.cmake | 27 -- grc/gen_osmosdr_blocks.py | 4 - lib/CMakeLists.txt | 16 - lib/config.h.in | 2 - lib/device.cc | 16 - lib/miri/CMakeLists.txt | 36 -- lib/miri/miri_source_c.cc | 451 ------------------------ lib/miri/miri_source_c.h | 135 -------- lib/osmosdr/CMakeLists.txt | 36 -- lib/osmosdr/osmosdr_src_c.cc | 533 ----------------------------- lib/osmosdr/osmosdr_src_c.h | 140 -------- lib/source_impl.cc | 36 -- 15 files changed, 1463 deletions(-) delete mode 100644 cmake/Modules/FindLibMiriSDR.cmake delete mode 100644 cmake/Modules/FindLibOsmoSDR.cmake delete mode 100644 lib/miri/CMakeLists.txt delete mode 100644 lib/miri/miri_source_c.cc delete mode 100644 lib/miri/miri_source_c.h delete mode 100644 lib/osmosdr/CMakeLists.txt delete mode 100644 lib/osmosdr/osmosdr_src_c.cc delete mode 100644 lib/osmosdr/osmosdr_src_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 9679f88c64..b6e2ed14f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,9 +165,7 @@ message (STATUS " Found Volk: ${Volk_FOUND}") # Hardware drivers #################### -#find_package(LibOsmoSDR) find_package(LibRTLSDR) -#find_package(LibMiriSDR) if(ENABLE_NONFREE) find_package(LibSDRplay) endif(ENABLE_NONFREE) diff --git a/README b/README index 67fa475e74..842c154b90 100644 --- a/README +++ b/README @@ -3,10 +3,8 @@ as well supports: * FUNcube Dongle through libgnuradio-fcd * FUNcube Dongle Pro+ through gr-fcdproplus - * sysmocom OsmoSDR Devices through libosmosdr * RTL2832U based DVB-T dongles through librtlsdr * RTL-TCP spectrum server (see librtlsdr project) - * MSi2500 based DVB-T dongles through libmirisdr * SDRplay RSP through SDRplay API library * gnuradio .cfile input through libgnuradio-blocks * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option) diff --git a/cmake/Modules/FindLibMiriSDR.cmake b/cmake/Modules/FindLibMiriSDR.cmake deleted file mode 100644 index cdb673ff95..0000000000 --- a/cmake/Modules/FindLibMiriSDR.cmake +++ /dev/null @@ -1,27 +0,0 @@ -if(NOT LIBMIRISDR_FOUND) - pkg_check_modules (LIBMIRISDR_PKG libmirisdr) - find_path(LIBMIRISDR_INCLUDE_DIRS NAMES mirisdr.h - PATHS - ${LIBMIRISDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include - ) - - find_library(LIBMIRISDR_LIBRARIES NAMES mirisdr - PATHS - ${LIBMIRISDR_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - -if(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES) - set(LIBMIRISDR_FOUND TRUE CACHE INTERNAL "libmirisdr found") - message(STATUS "Found libmirisdr: ${LIBMIRISDR_INCLUDE_DIRS}, ${LIBMIRISDR_LIBRARIES}") -else(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES) - set(LIBMIRISDR_FOUND FALSE CACHE INTERNAL "libmirisdr found") - message(STATUS "libmirisdr not found.") -endif(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES) - -mark_as_advanced(LIBMIRISDR_LIBRARIES LIBMIRISDR_INCLUDE_DIRS) - -endif(NOT LIBMIRISDR_FOUND) diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake deleted file mode 100644 index a772e680ea..0000000000 --- a/cmake/Modules/FindLibOsmoSDR.cmake +++ /dev/null @@ -1,27 +0,0 @@ -if(NOT LIBOSMOSDR_FOUND) - pkg_check_modules (LIBOSMOSDR_PKG libosmosdr) - find_path(LIBOSMOSDR_INCLUDE_DIRS NAMES osmosdr.h - PATHS - ${LIBOSMOSDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include - ) - - find_library(LIBOSMOSDR_LIBRARIES NAMES osmosdr - PATHS - ${LIBOSMOSDR_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - -if(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES) - set(LIBOSMOSDR_FOUND TRUE CACHE INTERNAL "libosmosdr found") - message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIRS}, ${LIBOSMOSDR_LIBRARIES}") -else(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES) - set(LIBOSMOSDR_FOUND FALSE CACHE INTERNAL "libosmosdr found") - message(STATUS "libosmosdr not found.") -endif(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES) - -mark_as_advanced(LIBOSMOSDR_LIBRARIES LIBOSMOSDR_INCLUDE_DIRS) - -endif(NOT LIBOSMOSDR_FOUND) diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index bfe81f23c4..45bac1f984 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -157,10 +157,8 @@ documentation: |- While primarily being developed for the OsmoSDR hardware, this block as well supports: % if sourk == 'source': - * sysmocom OsmoSDR Devices through libosmosdr * RTL2832U based DVB-T dongles through librtlsdr * RTL-TCP spectrum server (see librtlsdr project) - * MSi2500 based DVB-T dongles through libmirisdr * SDRplay RSP devices through SDRplay library * gnuradio .cfile input through libgnuradio-blocks * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option) @@ -192,13 +190,11 @@ documentation: |- Lines ending with ... mean it's possible to bind devices together by specifying multiple device arguments separated with a space. % if sourk == 'source': - miri=0[,buffers=32] ... rtl=serial_number ... rtl=0[,rtl_xtal=28.8e6][,tuner_xtal=28.8e6] ... rtl=1[,buffers=32][,buflen=N*512] ... rtl=2[,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ... rtl_tcp=127.0.0.1:1234[,psize=16384][,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ... - osmosdr=0[,buffers=32][,buflen=N*512] ... file='/path/to/your file',rate=1e6[,freq=100e6][,repeat=true][,throttle=true] ... netsdr=127.0.0.1[:50000][,nchan=2] sdr-ip=127.0.0.1[:50000] diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f699c0d7e5..bf974d8caf 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -135,14 +135,6 @@ if(ENABLE_IQBALANCE) APPEND_LIB_LIST( gnuradio::gnuradio-iqbalance) endif(ENABLE_IQBALANCE) -######################################################################## -# Setup OsmoSDR component -######################################################################## -#GR_REGISTER_COMPONENT("sysmocom OsmoSDR" ENABLE_OSMOSDR LIBOSMOSDR_FOUND) -#if(ENABLE_OSMOSDR) -# add_subdirectory(osmosdr) -#endif(ENABLE_OSMOSDR) - ######################################################################## # Setup FCD component ######################################################################## @@ -183,14 +175,6 @@ if(ENABLE_UHD) add_subdirectory(uhd) endif(ENABLE_UHD) -######################################################################## -# Setup MiriSDR component -######################################################################## -#GR_REGISTER_COMPONENT("Osmocom MiriSDR" ENABLE_MIRI LIBMIRISDR_FOUND) -#if(ENABLE_MIRI) -# add_subdirectory(miri) -#endif(ENABLE_MIRI) - ######################################################################## # Setup SDRplay component ######################################################################## diff --git a/lib/config.h.in b/lib/config.h.in index 5303d7dbbc..cce87e6b3b 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -4,13 +4,11 @@ #define GR_OSMOSDR_VERSION "@VERSION@" #define GR_OSMOSDR_LIBVER "@LIBVER@" -#cmakedefine ENABLE_OSMOSDR #cmakedefine ENABLE_FCD #cmakedefine ENABLE_FILE #cmakedefine ENABLE_RTL #cmakedefine ENABLE_RTL_TCP #cmakedefine ENABLE_UHD -#cmakedefine ENABLE_MIRI #cmakedefine ENABLE_SDRPLAY #cmakedefine ENABLE_HACKRF #cmakedefine ENABLE_BLADERF diff --git a/lib/device.cc b/lib/device.cc index 015383dbd4..91f5aefdfd 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -30,10 +30,6 @@ #include "config.h" #endif -#ifdef ENABLE_OSMOSDR -#include <osmosdr_src_c.h> -#endif - #ifdef ENABLE_FCD #include <fcd_source_c.h> #endif @@ -54,10 +50,6 @@ #include <uhd_source_c.h> #endif -#ifdef ENABLE_MIRI -#include <miri_source_c.h> -#endif - #ifdef ENABLE_SDRPLAY #include <sdrplay_source_c.h> #endif @@ -150,10 +142,6 @@ devices_t device::find(const device_t &hint) devices_t devices; -#ifdef ENABLE_OSMOSDR - BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() ) - devices.push_back( device_t(dev) ); -#endif #ifdef ENABLE_FCD BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() ) devices.push_back( device_t(dev) ); @@ -166,10 +154,6 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif -#ifdef ENABLE_MIRI - BOOST_FOREACH( std::string dev, miri_source_c::get_devices() ) - devices.push_back( device_t(dev) ); -#endif #ifdef ENABLE_SDRPLAY BOOST_FOREACH( std::string dev, sdrplay_source_c::get_devices() ) devices.push_back( device_t(dev) ); diff --git a/lib/miri/CMakeLists.txt b/lib/miri/CMakeLists.txt deleted file mode 100644 index 672fc903ed..0000000000 --- a/lib/miri/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2012 Free Software Foundation, Inc. -# -# This file is part of gr-osmosdr -# -# gr-osmosdr is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# gr-osmosdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with gr-osmosdr; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# This file included, use CMake directory variables -######################################################################## - -target_include_directories(gnuradio-osmosdr PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${LIBMIRISDR_INCLUDE_DIRS} -) - -APPEND_LIB_LIST( - ${LIBMIRISDR_LIBRARIES} -) - -list(APPEND gr_osmosdr_srcs - ${CMAKE_CURRENT_SOURCE_DIR}/miri_source_c.cc -) -set(gr_osmosdr_srcs ${gr_osmosdr_srcs} PARENT_SCOPE) diff --git a/lib/miri/miri_source_c.cc b/lib/miri/miri_source_c.cc deleted file mode 100644 index c1b9428fbb..0000000000 --- a/lib/miri/miri_source_c.cc +++ /dev/null @@ -1,451 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> - * Copyright 2012 Steve Markgraf <steve(a)steve-m.de> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -/* - * config.h is generated by configure. It contains the results - * of probing for features, options etc. It should be the first - * file included in your .cc file. - */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "miri_source_c.h" -#include <gnuradio/io_signature.h> - -#include <boost/assign.hpp> -#include <boost/format.hpp> - -#include <stdexcept> -#include <iostream> -#include <stdio.h> - -#include <mirisdr.h> - -#include "arg_helpers.h" - -using namespace boost::assign; - -#define BUF_SIZE 2304 * 8 * 2 -#define BUF_NUM 15 -#define BUF_SKIP 1 // buffers to skip due to garbage - -#define BYTES_PER_SAMPLE 4 // mirisdr device delivers 16 bit signed IQ data - // containing 12 bits of information - -/* - * Create a new instance of miri_source_c and return - * a boost shared_ptr. This is effectively the public constructor. - */ -miri_source_c_sptr -make_miri_source_c (const std::string &args) -{ - return gnuradio::get_initial_sptr(new miri_source_c (args)); -} - -/* - * Specify constraints on number of input and output streams. - * This info is used to construct the input and output signatures - * (2nd & 3rd args to gr::block's constructor). The input and - * output signatures are used by the runtime system to - * check that a valid number and type of inputs and outputs - * are connected to this block. In this case, we accept - * only 0 input and 1 output. - */ -static const int MIN_IN = 0; // mininum number of input streams -static const int MAX_IN = 0; // maximum number of input streams -static const int MIN_OUT = 1; // minimum number of output streams -static const int MAX_OUT = 1; // maximum number of output streams - -/* - * The private constructor - */ -miri_source_c::miri_source_c (const std::string &args) - : gr::sync_block ("miri_source_c", - gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), - gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), - _running(true), - _auto_gain(false), - _skipped(0) -{ - int ret; - unsigned int dev_index = 0; - - dict_t dict = params_to_dict(args); - - if (dict.count("miri")) - dev_index = boost::lexical_cast< unsigned int >( dict["miri"] ); - - _buf_num = _buf_head = _buf_used = _buf_offset = 0; - _samp_avail = BUF_SIZE / BYTES_PER_SAMPLE; - - if (dict.count("buffers")) - _buf_num = boost::lexical_cast< unsigned int >( dict["buffers"] ); - - if (0 == _buf_num) - _buf_num = BUF_NUM; - - if ( BUF_NUM != _buf_num ) { - std::cerr << "Using " << _buf_num << " buffers of size " << BUF_SIZE << "." - << std::endl; - } - - if ( dev_index >= mirisdr_get_device_count() ) - throw std::runtime_error("Wrong mirisdr device index given."); - - std::cerr << "Using device #" << dev_index << ": " - << mirisdr_get_device_name(dev_index) - << std::endl; - - _dev = NULL; - ret = mirisdr_open( &_dev, dev_index ); - if (ret < 0) - throw std::runtime_error("Failed to open mirisdr device."); -#if 0 - ret = mirisdr_set_sample_rate( _dev, 500000 ); - if (ret < 0) - throw std::runtime_error("Failed to set default samplerate."); - - ret = mirisdr_set_tuner_gain_mode(_dev, int(!_auto_gain)); - if (ret < 0) - throw std::runtime_error("Failed to enable manual gain mode."); -#endif - ret = mirisdr_reset_buffer( _dev ); - if (ret < 0) - throw std::runtime_error("Failed to reset usb buffers."); - - _buf = (unsigned short **) malloc(_buf_num * sizeof(unsigned short *)); - _buf_lens = (unsigned int *) malloc(_buf_num * sizeof(unsigned int)); - - if (_buf && _buf_lens) { - for(unsigned int i = 0; i < _buf_num; ++i) - _buf[i] = (unsigned short *) malloc(BUF_SIZE); - } - - _thread = gr::thread::thread(_mirisdr_wait, this); -} - -/* - * Our virtual destructor. - */ -miri_source_c::~miri_source_c () -{ - if (_dev) { - _running = false; - mirisdr_cancel_async( _dev ); - _thread.join(); - mirisdr_close( _dev ); - _dev = NULL; - } - - if (_buf) { - for(unsigned int i = 0; i < _buf_num; ++i) { - free(_buf[i]); - } - - free(_buf); - _buf = NULL; - free(_buf_lens); - _buf_lens = NULL; - } -} - -void miri_source_c::_mirisdr_callback(unsigned char *buf, uint32_t len, void *ctx) -{ - miri_source_c *obj = (miri_source_c *)ctx; - obj->mirisdr_callback(buf, len); -} - -void miri_source_c::mirisdr_callback(unsigned char *buf, uint32_t len) -{ - if (_skipped < BUF_SKIP) { - _skipped++; - return; - } - - { - std::lock_guard<std::mutex> lock( _buf_mutex ); - - if (len > BUF_SIZE) - throw std::runtime_error("Buffer too small."); - - int buf_tail = (_buf_head + _buf_used) % _buf_num; - memcpy(_buf[buf_tail], buf, len); - _buf_lens[buf_tail] = len; - - if (_buf_used == _buf_num) { - std::cerr << "O" << std::flush; - _buf_head = (_buf_head + 1) % _buf_num; - } else { - _buf_used++; - } - } - - _buf_cond.notify_one(); -} - -void miri_source_c::_mirisdr_wait(miri_source_c *obj) -{ - obj->mirisdr_wait(); -} - -void miri_source_c::mirisdr_wait() -{ - int ret = mirisdr_read_async( _dev, _mirisdr_callback, (void *)this, _buf_num, BUF_SIZE ); - - _running = false; - - if ( ret != 0 ) - std::cerr << "mirisdr_read_async returned with " << ret << std::endl; - - _buf_cond.notify_one(); -} - -int miri_source_c::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items ) -{ - gr_complex *out = (gr_complex *)output_items[0]; - - { - std::unique_lock<std::mutex> lock( _buf_mutex ); - - while (_buf_used < 3 && _running) // collect at least 3 buffers - _buf_cond.wait( lock ); - } - - if (!_running) - return WORK_DONE; - - short *buf = (short *)_buf[_buf_head] + _buf_offset; - - if (noutput_items <= _samp_avail) { - for (int i = 0; i < noutput_items; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/4096.0f), - float(*(buf + i * 2 + 1)) * (1.0f/4096.0f) ); - - _buf_offset += noutput_items * 2; - _samp_avail -= noutput_items; - } else { - for (int i = 0; i < _samp_avail; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/4096.0f), - float(*(buf + i * 2 + 1)) * (1.0f/4096.0f) ); - - { - std::lock_guard<std::mutex> lock( _buf_mutex ); - - _buf_head = (_buf_head + 1) % _buf_num; - _buf_used--; - } - - buf = (short *)_buf[_buf_head]; - - int remaining = noutput_items - _samp_avail; - - for (int i = 0; i < remaining; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/4096.0f), - float(*(buf + i * 2 + 1)) * (1.0f/4096.0f) ); - - _buf_offset = remaining * 2; - _samp_avail = (_buf_lens[_buf_head] / BYTES_PER_SAMPLE) - remaining; - } - - return noutput_items; -} - -std::vector<std::string> miri_source_c::get_devices() -{ - std::vector<std::string> devices; - - for (unsigned int i = 0; i < mirisdr_get_device_count(); i++) { - std::string args = "miri=" + boost::lexical_cast< std::string >( i ); - args += ",label='" + std::string(mirisdr_get_device_name( i )) + "'"; - devices.push_back( args ); - } - - return devices; -} - -size_t miri_source_c::get_num_channels() -{ - return 1; -} - -osmosdr::meta_range_t miri_source_c::get_sample_rates() -{ - osmosdr::meta_range_t range; - - range += osmosdr::range_t( 8000000 ); // known to work - - return range; -} - -double miri_source_c::set_sample_rate(double rate) -{ - if (_dev) { - mirisdr_set_sample_rate( _dev, (uint32_t)rate ); - } - - return get_sample_rate(); -} - -double miri_source_c::get_sample_rate() -{ - if (_dev) - return (double)mirisdr_get_sample_rate( _dev ); - - return 0; -} - -osmosdr::freq_range_t miri_source_c::get_freq_range( size_t chan ) -{ - osmosdr::freq_range_t range; - - range += osmosdr::range_t( 150e3, 30e6 ); /* LW/MW/SW (150 kHz - 30 MHz) */ - range += osmosdr::range_t( 64e6, 108e6 ); /* VHF Band II (64 - 108 MHz) */ - range += osmosdr::range_t( 162e6, 240e6 ); /* Band III (162 - 240 MHz) */ - range += osmosdr::range_t( 470e6, 960e6 ); /* Band IV/V (470 - 960 MHz) */ - range += osmosdr::range_t( 1450e6, 1675e6 ); /* L-Band (1450 - 1675 MHz) */ - - return range; -} - -double miri_source_c::set_center_freq( double freq, size_t chan ) -{ - if (_dev) - mirisdr_set_center_freq( _dev, (uint32_t)freq ); - - return get_center_freq( chan ); -} - -double miri_source_c::get_center_freq( size_t chan ) -{ - if (_dev) - return (double)mirisdr_get_center_freq( _dev ); - - return 0; -} - -double miri_source_c::set_freq_corr( double ppm, size_t chan ) -{ - return get_freq_corr( chan ); -} - -double miri_source_c::get_freq_corr( size_t chan ) -{ - return 0; -} - -std::vector<std::string> miri_source_c::get_gain_names( size_t chan ) -{ - std::vector< std::string > gains; - - gains += "LNA"; - - return gains; -} - -osmosdr::gain_range_t miri_source_c::get_gain_range( size_t chan ) -{ - osmosdr::gain_range_t range; - - if (_dev) { - int count = mirisdr_get_tuner_gains(_dev, NULL); - if (count > 0) { - int* gains = new int[ count ]; - count = mirisdr_get_tuner_gains(_dev, gains); - for (int i = 0; i < count; i++) - range += osmosdr::range_t( gains[i] / 10.0 ); - delete[] gains; - } - } - - return range; -} - -osmosdr::gain_range_t miri_source_c::get_gain_range( const std::string & name, size_t chan ) -{ - return get_gain_range( chan ); -} - -bool miri_source_c::set_gain_mode( bool automatic, size_t chan ) -{ - if (_dev) { - if (!mirisdr_set_tuner_gain_mode(_dev, int(!automatic))) { - _auto_gain = automatic; - } - } - - return get_gain_mode(chan); -} - -bool miri_source_c::get_gain_mode( size_t chan ) -{ - return _auto_gain; -} - -double miri_source_c::set_gain( double gain, size_t chan ) -{ - osmosdr::gain_range_t rf_gains = miri_source_c::get_gain_range( chan ); - - if (_dev) { - mirisdr_set_tuner_gain( _dev, int(rf_gains.clip(gain) * 10.0) ); - } - - return get_gain( chan ); -} - -double miri_source_c::set_gain( double gain, const std::string & name, size_t chan) -{ - return set_gain( gain, chan ); -} - -double miri_source_c::get_gain( size_t chan ) -{ - if ( _dev ) - return ((double)mirisdr_get_tuner_gain( _dev )) / 10.0; - - return 0; -} - -double miri_source_c::get_gain( const std::string & name, size_t chan ) -{ - return get_gain( chan ); -} - -std::vector< std::string > miri_source_c::get_antennas( size_t chan ) -{ - std::vector< std::string > antennas; - - antennas += get_antenna( chan ); - - return antennas; -} - -std::string miri_source_c::set_antenna( const std::string & antenna, size_t chan ) -{ - return get_antenna( chan ); -} - -std::string miri_source_c::get_antenna( size_t chan ) -{ - return "RX"; -} diff --git a/lib/miri/miri_source_c.h b/lib/miri/miri_source_c.h deleted file mode 100644 index 1ea906f27a..0000000000 --- a/lib/miri/miri_source_c.h +++ /dev/null @@ -1,135 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ -#ifndef INCLUDED_MIRI_SOURCE_C_H -#define INCLUDED_MIRI_SOURCE_C_H - -#include <gnuradio/sync_block.h> - -#include <gnuradio/thread/thread.h> - -#include <mutex> -#include <condition_variable> - -#include "source_iface.h" - -class miri_source_c; -typedef struct mirisdr_dev mirisdr_dev_t; - -/* - * We use boost::shared_ptr's instead of raw pointers for all access - * to gr::blocks (and many other data structures). The shared_ptr gets - * us transparent reference counting, which greatly simplifies storage - * management issues. This is especially helpful in our hybrid - * C++ / Python system. - * - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm - * - * As a convention, the _sptr suffix indicates a boost::shared_ptr - */ -typedef boost::shared_ptr<miri_source_c> miri_source_c_sptr; - -/*! - * \brief Return a shared_ptr to a new instance of miri_source_c. - * - * To avoid accidental use of raw pointers, miri_source_c's - * constructor is private. make_miri_source_c is the public - * interface for creating new instances. - */ -miri_source_c_sptr make_miri_source_c (const std::string & args = ""); - -/*! - * \brief Provides a stream of complex samples. - * \ingroup block - */ -class miri_source_c : - public gr::sync_block, - public source_iface -{ -private: - // The friend declaration allows make_miri_source_c to - // access the private constructor. - - friend miri_source_c_sptr make_miri_source_c (const std::string & args); - - /*! - * \brief Provides a stream of complex samples. - */ - miri_source_c (const std::string & args); // private constructor - - public: - ~miri_source_c (); // public destructor - - int work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items ); - - static std::vector< std::string > get_devices(); - - size_t get_num_channels( void ); - - osmosdr::meta_range_t get_sample_rates( void ); - double set_sample_rate( double rate ); - double get_sample_rate( void ); - - osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); - double set_center_freq( double freq, size_t chan = 0 ); - double get_center_freq( size_t chan = 0 ); - double set_freq_corr( double ppm, size_t chan = 0 ); - double get_freq_corr( size_t chan = 0 ); - - std::vector<std::string> get_gain_names( size_t chan = 0 ); - osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); - osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); - bool set_gain_mode( bool automatic, size_t chan = 0 ); - bool get_gain_mode( size_t chan = 0 ); - double set_gain( double gain, size_t chan = 0 ); - double set_gain( double gain, const std::string & name, size_t chan = 0 ); - double get_gain( size_t chan = 0 ); - double get_gain( const std::string & name, size_t chan = 0 ); - - std::vector< std::string > get_antennas( size_t chan = 0 ); - std::string set_antenna( const std::string & antenna, size_t chan = 0 ); - std::string get_antenna( size_t chan = 0 ); - -private: - static void _mirisdr_callback(unsigned char *buf, uint32_t len, void *ctx); - void mirisdr_callback(unsigned char *buf, uint32_t len); - static void _mirisdr_wait(miri_source_c *obj); - void mirisdr_wait(); - - mirisdr_dev_t *_dev; - gr::thread::thread _thread; - unsigned short **_buf; - unsigned int *_buf_lens; - unsigned int _buf_num; - unsigned int _buf_head; - unsigned int _buf_used; - std::mutex _buf_mutex; - std::condition_variable _buf_cond; - bool _running; - - unsigned int _buf_offset; - int _samp_avail; - - bool _auto_gain; - unsigned int _skipped; -}; - -#endif /* INCLUDED_MIRI_SOURCE_C_H */ diff --git a/lib/osmosdr/CMakeLists.txt b/lib/osmosdr/CMakeLists.txt deleted file mode 100644 index eb540e106f..0000000000 --- a/lib/osmosdr/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2012 Free Software Foundation, Inc. -# -# This file is part of gr-osmosdr -# -# gr-osmosdr is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# gr-osmosdr is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with gr-osmosdr; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -######################################################################## -# This file included, use CMake directory variables -######################################################################## - -target_include_directories(gnuradio-osmosdr PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${LIBOSMOSDR_INCLUDE_DIRS} -) - -APPEND_LIB_LIST( - ${LIBOSMOSDR_LIBRARIES} -) - -list(APPEND gr_osmosdr_srcs - ${CMAKE_CURRENT_SOURCE_DIR}/osmosdr_src_c.cc -) -set(gr_osmosdr_srcs ${gr_osmosdr_srcs} PARENT_SCOPE) diff --git a/lib/osmosdr/osmosdr_src_c.cc b/lib/osmosdr/osmosdr_src_c.cc deleted file mode 100644 index e4f8b89944..0000000000 --- a/lib/osmosdr/osmosdr_src_c.cc +++ /dev/null @@ -1,533 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -/* - * config.h is generated by configure. It contains the results - * of probing for features, options etc. It should be the first - * file included in your .cc file. - */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "osmosdr_src_c.h" -#include <gnuradio/io_signature.h> - -#include <boost/assign.hpp> -#include <boost/format.hpp> - -#include <stdexcept> -#include <iostream> -#include <stdio.h> - -#include <osmosdr.h> - -#include "arg_helpers.h" - -using namespace boost::assign; - -#define BUF_LEN (16 * 32 * 512) /* must be multiple of 512 */ -#define BUF_NUM 15 -#define BUF_SKIP 1 // buffers to skip due to garbage - -#define BYTES_PER_SAMPLE 4 // osmosdr device delivers 16 bit signed IQ data - -/* - * Create a new instance of osmosdr_src_c and return - * a boost shared_ptr. This is effectively the public constructor. - */ -osmosdr_src_c_sptr -osmosdr_make_src_c (const std::string &args) -{ - return gnuradio::get_initial_sptr(new osmosdr_src_c (args)); -} - -/* - * The private constructor - */ -osmosdr_src_c::osmosdr_src_c (const std::string &args) - : gr::sync_block ("osmosdr_src_c", - gr::io_signature::make(0, 0, sizeof (gr_complex)), - gr::io_signature::make(1, 1, sizeof (gr_complex)) ), - _dev(NULL), - _buf(NULL), - _running(true), - _auto_gain(false), - _if_gain(0), - _skipped(0) -{ - int ret; - unsigned int dev_index = 0; - - dict_t dict = params_to_dict(args); - - if (dict.count("osmosdr")) - dev_index = boost::lexical_cast< unsigned int >( dict["osmosdr"] ); - - _buf_num = _buf_len = _buf_head = _buf_used = _buf_offset = 0; - - if (dict.count("buffers")) - _buf_num = boost::lexical_cast< unsigned int >( dict["buffers"] ); - - if (dict.count("buflen")) - _buf_len = boost::lexical_cast< unsigned int >( dict["buflen"] ); - - if (0 == _buf_num) - _buf_num = BUF_NUM; - - if (0 == _buf_len || _buf_len % 512 != 0) /* len must be multiple of 512 */ - _buf_len = BUF_LEN; - - if ( BUF_NUM != _buf_num || BUF_LEN != _buf_len ) { - std::cerr << "Using " << _buf_num << " buffers of size " << _buf_len << "." - << std::endl; - } - - _samp_avail = _buf_len / BYTES_PER_SAMPLE; - - if ( dev_index >= osmosdr_get_device_count() ) - throw std::runtime_error("Wrong osmosdr device index given."); - - std::cerr << "Using device #" << dev_index << ": " - << osmosdr_get_device_name(dev_index) - << std::endl; - - _dev = NULL; - ret = osmosdr_open( &_dev, dev_index ); - if (ret < 0) - throw std::runtime_error("Failed to open osmosdr device."); - - ret = osmosdr_set_fpga_iq_swap(_dev, 0); - if (ret < 0) - throw std::runtime_error("Failed to disable IQ swapping."); - - ret = osmosdr_set_sample_rate( _dev, 500000 ); - if (ret < 0) - throw std::runtime_error("Failed to set default samplerate."); - - ret = osmosdr_set_tuner_gain_mode(_dev, int(!_auto_gain)); - if (ret < 0) - throw std::runtime_error("Failed to enable manual gain mode."); - - ret = osmosdr_reset_buffer( _dev ); - if (ret < 0) - throw std::runtime_error("Failed to reset usb buffers."); - - set_if_gain( 24 ); /* preset to a reasonable default (non-GRC use case) */ - - _buf = (unsigned short **) malloc(_buf_num * sizeof(unsigned short *)); - - if (_buf) { - for(unsigned int i = 0; i < _buf_num; ++i) - _buf[i] = (unsigned short *) malloc(_buf_len); - } - - _thread = gr::thread::thread(_osmosdr_wait, this); -} - -/* - * Our virtual destructor. - */ -osmosdr_src_c::~osmosdr_src_c () -{ - if (_dev) { - _running = false; - osmosdr_cancel_async( _dev ); - _thread.join(); - osmosdr_close( _dev ); - _dev = NULL; - } - - if (_buf) { - for(unsigned int i = 0; i < _buf_num; ++i) { - free(_buf[i]); - } - - free(_buf); - _buf = NULL; - } -} - -void osmosdr_src_c::_osmosdr_callback(unsigned char *buf, uint32_t len, void *ctx) -{ - osmosdr_src_c *obj = (osmosdr_src_c *)ctx; - obj->osmosdr_callback(buf, len); -} - -void osmosdr_src_c::osmosdr_callback(unsigned char *buf, uint32_t len) -{ - if (_skipped < BUF_SKIP) { - _skipped++; - return; - } - - { - std::lock_guard<std::mutex> lock( _buf_mutex ); - - int buf_tail = (_buf_head + _buf_used) % _buf_num; - memcpy(_buf[buf_tail], buf, len); - - if (_buf_used == _buf_num) { - std::cerr << "O" << std::flush; - _buf_head = (_buf_head + 1) % _buf_num; - } else { - _buf_used++; - } - } - - _buf_cond.notify_one(); -} - -void osmosdr_src_c::_osmosdr_wait(osmosdr_src_c *obj) -{ - obj->osmosdr_wait(); -} - -void osmosdr_src_c::osmosdr_wait() -{ - int ret = osmosdr_read_async( _dev, _osmosdr_callback, (void *)this, _buf_num, _buf_len ); - - _running = false; - - if ( ret != 0 ) - std::cerr << "osmosdr_read_async returned with " << ret << std::endl; - - _buf_cond.notify_one(); -} - -int osmosdr_src_c::work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items ) -{ - gr_complex *out = (gr_complex *)output_items[0]; - - { - std::unique_lock<std::mutex> lock( _buf_mutex ); - - while (_buf_used < 3 && _running) // collect at least 3 buffers - _buf_cond.wait( lock ); - } - - if (!_running) - return WORK_DONE; - - short *buf = (short *)_buf[_buf_head] + _buf_offset; - - if (noutput_items <= _samp_avail) { - for (int i = 0; i < noutput_items; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/32767.5f), - float(*(buf + i * 2 + 1)) * (1.0f/32767.5f) ); - - _buf_offset += noutput_items * 2; - _samp_avail -= noutput_items; - } else { - for (int i = 0; i < _samp_avail; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/32767.5f), - float(*(buf + i * 2 + 1)) * (1.0f/32767.5f) ); - - { - std::lock_guard<std::mutex> lock( _buf_mutex ); - - _buf_head = (_buf_head + 1) % _buf_num; - _buf_used--; - } - - buf = (short *)_buf[_buf_head]; - - int remaining = noutput_items - _samp_avail; - - for (int i = 0; i < remaining; i++) - *out++ = gr_complex( float(*(buf + i * 2 + 0)) * (1.0f/32767.5f), - float(*(buf + i * 2 + 1)) * (1.0f/32767.5f) ); - - _buf_offset = remaining * 2; - _samp_avail = (_buf_len / BYTES_PER_SAMPLE) - remaining; - } - - return noutput_items; -} - -std::vector<std::string> osmosdr_src_c::get_devices() -{ - std::vector< std::string > devices; - char buffer[256]; - - for (unsigned int i = 0; i < osmosdr_get_device_count(); i++) { - std::string args = "osmosdr=" + boost::lexical_cast< std::string >( i ); - - std::string label = std::string(osmosdr_get_device_name( i )); - - memset(buffer, 0, sizeof(buffer)); - osmosdr_get_device_usb_strings( i, NULL, NULL, buffer ); - std::string serial = std::string(buffer); - - if (serial.length()) - label += " " + serial; - - args += ",label='" + label + + "'"; - - devices.push_back( args ); - } - - return devices; -} - -size_t osmosdr_src_c::get_num_channels() -{ - return 1; -} - -osmosdr::meta_range_t osmosdr_src_c::get_sample_rates() -{ - osmosdr::meta_range_t range; - - if (_dev) { - int count = osmosdr_get_sample_rates(_dev, NULL); - if (count > 0) { - uint32_t* rates = new uint32_t[ count ]; - count = osmosdr_get_sample_rates(_dev, rates); - for (int i = 0; i < count; i++) - range += osmosdr::range_t( rates[i] ); - delete[] rates; - } - } - - return range; -} - -double osmosdr_src_c::set_sample_rate(double rate) -{ - if (_dev) { - osmosdr_set_sample_rate( _dev, (uint32_t)rate ); - } - - return get_sample_rate(); -} - -double osmosdr_src_c::get_sample_rate() -{ - if (_dev) - return (double)osmosdr_get_sample_rate( _dev ); - - return 0; -} - -osmosdr::freq_range_t osmosdr_src_c::get_freq_range( size_t chan ) -{ - osmosdr::freq_range_t range; - - /* there is a (temperature dependent) gap between 1100 to 1250 MHz */ - range += osmosdr::range_t( 52e6, 2.2e9 ); - - return range; -} - -double osmosdr_src_c::set_center_freq( double freq, size_t chan ) -{ - if (_dev) - osmosdr_set_center_freq( _dev, (uint32_t)freq ); - - return get_center_freq( chan ); -} - -double osmosdr_src_c::get_center_freq( size_t chan ) -{ - if (_dev) - return (double)osmosdr_get_center_freq( _dev ); - - return 0; -} - -double osmosdr_src_c::set_freq_corr( double ppm, size_t chan ) -{ - return get_freq_corr( chan ); -} - -double osmosdr_src_c::get_freq_corr( size_t chan ) -{ - return 0; -} - -std::vector<std::string> osmosdr_src_c::get_gain_names( size_t chan ) -{ - std::vector< std::string > names; - - names += "LNA"; - names += "IF"; - - return names; -} - -osmosdr::gain_range_t osmosdr_src_c::get_gain_range( size_t chan ) -{ - osmosdr::gain_range_t range; - - if (_dev) { - int count = osmosdr_get_tuner_gains(_dev, NULL); - if (count > 0) { - int* gains = new int[ count ]; - count = osmosdr_get_tuner_gains(_dev, gains); - for (int i = 0; i < count; i++) - range += osmosdr::range_t( gains[i] / 10.0 ); - delete[] gains; - } - } - - return range; -} - -osmosdr::gain_range_t osmosdr_src_c::get_gain_range( const std::string & name, size_t chan ) -{ - if ( "IF" == name ) { - return osmosdr::gain_range_t(3, 56, 1); - } - - return get_gain_range( chan ); -} - -bool osmosdr_src_c::set_gain_mode( bool automatic, size_t chan ) -{ - if (_dev) { - if (!osmosdr_set_tuner_gain_mode(_dev, int(!automatic))) { - _auto_gain = automatic; - } - } - - return get_gain_mode(chan); -} - -bool osmosdr_src_c::get_gain_mode( size_t chan ) -{ - return _auto_gain; -} - -double osmosdr_src_c::set_gain( double gain, size_t chan ) -{ - osmosdr::gain_range_t rf_gains = osmosdr_src_c::get_gain_range( chan ); - - if (_dev) { - osmosdr_set_tuner_gain( _dev, int(rf_gains.clip(gain) * 10.0) ); - } - - return get_gain( chan ); -} - -double osmosdr_src_c::set_gain( double gain, const std::string & name, size_t chan) -{ - if ( "IF" == name ) { - return set_if_gain( gain, chan ); - } - - return set_gain( gain, chan ); -} - -double osmosdr_src_c::get_gain( size_t chan ) -{ - if ( _dev ) - return ((double)osmosdr_get_tuner_gain( _dev )) / 10.0; - - return 0; -} - -double osmosdr_src_c::get_gain( const std::string & name, size_t chan ) -{ - if ( "IF" == name ) { - return _if_gain; - } - - return get_gain( chan ); -} - -double osmosdr_src_c::set_if_gain(double gain, size_t chan) -{ - std::vector< osmosdr::gain_range_t > if_gains; - - if_gains += osmosdr::gain_range_t(-3, 6, 9); - if_gains += osmosdr::gain_range_t(0, 9, 3); - if_gains += osmosdr::gain_range_t(0, 9, 3); - if_gains += osmosdr::gain_range_t(0, 2, 1); - if_gains += osmosdr::gain_range_t(3, 15, 3); - if_gains += osmosdr::gain_range_t(3, 15, 3); - - std::map< int, double > gains; - - /* initialize with min gains */ - for (unsigned int i = 0; i < if_gains.size(); i++) { - gains[ i + 1 ] = if_gains[ i ].start(); - } - - for (int i = if_gains.size() - 1; i >= 0; i--) { - osmosdr::gain_range_t range = if_gains[ i ]; - - double error = gain; - - for( double g = range.start(); g <= range.stop(); g += range.step() ) { - - double sum = 0; - for (int j = 0; j < int(gains.size()); j++) { - if ( i == j ) - sum += g; - else - sum += gains[ j + 1 ]; - } - - double err = abs(gain - sum); - if (err < error) { - error = err; - gains[ i + 1 ] = g; - } - } - } -#if 0 - std::cerr << gain << " => "; double sum = 0; - for (unsigned int i = 0; i < gains.size(); i++) { - sum += gains[ i + 1 ]; - std::cerr << gains[ i + 1 ] << " "; - } - std::cerr << " = " << sum << std::endl; -#endif - if (_dev) { - for (unsigned int stage = 1; stage <= gains.size(); stage++) { - osmosdr_set_tuner_if_gain( _dev, stage, int(gains[ stage ] * 10.0)); - } - } - - _if_gain = gain; - return gain; -} - -std::vector< std::string > osmosdr_src_c::get_antennas( size_t chan ) -{ - std::vector< std::string > antennas; - - antennas += get_antenna( chan ); - - return antennas; -} - -std::string osmosdr_src_c::set_antenna( const std::string & antenna, size_t chan ) -{ - return get_antenna( chan ); -} - -std::string osmosdr_src_c::get_antenna( size_t chan ) -{ - return "RX"; -} diff --git a/lib/osmosdr/osmosdr_src_c.h b/lib/osmosdr/osmosdr_src_c.h deleted file mode 100644 index f8f18ec776..0000000000 --- a/lib/osmosdr/osmosdr_src_c.h +++ /dev/null @@ -1,140 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ -#ifndef INCLUDED_OSMOSDR_SRC_C_H -#define INCLUDED_OSMOSDR_SRC_C_H - -#include <gnuradio/sync_block.h> - -#include <gnuradio/thread/thread.h> - -#include <mutex> -#include <condition_variable> - -#include "source_iface.h" - -class osmosdr_src_c; -typedef struct osmosdr_dev osmosdr_dev_t; - -/* - * We use boost::shared_ptr's instead of raw pointers for all access - * to gr::blocks (and many other data structures). The shared_ptr gets - * us transparent reference counting, which greatly simplifies storage - * management issues. This is especially helpful in our hybrid - * C++ / Python system. - * - * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm - * - * As a convention, the _sptr suffix indicates a boost::shared_ptr - */ -typedef boost::shared_ptr<osmosdr_src_c> osmosdr_src_c_sptr; - -/*! - * \brief Return a shared_ptr to a new instance of osmosdr_src_c. - * - * To avoid accidental use of raw pointers, osmosdr_src_c's - * constructor is private. osmosdr_make_src_c is the public - * interface for creating new instances. - */ -osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args = ""); - -/*! - * \brief Provides a stream of complex samples. - * \ingroup block - * - * \sa sink for a version that subclasses gr::hier_block2. - */ -class osmosdr_src_c : - public gr::sync_block, - public source_iface -{ -private: - // The friend declaration allows osmosdr_make_src_c to - // access the private constructor. - - friend osmosdr_src_c_sptr osmosdr_make_src_c (const std::string & args); - - /*! - * \brief Provides a stream of complex samples. - */ - osmosdr_src_c (const std::string & args); // private constructor - - public: - ~osmosdr_src_c (); // public destructor - - int work( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items ); - - static std::vector< std::string > get_devices(); - - size_t get_num_channels( void ); - - osmosdr::meta_range_t get_sample_rates( void ); - double set_sample_rate( double rate ); - double get_sample_rate( void ); - - osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); - double set_center_freq( double freq, size_t chan = 0 ); - double get_center_freq( size_t chan = 0 ); - double set_freq_corr( double ppm, size_t chan = 0 ); - double get_freq_corr( size_t chan = 0 ); - - std::vector<std::string> get_gain_names( size_t chan = 0 ); - osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); - osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); - bool set_gain_mode( bool automatic, size_t chan = 0 ); - bool get_gain_mode( size_t chan = 0 ); - double set_gain( double gain, size_t chan = 0 ); - double set_gain( double gain, const std::string & name, size_t chan = 0 ); - double get_gain( size_t chan = 0 ); - double get_gain( const std::string & name, size_t chan = 0 ); - - double set_if_gain( double gain, size_t chan = 0 ); - - std::vector< std::string > get_antennas( size_t chan = 0 ); - std::string set_antenna( const std::string & antenna, size_t chan = 0 ); - std::string get_antenna( size_t chan = 0 ); - -private: - static void _osmosdr_callback(unsigned char *buf, uint32_t len, void *ctx); - void osmosdr_callback(unsigned char *buf, uint32_t len); - static void _osmosdr_wait(osmosdr_src_c *obj); - void osmosdr_wait(); - - osmosdr_dev_t *_dev; - gr::thread::thread _thread; - unsigned short **_buf; - unsigned int _buf_num; - unsigned int _buf_len; - unsigned int _buf_head; - unsigned int _buf_used; - std::mutex _buf_mutex; - std::condition_variable _buf_cond; - bool _running; - - unsigned int _buf_offset; - int _samp_avail; - - bool _auto_gain; - double _if_gain; - unsigned int _skipped; -}; - -#endif /* INCLUDED_OSMOSDR_SRC_C_H */ diff --git a/lib/source_impl.cc b/lib/source_impl.cc index f1426e0e0b..d95b414345 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -32,10 +32,6 @@ #include <gnuradio/blocks/throttle.h> #include <gnuradio/constants.h> -#ifdef ENABLE_OSMOSDR -#include <osmosdr_src_c.h> -#endif - #ifdef ENABLE_FCD #include <fcd_source_c.h> #endif @@ -56,10 +52,6 @@ #include <uhd_source_c.h> #endif -#ifdef ENABLE_MIRI -#include <miri_source_c.h> -#endif - #ifdef ENABLE_SDRPLAY #include <sdrplay_source_c.h> #endif @@ -128,9 +120,6 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FILE dev_types.push_back("file"); #endif -#ifdef ENABLE_OSMOSDR - dev_types.push_back("osmosdr"); -#endif #ifdef ENABLE_FCD dev_types.push_back("fcd"); #endif @@ -143,9 +132,6 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_UHD dev_types.push_back("uhd"); #endif -#ifdef ENABLE_MIRI - dev_types.push_back("miri"); -#endif #ifdef ENABLE_SDRPLAY dev_types.push_back("sdrplay"); #endif @@ -200,10 +186,6 @@ source_impl::source_impl( const std::string &args ) if ( ! device_specified ) { std::vector< std::string > dev_list; -#ifdef ENABLE_OSMOSDR - BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() ) - dev_list.push_back( dev ); -#endif #ifdef ENABLE_FCD BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() ) dev_list.push_back( dev ); @@ -216,10 +198,6 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() ) dev_list.push_back( dev ); #endif -#ifdef ENABLE_MIRI - BOOST_FOREACH( std::string dev, miri_source_c::get_devices() ) - dev_list.push_back( dev ); -#endif #ifdef ENABLE_SDRPLAY BOOST_FOREACH( std::string dev, sdrplay_source_c::get_devices() ) dev_list.push_back( dev ); @@ -278,13 +256,6 @@ source_impl::source_impl( const std::string &args ) source_iface *iface = NULL; gr::basic_block_sptr block; -#ifdef ENABLE_OSMOSDR - if ( dict.count("osmosdr") ) { - osmosdr_src_c_sptr src = osmosdr_make_src_c( arg ); - block = src; iface = src.get(); - } -#endif - #ifdef ENABLE_FCD if ( dict.count("fcd") ) { fcd_source_c_sptr src = make_fcd_source_c( arg ); @@ -320,13 +291,6 @@ source_impl::source_impl( const std::string &args ) } #endif -#ifdef ENABLE_MIRI - if ( dict.count("miri") ) { - miri_source_c_sptr src = make_miri_source_c( arg ); - block = src; iface = src.get(); - } -#endif - #ifdef ENABLE_SDRPLAY if ( dict.count("sdrplay") ) { sdrplay_source_c_sptr src = make_sdrplay_source_c( arg ); -- 2.25.1

3 years, 6 months

1
0
0 0

[PATCH] rfspace: Remove broken asio code

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Asio sockets were replaced with native BSD sockets in e1b699fda04b114c8973e4cbef929781d2312ba5, and the old code was placed behind #ifdef USE_ASIO. Subsequent commits soon broke the asio code. Since it's been broken for a long time, I doubt anyone is using it, so it makes sense to remove it. --- lib/rfspace/rfspace_source_c.cc | 146 -------------------------------- lib/rfspace/rfspace_source_c.h | 16 ---- 2 files changed, 162 deletions(-) diff --git a/lib/rfspace/rfspace_source_c.cc b/lib/rfspace/rfspace_source_c.cc index 121dcde032..6bd741252d 100644 --- a/lib/rfspace/rfspace_source_c.cc +++ b/lib/rfspace/rfspace_source_c.cc @@ -27,7 +27,6 @@ #include "config.h" #endif -#ifndef USE_ASIO #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> @@ -35,7 +34,6 @@ #include <netinet/udp.h> #include <arpa/inet.h> #include <netdb.h> -#endif #include <fcntl.h> #include <unistd.h> @@ -54,9 +52,6 @@ #include <boost/format.hpp> #include <boost/lexical_cast.hpp> #include <boost/algorithm/string.hpp> -#ifdef USE_ASIO -#include <boost/asio/deadline_timer.hpp> -#endif #include <gnuradio/io_signature.h> @@ -64,9 +59,6 @@ #include "rfspace_source_c.h" using namespace boost::assign; -#ifdef USE_ASIO -using boost::asio::deadline_timer; -#endif #define DEFAULT_HOST "127.0.0.1" /* We assume a running "siqs" from CuteSDR project */ #define DEFAULT_PORT 50000 @@ -102,15 +94,8 @@ rfspace_source_c::rfspace_source_c (const std::string &args) gr::io_signature::make (MIN_IN, MAX_IN, sizeof (gr_complex)), gr::io_signature::make (MIN_OUT, MAX_OUT, sizeof (gr_complex))), _radio(RADIO_UNKNOWN), -#ifdef USE_ASIO - _io_service(), - _resolver(_io_service), - _t(_io_service), - _u(_io_service), -#else _tcp(-1), _udp(-1), -#endif _usb(-1), _running(false), _keep_running(false), @@ -239,30 +224,6 @@ rfspace_source_c::rfspace_source_c (const std::string &args) /* SDR-IP 4.4.4 Data Output UDP IP and Port Address */ /* NETSDR 4.4.3 Data Output UDP IP and Port Address */ -#ifdef USE_ASIO - - tcp::resolver::query query(tcp::v4(), host.c_str(), port_str.c_str()); - tcp::resolver::iterator iterator = _resolver.resolve(query); - - boost::system::error_code ec; - - boost::asio::connect(_t, iterator, ec); - if ( ec ) - throw std::runtime_error(ec.message() + " (" + host + ":" + port_str + ")"); - - _u.open(udp::v4(), ec); - if ( ec ) - throw std::runtime_error(ec.message()); - - _u.bind(udp::endpoint(udp::v4(), DEFAULT_PORT), ec); - if ( ec ) - throw std::runtime_error(ec.message()); - - _u.set_option(udp::socket::reuse_address(true)); - _t.set_option(udp::socket::reuse_address(true)); - -#else - if ( (_tcp = socket(AF_INET, SOCK_STREAM, 0) ) < 0) { throw std::runtime_error("Could not create TCP socket"); @@ -339,8 +300,6 @@ rfspace_source_c::rfspace_source_c (const std::string &args) throw std::runtime_error("Bind of UDP socket failed: " + std::string(strerror(errno))); } -#endif - } /* Wait 10 ms before sending queries to device (required for networked radios). */ @@ -506,10 +465,8 @@ rfspace_source_c::rfspace_source_c (const std::string &args) */ rfspace_source_c::~rfspace_source_c () { -#ifndef USE_ASIO close(_tcp); close(_udp); -#endif if ( RFSPACE_SDR_IQ == _radio ) { @@ -600,11 +557,6 @@ bool rfspace_source_c::transaction( const unsigned char *cmd, size_t size, { std::lock_guard<std::mutex> lock(_tcp_lock); -#ifdef USE_ASIO - _t.write_some( boost::asio::buffer(cmd, size) ); - - rx_bytes = _t.read_some( boost::asio::buffer(data, sizeof(data)) ); -#else if ( write(_tcp, cmd, size) != (int)size ) return false; @@ -624,7 +576,6 @@ bool rfspace_source_c::transaction( const unsigned char *cmd, size_t size, return false; rx_bytes = 2 + length; /* header + payload */ -#endif } response.resize( rx_bytes ); @@ -852,10 +803,6 @@ int rfspace_source_c::work( int noutput_items, return noutput_items; } -#ifdef USE_ASIO - udp::endpoint ep; - size_t rx_bytes = _u.receive_from( boost::asio::buffer(data, sizeof(data)), ep ); -#else struct sockaddr_in sa_in; /* remote address */ socklen_t addrlen = sizeof(sa_in); /* length of addresses */ ssize_t rx_bytes = recvfrom(_udp, data, sizeof(data), 0, (struct sockaddr *)&sa_in, &addrlen); @@ -864,7 +811,6 @@ int rfspace_source_c::work( int noutput_items, std::cerr << "recvfrom returned " << rx_bytes << std::endl; return WORK_DONE; } -#endif #define HEADER_SIZE 2 #define SEQNUM_SIZE 2 @@ -892,11 +838,7 @@ int rfspace_source_c::work( int noutput_items, if ( diff > 1 ) { std::cerr << "Lost " << diff << " packets from " -#ifdef USE_ASIO - << ep -#else << inet_ntoa(sa_in.sin_addr) << ":" << ntohs(sa_in.sin_port) -#endif << std::endl; } @@ -977,48 +919,11 @@ typedef struct uint16_t port; } unit_t; -#ifdef USE_ASIO -static void handle_receive( const boost::system::error_code& ec, - std::size_t length, - boost::system::error_code* out_ec, - std::size_t* out_length ) -{ - *out_ec = ec; - *out_length = length; -} - -static void handle_timer( const boost::system::error_code& ec, - boost::system::error_code* out_ec ) -{ - *out_ec = boost::asio::error::timed_out; -} -#endif static std::vector < unit_t > discover_netsdr() { std::vector < unit_t > units; -#ifdef USE_ASIO - boost::system::error_code ec; - boost::asio::io_service ios; - udp::socket socket(ios); - deadline_timer timer(ios); - - timer.expires_at(boost::posix_time::pos_infin); - - socket.open(udp::v4(), ec); - - if ( ec ) - return units; - - socket.bind(udp::endpoint(udp::v4(), DISCOVER_CLIENT_PORT), ec); - - if ( ec ) - return units; - - socket.set_option(udp::socket::reuse_address(true)); - socket.set_option(boost::asio::socket_base::broadcast(true)); -#else int sock; if ( (sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0 ) @@ -1058,7 +963,6 @@ static std::vector < unit_t > discover_netsdr() close(sock); return units; } -#endif discover_common_msg_t tx_msg; memset( (void *)&tx_msg, 0, sizeof(discover_common_msg_t) ); @@ -1067,64 +971,18 @@ static std::vector < unit_t > discover_netsdr() tx_msg.key[0] = KEY0; tx_msg.key[1] = KEY1; tx_msg.op = MSG_REQ; -#ifdef USE_ASIO - udp::endpoint ep(boost::asio::ip::address_v4::broadcast(), DISCOVER_SERVER_PORT); - socket.send_to(boost::asio::buffer(&tx_msg, sizeof(tx_msg)), ep); -#else sendto(sock, &tx_msg, sizeof(tx_msg), 0, (struct sockaddr *)&peer_sa, sizeof(peer_sa)); -#endif while ( true ) { std::size_t rx_bytes = 0; unsigned char data[1024*2]; -#ifdef USE_ASIO - // Set up the variables that receive the result of the asynchronous - // operation. The error code is set to would_block to signal that the - // operation is incomplete. Asio guarantees that its asynchronous - // operations will never fail with would_block, so any other value in - // ec indicates completion. - ec = boost::asio::error::would_block; - - // Start the asynchronous receive operation. The handle_receive function - // used as a callback will update the ec and rx_bytes variables. - socket.async_receive( boost::asio::buffer(data, sizeof(data)), - boost::bind(handle_receive, _1, _2, &ec, &rx_bytes) ); - - // Set a deadline for the asynchronous operation. - timer.expires_from_now( boost::posix_time::milliseconds(10) ); - - // Start an asynchronous wait on the timer. The handle_timer function - // used as a callback will update the ec variable. - timer.async_wait( boost::bind(handle_timer, _1, &ec) ); - - // Reset the io_service in preparation for a subsequent run_one() invocation. - ios.reset(); - - // Block until at least one asynchronous operation has completed. - do ios.run_one(); while ( ec == boost::asio::error::would_block ); - - if ( boost::asio::error::timed_out == ec ) /* timer was first to complete */ - { - // Please note that cancel() has portability issues on some versions of - // Microsoft Windows, and it may be necessary to use close() instead. - // Consult the documentation for cancel() for further information. - socket.cancel(); - - break; - } - else /* socket was first to complete */ - { - timer.cancel(); - } -#else socklen_t addrlen = sizeof(peer_sa); /* length of addresses */ int nbytes = recvfrom(sock, data, sizeof(data), 0, (struct sockaddr *)&peer_sa, &addrlen); if ( nbytes <= 0 ) break; rx_bytes = nbytes; -#endif if ( rx_bytes >= sizeof(discover_common_msg_t) ) { @@ -1151,11 +1009,7 @@ static std::vector < unit_t > discover_netsdr() } } } -#ifdef USE_ASIO - socket.close(ec); -#else close(sock); -#endif return units; } diff --git a/lib/rfspace/rfspace_source_c.h b/lib/rfspace/rfspace_source_c.h index a51bfc6f8a..d2bf66d9c5 100644 --- a/lib/rfspace/rfspace_source_c.h +++ b/lib/rfspace/rfspace_source_c.h @@ -20,11 +20,6 @@ #ifndef INCLUDED_RFSPACE_SOURCE_C_H #define INCLUDED_RFSPACE_SOURCE_C_H -//#define USE_ASIO - -#ifdef USE_ASIO -#include <boost/asio.hpp> -#endif #include <gnuradio/thread/thread.h> #include <gnuradio/block.h> #include <gnuradio/sync_block.h> @@ -36,10 +31,6 @@ #include "osmosdr/ranges.h" #include "source_iface.h" -#ifdef USE_ASIO -using boost::asio::ip::tcp; -using boost::asio::ip::udp; -#endif class rfspace_source_c; #ifndef SOCKET @@ -144,15 +135,8 @@ private: /* members */ radio_type _radio; -#ifdef USE_ASIO - boost::asio::io_service _io_service; - tcp::resolver _resolver; - tcp::socket _t; - udp::socket _u; -#else SOCKET _tcp; SOCKET _udp; -#endif int _usb; bool _running; bool _keep_running; -- 2.25.1

3 years, 6 months

1
0
0 0

[PATCH] Replace boost::bind with std::bind

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> This removes gr-iqbal's second-last dependence on Boost. All that remains is boost::shared_ptr, which will have to stay until GNU Radio 3.9. --- lib/fix_cc.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fix_cc.cc b/lib/fix_cc.cc index af79d7db26..628421db3e 100644 --- a/lib/fix_cc.cc +++ b/lib/fix_cc.cc @@ -43,7 +43,7 @@ iqbalance::fix_cc::fix_cc(float mag, float phase) { message_port_register_in(pmt::mp("iqbal_corr")); set_msg_handler(pmt::mp("iqbal_corr"), - boost::bind(&iqbalance::fix_cc::apply_new_corrections, this, boost::placeholders::_1)); + std::bind(&iqbalance::fix_cc::apply_new_corrections, this, std::placeholders::_1)); } -- 2.25.1

3 years, 6 months

1
0
0 0

[PATCH] Replace BOOST_FOREACH with range-based for loops

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Range-based for loops are available since C++11. Using them reduces gr-osmosdr's dependence on Boost. Here I've done the replacement using a global search-and-replace. --- lib/arg_helpers.h | 13 ++-- lib/bladerf/bladerf_common.cc | 9 ++- lib/bladerf/bladerf_sink_c.cc | 4 +- lib/bladerf/bladerf_source_c.cc | 4 +- lib/device.cc | 39 ++++++------ lib/fcd/fcd_source_c.cc | 3 +- lib/ranges.cc | 13 ++-- lib/rfspace/rfspace_source_c.cc | 4 +- lib/sink_impl.cc | 82 ++++++++++++------------ lib/soapy/soapy_sink_c.cc | 12 ++-- lib/soapy/soapy_source_c.cc | 12 ++-- lib/source_impl.cc | 108 ++++++++++++++++---------------- lib/uhd/uhd_sink_c.cc | 15 +++-- lib/uhd/uhd_source_c.cc | 15 +++-- 14 files changed, 163 insertions(+), 170 deletions(-) diff --git a/lib/arg_helpers.h b/lib/arg_helpers.h index b971625774..3b02b8ffb2 100644 --- a/lib/arg_helpers.h +++ b/lib/arg_helpers.h @@ -29,7 +29,6 @@ #include <boost/lexical_cast.hpp> #include <boost/tokenizer.hpp> -#include <boost/foreach.hpp> #include <ciso646> typedef std::map< std::string, std::string > dict_t; @@ -38,7 +37,7 @@ typedef std::pair< std::string, std::string > pair_t; inline std::string dict_to_args_string( const dict_t &d ) { std::string out; - BOOST_FOREACH(const pair_t pair, d) + for (const pair_t pair : d) { if (not out.empty()) out += ","; out += pair.first + "='" + pair.second + "'"; @@ -54,7 +53,7 @@ inline std::vector< std::string > args_to_vector( const std::string &args ) typedef boost::tokenizer< boost::escaped_list_separator<char> > tokenizer_t; tokenizer_t tokens(args, separator); - BOOST_FOREACH(std::string token, tokens) + for (std::string token : tokens) result.push_back(token); return result; @@ -68,7 +67,7 @@ inline std::vector< std::string > params_to_vector( const std::string &params ) typedef boost::tokenizer< boost::escaped_list_separator<char> > tokenizer_t; tokenizer_t tokens(params, separator); - BOOST_FOREACH(std::string token, tokens) + for (std::string token : tokens) result.push_back(token); return result; @@ -98,7 +97,7 @@ inline dict_t params_to_dict( const std::string &params ) dict_t result; std::vector< std::string > param_list = params_to_vector( params ); - BOOST_FOREACH(std::string param, param_list) + for (std::string param : param_list) { pair_t pair = param_to_pair( param ); std::string value = pair.second; @@ -124,7 +123,7 @@ inline gr::io_signature::sptr args_to_io_signature( const std::string &args ) size_t dev_nchan = 0; std::vector< std::string > arg_list = args_to_vector( args ); - BOOST_FOREACH( std::string arg, arg_list ) + for (std::string arg : arg_list) { if ( arg.find( "numchan=" ) == 0 ) // try to parse global nchan value { @@ -141,7 +140,7 @@ inline gr::io_signature::sptr args_to_io_signature( const std::string &args ) // try to parse device specific nchan values, assume 1 channel if none given - BOOST_FOREACH( std::string arg, arg_list ) + for (std::string arg : arg_list) { dict_t dict = params_to_dict(arg); if (dict.count("nchan")) diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc index 19b8a021a0..67bf736744 100644 --- a/lib/bladerf/bladerf_common.cc +++ b/lib/bladerf/bladerf_common.cc @@ -35,7 +35,6 @@ #include <string> #include <boost/assign.hpp> -#include <boost/foreach.hpp> #include <boost/format.hpp> #include <boost/lexical_cast.hpp> @@ -498,7 +497,7 @@ int bladerf_common::channel2rfport(bladerf_channel ch) bladerf_channel bladerf_common::chan2channel(bladerf_direction direction, size_t chan) { - BOOST_FOREACH(bladerf_channel_map::value_type &i, _chanmap) { + for (bladerf_channel_map::value_type &i : _chanmap) { bladerf_channel ch = i.first; if ( (i.second == (int)chan) && ( @@ -642,7 +641,7 @@ osmosdr::freq_range_t bladerf_common::filter_bandwidths(bladerf_channel ch) 0.75, 0.875, 1.25, 1.375, 1.5, 1.92, 2.5, 2.75, 3, 3.5, 4.375, 5, 6, 7, 10, 14; - BOOST_FOREACH( double half_bw, half_bandwidths ) + for (double half_bw : half_bandwidths) bandwidths += osmosdr::range_t( half_bw * 2e6 ); #else @@ -1136,7 +1135,7 @@ bladerf_sptr bladerf_common::get_cached_device(struct bladerf_devinfo devinfo) int status; struct bladerf_devinfo other_devinfo; - BOOST_FOREACH(std::weak_ptr<struct bladerf> dev, _devs) { + for (std::weak_ptr<struct bladerf> dev : _devs) { status = bladerf_get_devinfo(bladerf_sptr(dev).get(), &other_devinfo); if (status < 0) { BLADERF_THROW_STATUS(status, "Failed to get devinfo for cached device"); @@ -1199,7 +1198,7 @@ void bladerf_common::print_device_info() bool bladerf_common::is_antenna_valid(bladerf_direction dir, const std::string &antenna) { - BOOST_FOREACH(std::string ant, get_antennas(dir)) { + for (std::string ant : get_antennas(dir)) { if (antenna == ant) { return true; } diff --git a/lib/bladerf/bladerf_sink_c.cc b/lib/bladerf/bladerf_sink_c.cc index fe64439d7b..6ee3acd927 100644 --- a/lib/bladerf/bladerf_sink_c.cc +++ b/lib/bladerf/bladerf_sink_c.cc @@ -96,7 +96,7 @@ bladerf_sink_c::bladerf_sink_c(const std::string &args) : } /* Initialize channel <-> antenna map */ - BOOST_FOREACH(std::string ant, get_antennas()) { + for (std::string ant : get_antennas()) { _chanmap[str2channel(ant)] = -1; } @@ -329,7 +329,7 @@ int bladerf_sink_c::transmit_with_tags(int16_t const *samples, } } - BOOST_FOREACH(gr::tag_t tag, tags) { + for (gr::tag_t tag : tags) { // Upon seeing an SOB tag, update our offset. We'll TX the start of the // burst when we see an EOB or at the end of this function - whichever // occurs first. diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc index 2ac5779f2a..83db677a10 100644 --- a/lib/bladerf/bladerf_source_c.cc +++ b/lib/bladerf/bladerf_source_c.cc @@ -144,7 +144,7 @@ bladerf_source_c::bladerf_source_c(const std::string &args) : } /* Initialize channel <-> antenna map */ - BOOST_FOREACH(std::string ant, get_antennas()) { + for (std::string ant : get_antennas()) { _chanmap[str2channel(ant)] = -1; } @@ -180,7 +180,7 @@ bladerf_source_c::bladerf_source_c(const std::string &args) : bool bladerf_source_c::is_antenna_valid(const std::string &antenna) { - BOOST_FOREACH(std::string ant, get_antennas()) { + for (std::string ant : get_antennas()) { if (antenna == ant) { return true; } diff --git a/lib/device.cc b/lib/device.cc index 015383dbd4..17efde9896 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -20,7 +20,6 @@ #include <osmosdr/device.h> #include <stdexcept> -#include <boost/foreach.hpp> #include <boost/format.hpp> #include <algorithm> #include <mutex> @@ -108,7 +107,7 @@ device_t::device_t(const std::string &args) { dict_t dict = params_to_dict(args); - BOOST_FOREACH( dict_t::value_type &entry, dict ) + for (dict_t::value_type &entry : dict) (*this)[entry.first] = entry.second; } @@ -118,7 +117,7 @@ std::string device_t::to_pp_string(void) const std::stringstream ss; ss << "Device Address:" << std::endl; - BOOST_FOREACH(const device_t::value_type &entry, *this) { + for (const device_t::value_type &entry : *this) { ss << boost::format(" %s: %s") % entry.first % entry.second << std::endl; } return ss.str(); @@ -128,7 +127,7 @@ std::string device_t::to_string(void) const { std::stringstream ss; size_t count = 0; - BOOST_FOREACH(const device_t::value_type &entry, *this) { + for (const device_t::value_type &entry : *this) { std::string value = entry.second; if (value.find(" ") != std::string::npos) value = "'" + value + "'"; @@ -151,55 +150,55 @@ devices_t device::find(const device_t &hint) devices_t devices; #ifdef ENABLE_OSMOSDR - BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() ) + for (std::string dev : osmosdr_src_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_FCD - BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() ) + for (std::string dev : fcd_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_RTL - BOOST_FOREACH( std::string dev, rtl_source_c::get_devices() ) + for (std::string dev : rtl_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_UHD - BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() ) + for (std::string dev : uhd_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_MIRI - BOOST_FOREACH( std::string dev, miri_source_c::get_devices() ) + for (std::string dev : miri_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_SDRPLAY - BOOST_FOREACH( std::string dev, sdrplay_source_c::get_devices() ) + for (std::string dev : sdrplay_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_BLADERF - BOOST_FOREACH( std::string dev, bladerf_source_c::get_devices() ) + for (std::string dev : bladerf_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_HACKRF - BOOST_FOREACH( std::string dev, hackrf_source_c::get_devices() ) + for (std::string dev : hackrf_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_RFSPACE - BOOST_FOREACH( std::string dev, rfspace_source_c::get_devices( fake ) ) + for (std::string dev : rfspace_source_c::get_devices( fake )) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_AIRSPY - BOOST_FOREACH( std::string dev, airspy_source_c::get_devices() ) + for (std::string dev : airspy_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_AIRSPYHF - BOOST_FOREACH( std::string dev, airspyhf_source_c::get_devices() ) + for (std::string dev : airspyhf_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_FREESRP - BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) + for (std::string dev : freesrp_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_SOAPY - BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) + for (std::string dev : soapy_source_c::get_devices()) devices.push_back( device_t(dev) ); #endif @@ -208,15 +207,15 @@ devices_t device::find(const device_t &hint) * in a graphical interface etc... */ #ifdef ENABLE_RTL_TCP - BOOST_FOREACH( std::string dev, rtl_tcp_source_c::get_devices( fake ) ) + for (std::string dev : rtl_tcp_source_c::get_devices( fake )) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_REDPITAYA - BOOST_FOREACH( std::string dev, redpitaya_source_c::get_devices( fake ) ) + for (std::string dev : redpitaya_source_c::get_devices( fake )) devices.push_back( device_t(dev) ); #endif #ifdef ENABLE_FILE - BOOST_FOREACH( std::string dev, file_source_c::get_devices( fake ) ) + for (std::string dev : file_source_c::get_devices( fake )) devices.push_back( device_t(dev) ); #endif diff --git a/lib/fcd/fcd_source_c.cc b/lib/fcd/fcd_source_c.cc index 744fa69553..854e4c0e04 100644 --- a/lib/fcd/fcd_source_c.cc +++ b/lib/fcd/fcd_source_c.cc @@ -23,7 +23,6 @@ #include <sstream> #include <boost/assign.hpp> -#include <boost/foreach.hpp> #include <gnuradio/io_signature.h> @@ -171,7 +170,7 @@ std::vector< std::string > fcd_source_c::get_devices() int id = 0; std::vector< std::string > devices; - BOOST_FOREACH( device_t dev, _get_devices() ) + for (device_t dev : _get_devices()) { std::string args = "fcd=" + boost::lexical_cast< std::string >( id++ ); diff --git a/lib/ranges.cc b/lib/ranges.cc index cdff96911a..09c1daedf5 100644 --- a/lib/ranges.cc +++ b/lib/ranges.cc @@ -18,7 +18,6 @@ #include <osmosdr/ranges.h> #include <stdexcept> #include <boost/math/special_functions/round.hpp> -#include <boost/foreach.hpp> #include <algorithm> #include <sstream> @@ -102,7 +101,7 @@ meta_range_t::meta_range_t( double meta_range_t::start(void) const{ check_meta_range_monotonic(*this); double min_start = this->front().start(); - BOOST_FOREACH(const range_t &r, (*this)){ + for (const range_t &r : (*this)){ min_start = std::min(min_start, r.start()); } return min_start; @@ -111,7 +110,7 @@ double meta_range_t::start(void) const{ double meta_range_t::stop(void) const{ check_meta_range_monotonic(*this); double max_stop = this->front().stop(); - BOOST_FOREACH(const range_t &r, (*this)){ + for (const range_t &r : (*this)){ max_stop = std::max(max_stop, r.stop()); } return max_stop; @@ -121,7 +120,7 @@ double meta_range_t::step(void) const{ check_meta_range_monotonic(*this); std::vector<double> non_zero_steps; range_t last = this->front(); - BOOST_FOREACH(const range_t &r, (*this)){ + for (const range_t &r : (*this)){ //steps at each range if (r.step() > 0) non_zero_steps.push_back(r.step()); //and steps in-between ranges @@ -137,7 +136,7 @@ double meta_range_t::step(void) const{ double meta_range_t::clip(double value, bool clip_step) const{ check_meta_range_monotonic(*this); double last_stop = this->front().stop(); - BOOST_FOREACH(const range_t &r, (*this)){ + for (const range_t &r : (*this)){ //in-between ranges, clip to nearest if (value < r.start()){ return (std::abs(value - r.start()) < std::abs(value - last_stop))? @@ -157,7 +156,7 @@ double meta_range_t::clip(double value, bool clip_step) const{ std::vector<double> meta_range_t::values() const { std::vector<double> values; - BOOST_FOREACH(const range_t &r, (*this)) { + for (const range_t &r : (*this)) { if (r.start() != r.stop()) { if ( r.step() == 0 ) { values.push_back( r.start() ); @@ -177,7 +176,7 @@ std::vector<double> meta_range_t::values() const { const std::string meta_range_t::to_pp_string(void) const{ std::stringstream ss; - BOOST_FOREACH(const range_t &r, (*this)){ + for (const range_t &r : (*this)){ ss << r.to_pp_string() << std::endl; } return ss.str(); diff --git a/lib/rfspace/rfspace_source_c.cc b/lib/rfspace/rfspace_source_c.cc index 121dcde032..597bff6a96 100644 --- a/lib/rfspace/rfspace_source_c.cc +++ b/lib/rfspace/rfspace_source_c.cc @@ -1296,7 +1296,7 @@ std::vector<std::string> rfspace_source_c::get_devices( bool fake ) std::vector < unit_t > units = discover_netsdr(); - BOOST_FOREACH( unit_t u, units ) + for (unit_t u : units) { // std::cerr << u.name << " " << u.sn << " " << u.addr << ":" << u.port // << std::endl; @@ -1310,7 +1310,7 @@ std::vector<std::string> rfspace_source_c::get_devices( bool fake ) units = discover_sdr_iq(); - BOOST_FOREACH( unit_t u, units ) + for (unit_t u : units) { // std::cerr << u.name << " " << u.sn << " " << u.addr << ":" << u.port // << std::endl; diff --git a/lib/sink_impl.cc b/lib/sink_impl.cc index e8f8dc076d..a09d7df14b 100644 --- a/lib/sink_impl.cc +++ b/lib/sink_impl.cc @@ -107,13 +107,13 @@ sink_impl::sink_impl( const std::string &args ) << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; std::cerr << "built-in sink types: "; - BOOST_FOREACH(std::string dev_type, dev_types) + for (std::string dev_type : dev_types) std::cerr << dev_type << " "; std::cerr << std::endl; - BOOST_FOREACH(std::string arg, arg_list) { + for (std::string arg : arg_list) { dict_t dict = params_to_dict(arg); - BOOST_FOREACH(std::string dev_type, dev_types) { + for (std::string dev_type : dev_types) { if ( dict.count( dev_type ) ) { device_specified = true; break; @@ -124,36 +124,36 @@ sink_impl::sink_impl( const std::string &args ) if ( ! device_specified ) { std::vector< std::string > dev_list; #ifdef ENABLE_UHD - BOOST_FOREACH( std::string dev, uhd_sink_c::get_devices() ) + for (std::string dev : uhd_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_BLADERF - BOOST_FOREACH( std::string dev, bladerf_sink_c::get_devices() ) + for (std::string dev : bladerf_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_HACKRF - BOOST_FOREACH( std::string dev, hackrf_sink_c::get_devices() ) + for (std::string dev : hackrf_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_SOAPY - BOOST_FOREACH( std::string dev, soapy_sink_c::get_devices() ) + for (std::string dev : soapy_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_REDPITAYA - BOOST_FOREACH( std::string dev, redpitaya_sink_c::get_devices() ) + for (std::string dev : redpitaya_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_FREESRP - BOOST_FOREACH( std::string dev, freesrp_sink_c::get_devices() ) + for (std::string dev : freesrp_sink_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_FILE - BOOST_FOREACH( std::string dev, file_sink_c::get_devices() ) + for (std::string dev : file_sink_c::get_devices()) dev_list.push_back( dev ); #endif // std::cerr << std::endl; -// BOOST_FOREACH( std::string dev, dev_list ) +// for (std::string dev : dev_list) // std::cerr << "'" << dev << "'" << std::endl; if ( dev_list.size() ) @@ -162,12 +162,12 @@ sink_impl::sink_impl( const std::string &args ) throw std::runtime_error("No supported devices found (check the connection and/or udev rules)."); } - BOOST_FOREACH(std::string arg, arg_list) { + for (std::string arg : arg_list) { dict_t dict = params_to_dict(arg); // std::cerr << std::endl; -// BOOST_FOREACH( dict_t::value_type &entry, dict ) +// for (dict_t::value_type &entry : dict) // std::cerr << "'" << entry.first << "' = '" << entry.second << "'" << std::endl; sink_iface *iface = NULL; @@ -235,7 +235,7 @@ size_t sink_impl::get_num_channels() { size_t channels = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) channels += dev->get_num_channels(); return channels; @@ -263,7 +263,7 @@ double sink_impl::set_sample_rate(double rate) if (_devs.empty()) throw std::runtime_error(NO_DEVICES_MSG); #endif - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) sample_rate = dev->set_sample_rate(rate); _sample_rate = sample_rate; @@ -288,7 +288,7 @@ double sink_impl::get_sample_rate() osmosdr::freq_range_t sink_impl::get_freq_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_freq_range( dev_chan ); @@ -299,7 +299,7 @@ osmosdr::freq_range_t sink_impl::get_freq_range( size_t chan ) double sink_impl::set_center_freq( double freq, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _center_freq[ chan ] != freq ) { @@ -314,7 +314,7 @@ double sink_impl::set_center_freq( double freq, size_t chan ) double sink_impl::get_center_freq( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_center_freq( dev_chan ); @@ -325,7 +325,7 @@ double sink_impl::get_center_freq( size_t chan ) double sink_impl::set_freq_corr( double ppm, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _freq_corr[ chan ] != ppm ) { @@ -340,7 +340,7 @@ double sink_impl::set_freq_corr( double ppm, size_t chan ) double sink_impl::get_freq_corr( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_freq_corr( dev_chan ); @@ -351,7 +351,7 @@ double sink_impl::get_freq_corr( size_t chan ) std::vector<std::string> sink_impl::get_gain_names( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_names( dev_chan ); @@ -362,7 +362,7 @@ std::vector<std::string> sink_impl::get_gain_names( size_t chan ) osmosdr::gain_range_t sink_impl::get_gain_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_range( dev_chan ); @@ -373,7 +373,7 @@ osmosdr::gain_range_t sink_impl::get_gain_range( size_t chan ) osmosdr::gain_range_t sink_impl::get_gain_range( const std::string & name, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_range( name, dev_chan ); @@ -384,7 +384,7 @@ osmosdr::gain_range_t sink_impl::get_gain_range( const std::string & name, size_ bool sink_impl::set_gain_mode( bool automatic, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _gain_mode[ chan ] != automatic ) { @@ -402,7 +402,7 @@ bool sink_impl::set_gain_mode( bool automatic, size_t chan ) bool sink_impl::get_gain_mode( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_mode( dev_chan ); @@ -413,7 +413,7 @@ bool sink_impl::get_gain_mode( size_t chan ) double sink_impl::set_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _gain[ chan ] != gain ) { @@ -428,7 +428,7 @@ double sink_impl::set_gain( double gain, size_t chan ) double sink_impl::set_gain( double gain, const std::string & name, size_t chan) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->set_gain( gain, name, dev_chan ); @@ -439,7 +439,7 @@ double sink_impl::set_gain( double gain, const std::string & name, size_t chan) double sink_impl::get_gain( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain( dev_chan ); @@ -450,7 +450,7 @@ double sink_impl::get_gain( size_t chan ) double sink_impl::get_gain( const std::string & name, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain( name, dev_chan ); @@ -461,7 +461,7 @@ double sink_impl::get_gain( const std::string & name, size_t chan ) double sink_impl::set_if_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _if_gain[ chan ] != gain ) { @@ -476,7 +476,7 @@ double sink_impl::set_if_gain( double gain, size_t chan ) double sink_impl::set_bb_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _bb_gain[ chan ] != gain ) { @@ -491,7 +491,7 @@ double sink_impl::set_bb_gain( double gain, size_t chan ) std::vector< std::string > sink_impl::get_antennas( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_antennas( dev_chan ); @@ -502,7 +502,7 @@ std::vector< std::string > sink_impl::get_antennas( size_t chan ) std::string sink_impl::set_antenna( const std::string & antenna, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _antenna[ chan ] != antenna ) { @@ -517,7 +517,7 @@ std::string sink_impl::set_antenna( const std::string & antenna, size_t chan ) std::string sink_impl::get_antenna( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_antenna( dev_chan ); @@ -528,7 +528,7 @@ std::string sink_impl::get_antenna( size_t chan ) void sink_impl::set_dc_offset( const std::complex<double> &offset, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) dev->set_dc_offset( offset, dev_chan ); @@ -537,7 +537,7 @@ void sink_impl::set_dc_offset( const std::complex<double> &offset, size_t chan ) void sink_impl::set_iq_balance( const std::complex<double> &balance, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) dev->set_iq_balance( balance, dev_chan ); @@ -546,7 +546,7 @@ void sink_impl::set_iq_balance( const std::complex<double> &balance, size_t chan double sink_impl::set_bandwidth( double bandwidth, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _bandwidth[ chan ] != bandwidth || 0.0f == bandwidth ) { @@ -561,7 +561,7 @@ double sink_impl::set_bandwidth( double bandwidth, size_t chan ) double sink_impl::get_bandwidth( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_bandwidth( dev_chan ); @@ -572,7 +572,7 @@ double sink_impl::get_bandwidth( size_t chan ) osmosdr::freq_range_t sink_impl::get_bandwidth_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_bandwidth_range( dev_chan ); @@ -665,7 +665,7 @@ void sink_impl::set_time_now(const osmosdr::time_spec_t &time_spec, size_t mboar void sink_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) { dev->set_time_next_pps( time_spec ); } @@ -673,7 +673,7 @@ void sink_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) void sink_impl::set_time_unknown_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( sink_iface *dev, _devs ) + for (sink_iface *dev : _devs) { dev->set_time_unknown_pps( time_spec ); } diff --git a/lib/soapy/soapy_sink_c.cc b/lib/soapy/soapy_sink_c.cc index e4422f7f45..4aafc47203 100644 --- a/lib/soapy/soapy_sink_c.cc +++ b/lib/soapy/soapy_sink_c.cc @@ -107,7 +107,7 @@ std::vector<std::string> soapy_sink_c::get_devices() { std::vector<std::string> result; int i = 0; - BOOST_FOREACH(SoapySDR::Kwargs kw, SoapySDR::Device::enumerate()) + for (SoapySDR::Kwargs kw : SoapySDR::Device::enumerate()) { kw["soapy"] = boost::lexical_cast<std::string>(i++); result.push_back(dict_to_args_string(kw)); @@ -124,12 +124,12 @@ osmosdr::meta_range_t soapy_sink_c::get_sample_rates( void ) { osmosdr::meta_range_t result; #ifdef SOAPY_SDR_API_HAS_GET_SAMPLE_RATE_RANGE - BOOST_FOREACH(const SoapySDR::Range &r, _device->getSampleRateRange(SOAPY_SDR_TX, 0)) + for (const SoapySDR::Range &r : _device->getSampleRateRange(SOAPY_SDR_TX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } #else - BOOST_FOREACH(const double rate, _device->listSampleRates(SOAPY_SDR_TX, 0)) + for (const double rate : _device->listSampleRates(SOAPY_SDR_TX, 0)) { result.push_back(osmosdr::range_t(rate)); } @@ -151,7 +151,7 @@ double soapy_sink_c::get_sample_rate( void ) osmosdr::freq_range_t soapy_sink_c::get_freq_range( size_t chan) { osmosdr::meta_range_t result; - BOOST_FOREACH(const SoapySDR::Range r, _device->getFrequencyRange(SOAPY_SDR_TX, 0)) + for (const SoapySDR::Range r : _device->getFrequencyRange(SOAPY_SDR_TX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } @@ -309,12 +309,12 @@ osmosdr::freq_range_t soapy_sink_c::get_bandwidth_range( size_t chan) { osmosdr::meta_range_t result; #ifdef SOAPY_SDR_API_HAS_GET_BANDWIDTH_RANGE - BOOST_FOREACH(const SoapySDR::Range &r, _device->getBandwidthRange(SOAPY_SDR_TX, 0)) + for (const SoapySDR::Range &r : _device->getBandwidthRange(SOAPY_SDR_TX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } #else - BOOST_FOREACH(const double bw, _device->listBandwidths(SOAPY_SDR_TX, 0)) + for (const double bw : _device->listBandwidths(SOAPY_SDR_TX, 0)) { result.push_back(osmosdr::range_t(bw)); } diff --git a/lib/soapy/soapy_source_c.cc b/lib/soapy/soapy_source_c.cc index 4056a508a0..4dc9efc019 100644 --- a/lib/soapy/soapy_source_c.cc +++ b/lib/soapy/soapy_source_c.cc @@ -113,7 +113,7 @@ std::vector<std::string> soapy_source_c::get_devices() { std::vector<std::string> result; int i = 0; - BOOST_FOREACH(SoapySDR::Kwargs kw, SoapySDR::Device::enumerate()) + for (SoapySDR::Kwargs kw : SoapySDR::Device::enumerate()) { kw["soapy"] = boost::lexical_cast<std::string>(i++); result.push_back(dict_to_args_string(kw)); @@ -130,12 +130,12 @@ osmosdr::meta_range_t soapy_source_c::get_sample_rates( void ) { osmosdr::meta_range_t result; #ifdef SOAPY_SDR_API_HAS_GET_SAMPLE_RATE_RANGE - BOOST_FOREACH(const SoapySDR::Range &r, _device->getSampleRateRange(SOAPY_SDR_RX, 0)) + for (const SoapySDR::Range &r : _device->getSampleRateRange(SOAPY_SDR_RX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } #else - BOOST_FOREACH(const double rate, _device->listSampleRates(SOAPY_SDR_RX, 0)) + for (const double rate : _device->listSampleRates(SOAPY_SDR_RX, 0)) { result.push_back(osmosdr::range_t(rate)); } @@ -157,7 +157,7 @@ double soapy_source_c::get_sample_rate( void ) osmosdr::freq_range_t soapy_source_c::get_freq_range( size_t chan ) { osmosdr::meta_range_t result; - BOOST_FOREACH(const SoapySDR::Range r, _device->getFrequencyRange(SOAPY_SDR_RX, 0)) + for (const SoapySDR::Range r : _device->getFrequencyRange(SOAPY_SDR_RX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } @@ -338,12 +338,12 @@ osmosdr::freq_range_t soapy_source_c::get_bandwidth_range( size_t chan ) { osmosdr::meta_range_t result; #ifdef SOAPY_SDR_API_HAS_GET_BANDWIDTH_RANGE - BOOST_FOREACH(const SoapySDR::Range &r, _device->getBandwidthRange(SOAPY_SDR_RX, 0)) + for (const SoapySDR::Range &r : _device->getBandwidthRange(SOAPY_SDR_RX, 0)) { result.push_back(osmosdr::range_t(r.minimum(), r.maximum())); } #else - BOOST_FOREACH(const double bw, _device->listBandwidths(SOAPY_SDR_RX, 0)) + for (const double bw : _device->listBandwidths(SOAPY_SDR_RX, 0)) { result.push_back(osmosdr::range_t(bw)); } diff --git a/lib/source_impl.cc b/lib/source_impl.cc index f1426e0e0b..41c45bf467 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -177,7 +177,7 @@ source_impl::source_impl( const std::string &args ) << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; std::cerr << "built-in source types: "; - BOOST_FOREACH(std::string dev_type, dev_types) + for (std::string dev_type : dev_types) std::cerr << dev_type << " "; std::cerr << std::endl; @@ -188,9 +188,9 @@ source_impl::source_impl( const std::string &args ) dev_types.push_back("cloudiq"); #endif - BOOST_FOREACH(std::string arg, arg_list) { + for (std::string arg : arg_list) { dict_t dict = params_to_dict(arg); - BOOST_FOREACH(std::string dev_type, dev_types) { + for (std::string dev_type : dev_types) { if ( dict.count( dev_type ) ) { device_specified = true; break; @@ -201,64 +201,64 @@ source_impl::source_impl( const std::string &args ) if ( ! device_specified ) { std::vector< std::string > dev_list; #ifdef ENABLE_OSMOSDR - BOOST_FOREACH( std::string dev, osmosdr_src_c::get_devices() ) + for (std::string dev : osmosdr_src_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_FCD - BOOST_FOREACH( std::string dev, fcd_source_c::get_devices() ) + for (std::string dev : fcd_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_RTL - BOOST_FOREACH( std::string dev, rtl_source_c::get_devices() ) + for (std::string dev : rtl_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_UHD - BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() ) + for (std::string dev : uhd_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_MIRI - BOOST_FOREACH( std::string dev, miri_source_c::get_devices() ) + for (std::string dev : miri_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_SDRPLAY - BOOST_FOREACH( std::string dev, sdrplay_source_c::get_devices() ) + for (std::string dev : sdrplay_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_BLADERF - BOOST_FOREACH( std::string dev, bladerf_source_c::get_devices() ) + for (std::string dev : bladerf_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_RFSPACE - BOOST_FOREACH( std::string dev, rfspace_source_c::get_devices() ) + for (std::string dev : rfspace_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_HACKRF - BOOST_FOREACH( std::string dev, hackrf_source_c::get_devices() ) + for (std::string dev : hackrf_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_AIRSPY - BOOST_FOREACH( std::string dev, airspy_source_c::get_devices() ) + for (std::string dev : airspy_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_AIRSPYHF - BOOST_FOREACH( std::string dev, airspyhf_source_c::get_devices() ) + for (std::string dev : airspyhf_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_SOAPY - BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) + for (std::string dev : soapy_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_REDPITAYA - BOOST_FOREACH( std::string dev, redpitaya_source_c::get_devices() ) + for (std::string dev : redpitaya_source_c::get_devices()) dev_list.push_back( dev ); #endif #ifdef ENABLE_FREESRP - BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) + for (std::string dev : freesrp_source_c::get_devices()) dev_list.push_back( dev ); #endif // std::cerr << std::endl; -// BOOST_FOREACH( std::string dev, dev_list ) +// for (std::string dev : dev_list) // std::cerr << "'" << dev << "'" << std::endl; if ( dev_list.size() ) @@ -267,12 +267,12 @@ source_impl::source_impl( const std::string &args ) throw std::runtime_error("No supported devices found (check the connection and/or udev rules)."); } - BOOST_FOREACH(std::string arg, arg_list) { + for (std::string arg : arg_list) { dict_t dict = params_to_dict(arg); // std::cerr << std::endl; -// BOOST_FOREACH( dict_t::value_type &entry, dict ) +// for (dict_t::value_type &entry : dict) // std::cerr << "'" << entry.first << "' = '" << entry.second << "'" << std::endl; source_iface *iface = NULL; @@ -427,7 +427,7 @@ size_t source_impl::get_num_channels() { size_t channels = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) channels += dev->get_num_channels(); return channels; @@ -436,7 +436,7 @@ size_t source_impl::get_num_channels() bool source_impl::seek( long seek_point, int whence, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->seek( seek_point, whence, dev_chan ); @@ -466,12 +466,12 @@ double source_impl::set_sample_rate(double rate) if (_devs.empty()) throw std::runtime_error(NO_DEVICES_MSG); #endif - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) sample_rate = dev->set_sample_rate(rate); #ifdef HAVE_IQBALANCE size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) { + for (source_iface *dev : _devs) { for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { if ( channel < _iq_opt.size() ) { gr::iqbalance::optimize_c *opt = _iq_opt[channel]; @@ -509,7 +509,7 @@ double source_impl::get_sample_rate() osmosdr::freq_range_t source_impl::get_freq_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_freq_range( dev_chan ); @@ -520,7 +520,7 @@ osmosdr::freq_range_t source_impl::get_freq_range( size_t chan ) double source_impl::set_center_freq( double freq, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _center_freq[ chan ] != freq ) { @@ -535,7 +535,7 @@ double source_impl::set_center_freq( double freq, size_t chan ) double source_impl::get_center_freq( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_center_freq( dev_chan ); @@ -546,7 +546,7 @@ double source_impl::get_center_freq( size_t chan ) double source_impl::set_freq_corr( double ppm, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _freq_corr[ chan ] != ppm ) { @@ -561,7 +561,7 @@ double source_impl::set_freq_corr( double ppm, size_t chan ) double source_impl::get_freq_corr( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_freq_corr( dev_chan ); @@ -572,7 +572,7 @@ double source_impl::get_freq_corr( size_t chan ) std::vector<std::string> source_impl::get_gain_names( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_names( dev_chan ); @@ -583,7 +583,7 @@ std::vector<std::string> source_impl::get_gain_names( size_t chan ) osmosdr::gain_range_t source_impl::get_gain_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_range( dev_chan ); @@ -594,7 +594,7 @@ osmosdr::gain_range_t source_impl::get_gain_range( size_t chan ) osmosdr::gain_range_t source_impl::get_gain_range( const std::string & name, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_range( name, dev_chan ); @@ -605,7 +605,7 @@ osmosdr::gain_range_t source_impl::get_gain_range( const std::string & name, siz bool source_impl::set_gain_mode( bool automatic, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _gain_mode[ chan ] != automatic ) { @@ -623,7 +623,7 @@ bool source_impl::set_gain_mode( bool automatic, size_t chan ) bool source_impl::get_gain_mode( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain_mode( dev_chan ); @@ -634,7 +634,7 @@ bool source_impl::get_gain_mode( size_t chan ) double source_impl::set_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _gain[ chan ] != gain ) { @@ -649,7 +649,7 @@ double source_impl::set_gain( double gain, size_t chan ) double source_impl::set_gain( double gain, const std::string & name, size_t chan) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->set_gain( gain, name, dev_chan ); @@ -660,7 +660,7 @@ double source_impl::set_gain( double gain, const std::string & name, size_t chan double source_impl::get_gain( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain( dev_chan ); @@ -671,7 +671,7 @@ double source_impl::get_gain( size_t chan ) double source_impl::get_gain( const std::string & name, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_gain( name, dev_chan ); @@ -682,7 +682,7 @@ double source_impl::get_gain( const std::string & name, size_t chan ) double source_impl::set_if_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _if_gain[ chan ] != gain ) { @@ -697,7 +697,7 @@ double source_impl::set_if_gain( double gain, size_t chan ) double source_impl::set_bb_gain( double gain, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _bb_gain[ chan ] != gain ) { @@ -712,7 +712,7 @@ double source_impl::set_bb_gain( double gain, size_t chan ) std::vector< std::string > source_impl::get_antennas( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_antennas( dev_chan ); @@ -723,7 +723,7 @@ std::vector< std::string > source_impl::get_antennas( size_t chan ) std::string source_impl::set_antenna( const std::string & antenna, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _antenna[ chan ] != antenna ) { @@ -738,7 +738,7 @@ std::string source_impl::set_antenna( const std::string & antenna, size_t chan ) std::string source_impl::get_antenna( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_antenna( dev_chan ); @@ -749,7 +749,7 @@ std::string source_impl::get_antenna( size_t chan ) void source_impl::set_dc_offset_mode( int mode, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) dev->set_dc_offset_mode( mode, dev_chan ); @@ -758,7 +758,7 @@ void source_impl::set_dc_offset_mode( int mode, size_t chan ) void source_impl::set_dc_offset( const std::complex<double> &offset, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) dev->set_dc_offset( offset, dev_chan ); @@ -768,7 +768,7 @@ void source_impl::set_iq_balance_mode( int mode, size_t chan ) { size_t channel = 0; #ifdef HAVE_IQBALANCE - BOOST_FOREACH( source_iface *dev, _devs ) { + for (source_iface *dev : _devs) { for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { if ( chan == channel++ ) { if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { @@ -798,7 +798,7 @@ void source_impl::set_iq_balance_mode( int mode, size_t chan ) } } #else - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->set_iq_balance_mode( mode, dev_chan ); @@ -809,7 +809,7 @@ void source_impl::set_iq_balance( const std::complex<double> &balance, size_t ch { size_t channel = 0; #ifdef HAVE_IQBALANCE - BOOST_FOREACH( source_iface *dev, _devs ) { + for (source_iface *dev : _devs) { for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { if ( chan == channel++ ) { if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { @@ -825,7 +825,7 @@ void source_impl::set_iq_balance( const std::complex<double> &balance, size_t ch } } #else - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->set_iq_balance( balance, dev_chan ); @@ -835,7 +835,7 @@ void source_impl::set_iq_balance( const std::complex<double> &balance, size_t ch double source_impl::set_bandwidth( double bandwidth, size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) { if ( _bandwidth[ chan ] != bandwidth || 0.0f == bandwidth ) { @@ -850,7 +850,7 @@ double source_impl::set_bandwidth( double bandwidth, size_t chan ) double source_impl::get_bandwidth( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_bandwidth( dev_chan ); @@ -861,7 +861,7 @@ double source_impl::get_bandwidth( size_t chan ) osmosdr::freq_range_t source_impl::get_bandwidth_range( size_t chan ) { size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) if ( chan == channel++ ) return dev->get_bandwidth_range( dev_chan ); @@ -954,7 +954,7 @@ void source_impl::set_time_now(const osmosdr::time_spec_t &time_spec, size_t mbo void source_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) { dev->set_time_next_pps( time_spec ); } @@ -962,7 +962,7 @@ void source_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) void source_impl::set_time_unknown_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( source_iface *dev, _devs ) + for (source_iface *dev : _devs) { dev->set_time_unknown_pps( time_spec ); } diff --git a/lib/uhd/uhd_sink_c.cc b/lib/uhd/uhd_sink_c.cc index a154556fc0..8698f4c2f5 100644 --- a/lib/uhd/uhd_sink_c.cc +++ b/lib/uhd/uhd_sink_c.cc @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include <boost/foreach.hpp> #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> @@ -71,7 +70,7 @@ uhd_sink_c::uhd_sink_c(const std::string &args) : _lo_offset = boost::lexical_cast< double >( dict["lo_offset"] ); std::string arguments; // rebuild argument string without internal arguments - BOOST_FOREACH( dict_t::value_type &entry, dict ) + for (dict_t::value_type &entry : dict) { if ( "cpu_format" == entry.first || "otw_format" == entry.first || @@ -135,7 +134,7 @@ std::vector< std::string > uhd_sink_c::get_devices() std::vector< std::string > devices; uhd::device_addr_t hint; - BOOST_FOREACH(const uhd::device_addr_t &dev, uhd::device::find(hint)) + for (const uhd::device_addr_t &dev : uhd::device::find(hint)) { std::string args = "uhd," + dev.to_string(); @@ -190,7 +189,7 @@ osmosdr::meta_range_t uhd_sink_c::get_sample_rates( void ) { osmosdr::meta_range_t rates; - BOOST_FOREACH( uhd::range_t rate, _snk->get_samp_rates() ) + for (uhd::range_t rate : _snk->get_samp_rates()) rates += osmosdr::range_t( rate.start(), rate.stop(), rate.step() ); return rates; @@ -211,7 +210,7 @@ osmosdr::freq_range_t uhd_sink_c::get_freq_range( size_t chan ) { osmosdr::freq_range_t range; - BOOST_FOREACH( uhd::range_t freq, _snk->get_freq_range(chan) ) + for (uhd::range_t freq : _snk->get_freq_range(chan)) range += osmosdr::range_t( freq.start(), freq.stop(), freq.step() ); return range; @@ -260,7 +259,7 @@ osmosdr::gain_range_t uhd_sink_c::get_gain_range( size_t chan ) { osmosdr::gain_range_t range; - BOOST_FOREACH( uhd::range_t gain, _snk->get_gain_range(chan) ) + for (uhd::range_t gain : _snk->get_gain_range(chan)) range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() ); return range; @@ -270,7 +269,7 @@ osmosdr::gain_range_t uhd_sink_c::get_gain_range( const std::string & name, size { osmosdr::gain_range_t range; - BOOST_FOREACH( uhd::range_t gain, _snk->get_gain_range(name, chan) ) + for (uhd::range_t gain : _snk->get_gain_range(name, chan)) range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() ); return range; @@ -351,7 +350,7 @@ osmosdr::freq_range_t uhd_sink_c::get_bandwidth_range( size_t chan ) { osmosdr::freq_range_t bandwidths; - BOOST_FOREACH( uhd::range_t bw, _snk->get_bandwidth_range(chan) ) + for (uhd::range_t bw : _snk->get_bandwidth_range(chan)) bandwidths += osmosdr::range_t( bw.start(), bw.stop(), bw.step() ); return bandwidths; diff --git a/lib/uhd/uhd_source_c.cc b/lib/uhd/uhd_source_c.cc index fc1301746e..f9f9fdd620 100644 --- a/lib/uhd/uhd_source_c.cc +++ b/lib/uhd/uhd_source_c.cc @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ -#include <boost/foreach.hpp> #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> @@ -72,7 +71,7 @@ uhd_source_c::uhd_source_c(const std::string &args) : _lo_offset = boost::lexical_cast< double >( dict["lo_offset"] ); std::string arguments; // rebuild argument string without internal arguments - BOOST_FOREACH( dict_t::value_type &entry, dict ) + for (dict_t::value_type &entry : dict) { if ( "cpu_format" == entry.first || "otw_format" == entry.first || @@ -136,7 +135,7 @@ std::vector< std::string > uhd_source_c::get_devices() std::vector< std::string > devices; uhd::device_addr_t hint; - BOOST_FOREACH(const uhd::device_addr_t &dev, uhd::device::find(hint)) + for (const uhd::device_addr_t &dev : uhd::device::find(hint)) { std::string args = "uhd," + dev.to_string(); @@ -191,7 +190,7 @@ osmosdr::meta_range_t uhd_source_c::get_sample_rates( void ) { osmosdr::meta_range_t rates; - BOOST_FOREACH( uhd::range_t rate, _src->get_samp_rates() ) + for (uhd::range_t rate : _src->get_samp_rates()) rates += osmosdr::range_t( rate.start(), rate.stop(), rate.step() ); return rates; @@ -212,7 +211,7 @@ osmosdr::freq_range_t uhd_source_c::get_freq_range( size_t chan ) { osmosdr::freq_range_t range; - BOOST_FOREACH( uhd::range_t freq, _src->get_freq_range(chan) ) + for (uhd::range_t freq : _src->get_freq_range(chan)) range += osmosdr::range_t( freq.start(), freq.stop(), freq.step() ); return range; @@ -261,7 +260,7 @@ osmosdr::gain_range_t uhd_source_c::get_gain_range( size_t chan ) { osmosdr::gain_range_t range; - BOOST_FOREACH( uhd::range_t gain, _src->get_gain_range(chan) ) + for (uhd::range_t gain : _src->get_gain_range(chan)) range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() ); return range; @@ -271,7 +270,7 @@ osmosdr::gain_range_t uhd_source_c::get_gain_range( const std::string & name, si { osmosdr::gain_range_t range; - BOOST_FOREACH( uhd::range_t gain, _src->get_gain_range(name, chan) ) + for (uhd::range_t gain : _src->get_gain_range(name, chan)) range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() ); return range; @@ -383,7 +382,7 @@ osmosdr::freq_range_t uhd_source_c::get_bandwidth_range( size_t chan ) { osmosdr::freq_range_t bandwidths; - BOOST_FOREACH( uhd::range_t bw, _src->get_bandwidth_range(chan) ) + for (uhd::range_t bw : _src->get_bandwidth_range(chan)) bandwidths += osmosdr::range_t( bw.start(), bw.stop(), bw.step() ); return bandwidths; -- 2.25.1

3 years, 6 months

1
0
0 0

[PATCH] add xtrx support

by Csaba Sipos

Dear Maintainers, The attached patch adds XTRX SDR support to Gr-Osmosdr. It mostly contains the out-of tree patches added in the libxtrx branch here: https://github.com/xtrx-sdr/gr-osmosdr , also the patches upstreamed to be compatible with Gnu-Radio 3.8 and the latest master branch of gr-osmosdr. It compiles and works fine with Gnu-Radio 3.8 and Gr-Osmosdr master (tested on Ubuntu 20.04.01 LTS 64bit). Hopefully I will have time to test it against other Osmocom projects in the near future. Please let me know if the patch needs any modifications or further work. Regards, Csaba

3 years, 6 months

1
0
0 0

OsmoDevCon / COVID-19

by Harald Welte

Dear fellow Osmocom developers, as you all know, we've sadly had to postpone OsmoDevCon 2020 back in April this year. At the time, we discussed to re-visit the situation in October 2020. While legally it is no problem at all to host an event with ~ 20 participants in Berlin/Germany (specific regulations really only start from 50+ participants) - I'm not entirely convinced it would be the smartest move. Legality and public health regulations are only one part of the equation - common sense and profound care for the key members of our community for sure are more relevant considerations to me. I'm not 100% in favour and not 100% against. Hence, I would like to get your input. Should we a) try to get an event organized on-site in Berlin? We'd have to move to a larger venue than IN-Berlin with proper ventilation and sufficient space so we can keep physical distance, but I think that's manageable for sysmocom as organizer. b) simply postpone to 2021? I'm convinced the situation will not change significantly (in a positive way) until late April 2021, so it's not really a "solution" as it will likely mean we have to think of late 2021 or 2022. c) plan some kind of online conference? To be honest, I think this model works fine for events where a single speaker wants to give lectures to hundreds or thousands of participants. But OsmoDevCon is much more interactive. We could record or live-stream some talks or screencasts from home, sure. But that only captures one part of the event. We could also try to set a date for a collaborative mumble, or the like - for the "hallway track". What are your thoughts? Let's avoid cross-posting the discussion to all of the mailing lists and simply have it on openbsc(a)lists.osmocom.org. Regards, Harald -- - Harald Welte <laforge(a)osmocom.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

3 years, 8 months

1
0
0 0

[PATCH] add optional three-channel support to fl2k_file

by Riley Faelan

Hello, attached is a patch to fl2k_file that introduces the -3 command line option. If this option is in use, fl2k_file will treat the input file as a sequence of frames of 3 samples for each of the red, green, and blue output channels. This implementation is not exactly optimal in CPU use, since the patch de-interleaves the input first, and the underlying library then proceeds to re-interleave it (in the weird hardware-specific order). This is because I didn't feel comfortable trying to redesign the fl2k_data_info_t structure to support interleaved data without guidance from the architect. But with a more flexible structure, these stages could be combined, improving the throughput. -- Riley Faelan

3 years, 8 months

1
0
0 0

GNU Radio 3.9 support for gr-osmosdr

by Troy Curtis Jr

Howdy guys. I see some work around getting gr-osmosdr working nicely with GR 3.8, but have there been any discussions around GR 3.9 (really current 'master')? I recently decided to pick GNU Radio back up and hook up my rtl dongle. In particular, I wanted to dust off my C++ chops that I haven't been able to exercise in my current $DAYJOB. Naturally then I started with GNU Radio master! It looks like one major change is that they have replaced swig with pybind, which means that the current gr-osmosdr can't even begin to work. So has there been any discussion about the porting effort necessary to move it over? I'm interested in starting to poke at getting it working under current GR 3.9/master, but had a few questions before I started: 1) Has anyone else started on the changes that I could coordinate with? 2) Is there generally any attempt at tracking gr master, or do you typically only target release branches? 3) Am I putting the cart before the horse and really need to focus any of my willingness to help on getting the GR 3.8 solid (if it isn't already)? Thanks for time, Troy

3 years, 8 months

4
6
0 0

where to post rtl-sdr questions

by Bruce Clay

Where is the best place to post librtlsdr developer questions? Bruce

3 years, 8 months

1
0
0 0

[PATCH] gr-osmosdr: fix hackrf_source signedness

by Mike Walters

The LUT changes in 2e7d343fed inadvertently started interpreting samples as unsigned. This change puts it back to signed (and fixes an outdated comment).

3 years, 9 months

1
0
0 0

[PATCH] gr-osmosdr: Fix YML block generation

by Mike Walters

This fixes the template syntax that removes a set of variables from sink blocks. Previously, this was causing NameErrors when trying to generate a flowgraph containing a sink block.

3 years, 9 months

1
0
0 0

Osmocom scheduled outage on *2020-07-19 9am CEST*

by Harald Welte

There is an urgent need to migrate our most important public infrastructure to a new server, and I will be doing that on *Sunday, July 19 2020*, starting about 9am CEST. The migration involves redmine (main osmocom.org website), jenkins, gerrit, git, and cgit. In theory, the migration should be quick. I would expect (significantly) less than one hour of downtime. However, we all know Murphys law. Services not affected are mail (including mailman lists), ftp, dns. So in case of doubt, we can still use mailing lists to communicate. In case anyone urgently needs osmocom source code on Sunday morning during the downtime: There are public mirrors available on github. Regards, Harald -- - Harald Welte <laforge(a)osmocom.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

3 years, 9 months

1
1
0 0

[PATCH] gr-osmosdr: fix build with boost > 1.73.0

by Gwenhael Goavec-Merou

boost/detail/endian.hpp has been marked as deprecated since boost 1.69.0. This file and boost/predef/detail/endian_compat.h are no more available. This patch suppress this header in some file, where not needed and move to correct header and new constants. It's retrocompatible for at least all boost release > 1.69.0 Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> --- lib/airspy/airspy_source_c.cc | 1 - lib/airspyhf/airspyhf_source_c.cc | 1 - lib/hackrf/hackrf_source_c.cc | 6 +++--- lib/rtl/rtl_source_c.cc | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 50150e5..f833588 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -33,7 +33,6 @@ #include <boost/assign.hpp> #include <boost/format.hpp> -#include <boost/detail/endian.hpp> #include <boost/algorithm/string.hpp> #include <boost/thread/thread.hpp> diff --git a/lib/airspyhf/airspyhf_source_c.cc b/lib/airspyhf/airspyhf_source_c.cc index 327fe19..b7494a8 100644 --- a/lib/airspyhf/airspyhf_source_c.cc +++ b/lib/airspyhf/airspyhf_source_c.cc @@ -33,7 +33,6 @@ #include <boost/assign.hpp> #include <boost/format.hpp> -#include <boost/detail/endian.hpp> #include <boost/algorithm/string.hpp> #include <boost/thread/thread.hpp> diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index eea5caa..fc48171 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -31,7 +31,7 @@ #include <stdexcept> #include <iostream> -#include <boost/detail/endian.hpp> +#include <boost/predef/other/endian.h> #include <gnuradio/io_signature.h> @@ -90,10 +90,10 @@ hackrf_source_c::hackrf_source_c (const std::string &args) // create a lookup table for gr_complex values for (unsigned int i = 0; i <= 0xffff; i++) { -#ifdef BOOST_LITTLE_ENDIAN +#ifdef BOOST_ENDIAN_LITTLE_BYTE _lut.push_back( gr_complex( (float(int8_t(i & 0xff))) * (1.0f/128.0f), (float(int8_t(i >> 8))) * (1.0f/128.0f) ) ); -#else // BOOST_BIG_ENDIAN +#else // BOOST_ENDIAN_BIG_BYTE _lut.push_back( gr_complex( (float(int8_t(i >> 8))) * (1.0f/128.0f), (float(int8_t(i & 0xff))) * (1.0f/128.0f) ) ); #endif diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..7f2e648 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -32,7 +32,6 @@ #include <boost/assign.hpp> #include <boost/format.hpp> -#include <boost/detail/endian.hpp> #include <boost/algorithm/string.hpp> #include <stdexcept> -- 2.27.0

3 years, 9 months

2
1
0 0

rtl_fm tuning

by JACOB EDWARDS WIESE

Hello I'm trying to use rtl_fm to listen to a local radio station but the software is not running to the frequency specified on the command line. The program output says it is tuning 256kHz higher. Command line: rtl-sdr-64bit-20200712> .\rtl_fm.exe -f 95.9M -E deemp -g 0 -s 128000 -r 22050 test2.raw Found 1 device(s): 0: RTLTXCO1, RTLTXCO1, SN: 00000001 Using device 0: Generic RTL2832U OEM Found Rafael Micro R820T tuner Tuner gain set to 0.00 dB. Tuned to 96156000 Hz. Oversampling input by: 8x. Oversampling output by: 1x. Buffer size: 8.00ms Sampling at 1024000 S/s. Output at 128000 Hz. Signal caught, exiting! User cancel, exiting... -- BT 73s Signed/Jacob Edwards Wiese/KD9LWR/Cell 219 221 0486// CoCoRaHS ID/IN-LP-65// PGP KEY ID/0xB842BA9690A408D3// NNNN

3 years, 9 months

1
0
0 0

[PATCH] librtlsdr: Allow device specification with an USB path

by Alexander Motzkau

I'm using a Raspberry with two similar devices but different antennas. Specifying the device via index didn't work, because the enumeration of devices changed from time to time. Therefore I implemented functions to give a USB path instead. This path looks the same as the Linux kernel uses (eg. "4-1.2") and contains the USB bus and port numbers. I'll hope you'll find my patch acceptable. Best Regards, Alex Add functions to query devices via path, and path from a device. The path is formatted similar to Linux USB device names (bus number, hyphen, ports separated by dots, eg. "4-1.2"). --- include/rtl-sdr.h | 25 +++++++ src/convenience/convenience.c | 10 +++ src/librtlsdr.c | 121 ++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) diff --git a/include/rtl-sdr.h b/include/rtl-sdr.h index d64701e..e6ce33a 100644 --- a/include/rtl-sdr.h +++ b/include/rtl-sdr.h @@ -49,6 +49,31 @@ RTLSDR_API int rtlsdr_get_device_usb_strings(uint32_t index, char *product, char *serial); +/*! + * Get device index by USB path string. + * + * The path string has the format "bus-port.port..." + * (i.e. the bus number, followed by a hyphen, then + * followed by the port numbers separated by dots). + * + * \param path path string of the device + * \return device index of the device with the given path + * \return -1 if no matching device was found. + */ +RTLSDR_API int rtlsdr_get_index_by_path(const char *path); + +/*! + * Get the USB path. + * + * NOTE: The buffer should provide space for at least 32 bytes. + * + * \param index the device index + * \param buf buffer where the path will be written + * \param len size of the buffer + * \return 0 on success + */ +RTLSDR_API int rtlsdr_get_device_path(uint32_t index, char *buf, size_t len); + /*! * Get device index by USB serial string descriptor. * diff --git a/src/convenience/convenience.c b/src/convenience/convenience.c index 00cc2cc..55f82e2 100644 --- a/src/convenience/convenience.c +++ b/src/convenience/convenience.c @@ -268,6 +268,16 @@ int verbose_device_search(char *s) device, rtlsdr_get_device_name((uint32_t)device)); return device; } + /* does string match a path */ + if (s2[0] == '-') { + i = rtlsdr_get_index_by_path(s); + if (i >= 0) { + device = i; + fprintf(stderr, "Using device %d: %s\n", + device, rtlsdr_get_device_name((uint32_t)device)); + return device; + } + } /* does string exact match a serial */ for (i = 0; i < device_count; i++) { rtlsdr_get_device_usb_strings(i, vendor, product, serial); diff --git a/src/librtlsdr.c b/src/librtlsdr.c index 0146298..e3f03d7 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -1414,6 +1414,127 @@ int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact, return r; } +static void get_device_path(libusb_device *dev, char *buf, size_t len) +{ + uint8_t port_numbers[16]; + int port_entries; + int i, count; + + count = snprintf(buf, len, "%d-", (int)libusb_get_bus_number(dev)); + if (count < 0) { + buf[0] = 0; + return; + } + else if ((size_t)count >= len) { + buf[len-1] = 0; + return; + } + + len -= count; + buf += count; + + port_entries = libusb_get_port_numbers(dev, port_numbers, sizeof(port_numbers)/sizeof(port_numbers[0])); + if (port_entries < 0) + return; + + for (i = 0; i < port_entries; i++) { + count = snprintf(buf, len, i ? ".%d" : "%d", (int) port_numbers[i]); + + if (count < 0) { + buf[0] = 0; + break; + } + else if ((size_t)count >= len) { + buf[len-1] = 0; + break; + } + + len -= count; + buf += count; + } + + if (!port_entries && len > 1) { + buf[0] = '0'; + buf[1] = 0; + } +} + +int rtlsdr_get_index_by_path(const char *path) +{ + libusb_context *ctx; + libusb_device **list; + struct libusb_device_descriptor dd; + ssize_t cnt; + int i,r,pos; + + r = libusb_init(&ctx); + + if(r < 0) + return -1; + + cnt = libusb_get_device_list(ctx, &list); + + pos = 0; + for (i = 0; i < cnt; i++) { + libusb_get_device_descriptor(list[i], &dd); + + if (find_known_device(dd.idVendor, dd.idProduct)) { + char buf[64]; + get_device_path(list[i], buf, sizeof(buf)); + + if (!strncmp(path, buf, sizeof(buf))) { + libusb_free_device_list(list, 1); + libusb_exit(ctx); + + return pos; + } + + pos++; + } + } + + libusb_free_device_list(list, 1); + libusb_exit(ctx); + + return -1; +} + +int rtlsdr_get_device_path(uint32_t index, char *buf, size_t len) +{ + libusb_context *ctx; + libusb_device **list; + struct libusb_device_descriptor dd; + int i,r; + uint32_t device_count = 0; + ssize_t cnt; + + r = libusb_init(&ctx); + if(r < 0) + return r; + + cnt = libusb_get_device_list(ctx, &list); + + r = LIBUSB_ERROR_NO_DEVICE; + for (i = 0; i < cnt; i++) { + libusb_get_device_descriptor(list[i], &dd); + + if (find_known_device(dd.idVendor, dd.idProduct)) { + device_count++; + + if (index == device_count - 1) { + get_device_path(list[i], buf, len); + r = 0; + break; + } + } + } + + libusb_free_device_list(list, 1); + libusb_exit(ctx); + + return r; +} + int rtlsdr_get_index_by_serial(const char *serial) { int i, cnt, r; -- 2.20.1

3 years, 10 months

1
0
0 0

[PATCH] Replace some Boost classes with C++11

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> A lot of Boost functionality is available in C++11. Since GNU Radio is moving away from Boost, it probably makes sense to do so in gr-osmosdr as well. This change removes all usage of boost::mutex, boost::mutex::scoped_lock, boost::unique_lock, and boost::condition_variable. It also removes usage of boost::shared_ptr and boost::weak_ptr outside of block definitions (which must continue to use Boost until GNU Radio 3.9). --- include/osmosdr/pimpl.h | 6 +++--- lib/airspy/airspy_source_c.cc | 2 +- lib/airspy/airspy_source_c.h | 9 +++++---- lib/airspyhf/airspyhf_source_c.cc | 2 +- lib/airspyhf/airspyhf_source_c.h | 9 +++++---- lib/bladerf/bladerf_common.cc | 15 +++++++-------- lib/bladerf/bladerf_common.h | 11 +++++------ lib/device.cc | 6 +++--- lib/freesrp/freesrp_common.cc | 3 +-- lib/freesrp/freesrp_common.h | 3 ++- lib/hackrf/hackrf_sink_c.cc | 4 ++-- lib/hackrf/hackrf_source_c.cc | 4 ++-- lib/miri/miri_source_c.cc | 6 +++--- lib/miri/miri_source_c.h | 9 +++++---- lib/osmosdr/osmosdr_src_c.cc | 6 +++--- lib/osmosdr/osmosdr_src_c.h | 9 +++++---- lib/rfspace/rfspace_source_c.cc | 6 +++--- lib/rfspace/rfspace_source_c.h | 15 ++++++++------- lib/rtl/rtl_source_c.cc | 6 +++--- lib/rtl/rtl_source_c.h | 9 +++++---- lib/sdrplay/sdrplay_source_c.h | 7 ++++--- lib/soapy/soapy_common.cc | 4 ++-- lib/soapy/soapy_common.h | 5 +++-- lib/soapy/soapy_sink_c.cc | 4 ++-- lib/soapy/soapy_source_c.cc | 4 ++-- 25 files changed, 85 insertions(+), 79 deletions(-) diff --git a/include/osmosdr/pimpl.h b/include/osmosdr/pimpl.h index e1985b4392..3a99994879 100644 --- a/include/osmosdr/pimpl.h +++ b/include/osmosdr/pimpl.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_OSMOSDR_PIMPL_H #define INCLUDED_OSMOSDR_PIMPL_H -#include <boost/shared_ptr.hpp> +#include <memory> /*! \file pimpl.h * "Pimpl idiom" (pointer to implementation idiom). @@ -39,7 +39,7 @@ * \param _name the name of the pimpl class */ #define OSMOSDR_PIMPL_DECL(_name) \ - struct _name; boost::shared_ptr<_name> + struct _name; std::shared_ptr<_name> /*! * Make an instance of a pimpl in a source file. @@ -49,6 +49,6 @@ * \param _args the constructor args for the pimpl */ #define OSMOSDR_PIMPL_MAKE(_name, _args) \ - boost::shared_ptr<_name>(new _name _args) + std::shared_ptr<_name>(new _name _args) #endif /* INCLUDED_OSMOSDR_PIMPL_H */ diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 50150e510a..af578d0379 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -291,7 +291,7 @@ int airspy_source_c::work( int noutput_items, if ( ! running ) return WORK_DONE; - boost::unique_lock<boost::mutex> lock(_fifo_lock); + std::unique_lock<std::mutex> lock(_fifo_lock); /* Wait until we have the requested number of samples */ int n_samples_avail = _fifo->size(); diff --git a/lib/airspy/airspy_source_c.h b/lib/airspy/airspy_source_c.h index f8617e62d0..a7d817fc61 100644 --- a/lib/airspy/airspy_source_c.h +++ b/lib/airspy/airspy_source_c.h @@ -23,8 +23,9 @@ #define INCLUDED_AIRSPY_SOURCE_C_H #include <boost/circular_buffer.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include <gnuradio/sync_block.h> @@ -128,8 +129,8 @@ private: airspy_device *_dev; boost::circular_buffer<gr_complex> *_fifo; - boost::mutex _fifo_lock; - boost::condition_variable _samp_avail; + std::mutex _fifo_lock; + std::condition_variable _samp_avail; std::vector< std::pair<double, uint32_t> > _sample_rates; double _sample_rate; diff --git a/lib/airspyhf/airspyhf_source_c.cc b/lib/airspyhf/airspyhf_source_c.cc index 327fe19b8d..f90b60b22d 100644 --- a/lib/airspyhf/airspyhf_source_c.cc +++ b/lib/airspyhf/airspyhf_source_c.cc @@ -239,7 +239,7 @@ int airspyhf_source_c::work( int noutput_items, if ( ! running ) return WORK_DONE; - boost::unique_lock<boost::mutex> lock(_fifo_lock); + std::unique_lock<std::mutex> lock(_fifo_lock); /* Wait until we have the requested number of samples */ int n_samples_avail = _fifo->size(); diff --git a/lib/airspyhf/airspyhf_source_c.h b/lib/airspyhf/airspyhf_source_c.h index cfb8c89a7f..dbdd87ae0e 100644 --- a/lib/airspyhf/airspyhf_source_c.h +++ b/lib/airspyhf/airspyhf_source_c.h @@ -23,8 +23,9 @@ #define INCLUDED_AIRSPYHF_SOURCE_C_H #include <boost/circular_buffer.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include <gnuradio/sync_block.h> @@ -105,8 +106,8 @@ private: airspyhf_device *_dev; boost::circular_buffer<gr_complex> *_fifo; - boost::mutex _fifo_lock; - boost::condition_variable _samp_avail; + std::mutex _fifo_lock; + std::condition_variable _samp_avail; std::vector< std::pair<double, uint32_t> > _sample_rates; double _sample_rate; diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc index 4327d44cb5..19b8a021a0 100644 --- a/lib/bladerf/bladerf_common.cc +++ b/lib/bladerf/bladerf_common.cc @@ -38,7 +38,6 @@ #include <boost/foreach.hpp> #include <boost/format.hpp> #include <boost/lexical_cast.hpp> -#include <boost/weak_ptr.hpp> #include "bladerf_common.h" @@ -50,8 +49,8 @@ static size_t const STREAM_TIMEOUT_MS = 3000; using namespace boost::assign; -boost::mutex bladerf_common::_devs_mutex; -std::list<boost::weak_ptr<struct bladerf>> bladerf_common::_devs; +std::mutex bladerf_common::_devs_mutex; +std::list<std::weak_ptr<struct bladerf>> bladerf_common::_devs; /* name for system-wide gain (which is not its own libbladeRF gain stage) */ static const char *SYSTEM_GAIN_NAME = "system"; @@ -1079,7 +1078,7 @@ bladerf_sptr bladerf_common::open(std::string const &device_name) struct bladerf *raw_dev = NULL; struct bladerf_devinfo devinfo; - boost::unique_lock<boost::mutex> lock(_devs_mutex); + std::lock_guard<std::mutex> lock(_devs_mutex); /* Initialize the information used to identify the desired device * to all wildcard (i.e., "any device") values */ @@ -1109,15 +1108,15 @@ bladerf_sptr bladerf_common::open(std::string const &device_name) /* Add the device handle to our cache */ bladerf_sptr dev = bladerf_sptr(raw_dev, bladerf_common::close); - _devs.push_back(static_cast<boost::weak_ptr<struct bladerf>>(dev)); + _devs.push_back(static_cast<std::weak_ptr<struct bladerf>>(dev)); return dev; } void bladerf_common::close(void *dev) { - boost::unique_lock<boost::mutex> lock(_devs_mutex); - std::list<boost::weak_ptr<struct bladerf>>::iterator it(_devs.begin()); + std::lock_guard<std::mutex> lock(_devs_mutex); + std::list<std::weak_ptr<struct bladerf>>::iterator it(_devs.begin()); /* Prune expired entries from device cache */ while (it != _devs.end()) { @@ -1137,7 +1136,7 @@ bladerf_sptr bladerf_common::get_cached_device(struct bladerf_devinfo devinfo) int status; struct bladerf_devinfo other_devinfo; - BOOST_FOREACH(boost::weak_ptr<struct bladerf> dev, _devs) { + BOOST_FOREACH(std::weak_ptr<struct bladerf> dev, _devs) { status = bladerf_get_devinfo(bladerf_sptr(dev).get(), &other_devinfo); if (status < 0) { BLADERF_THROW_STATUS(status, "Failed to get devinfo for cached device"); diff --git a/lib/bladerf/bladerf_common.h b/lib/bladerf/bladerf_common.h index 27afa83f45..741b1e75b4 100644 --- a/lib/bladerf/bladerf_common.h +++ b/lib/bladerf/bladerf_common.h @@ -23,12 +23,11 @@ #include <list> #include <map> +#include <memory> +#include <mutex> #include <string> #include <vector> -#include <boost/thread/mutex.hpp> -#include <boost/weak_ptr.hpp> - #include <libbladeRF.h> #include "osmosdr/ranges.h" @@ -43,7 +42,7 @@ typedef ptrdiff_t ssize_t; #define BLADERF_DEBUG_ENABLE -typedef boost::shared_ptr<struct bladerf> bladerf_sptr; +typedef std::shared_ptr<struct bladerf> bladerf_sptr; /* Identification of the bladeRF hardware in use */ typedef enum { @@ -287,8 +286,8 @@ private: /***************************************************************************** * Private members ****************************************************************************/ - static boost::mutex _devs_mutex; /**< mutex for access to _devs */ - static std::list<boost::weak_ptr<struct bladerf>> _devs; /**< dev cache */ + static std::mutex _devs_mutex; /**< mutex for access to _devs */ + static std::list<std::weak_ptr<struct bladerf>> _devs; /**< dev cache */ }; #endif diff --git a/lib/device.cc b/lib/device.cc index 586062fa89..015383dbd4 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -22,8 +22,8 @@ #include <stdexcept> #include <boost/foreach.hpp> #include <boost/format.hpp> -#include <boost/thread/mutex.hpp> #include <algorithm> +#include <mutex> #include <sstream> #ifdef HAVE_CONFIG_H @@ -102,7 +102,7 @@ static const std::string args_delim = " "; static const std::string pairs_delim = ","; static const std::string pair_delim = "="; -static boost::mutex _device_mutex; +static std::mutex _device_mutex; device_t::device_t(const std::string &args) { @@ -141,7 +141,7 @@ std::string device_t::to_string(void) const devices_t device::find(const device_t &hint) { - boost::mutex::scoped_lock lock(_device_mutex); + std::lock_guard<std::mutex> lock(_device_mutex); bool fake = true; diff --git a/lib/freesrp/freesrp_common.cc b/lib/freesrp/freesrp_common.cc index d60fbb84b0..57bbdbba0a 100644 --- a/lib/freesrp/freesrp_common.cc +++ b/lib/freesrp/freesrp_common.cc @@ -2,7 +2,6 @@ #include <cstdlib> -#include <boost/make_shared.hpp> #include <boost/assign.hpp> #include <arg_helpers.h> @@ -11,7 +10,7 @@ using namespace FreeSRP; using namespace std; using namespace boost::assign; -boost::shared_ptr<::FreeSRP::FreeSRP> freesrp_common::_srp; +std::shared_ptr<::FreeSRP::FreeSRP> freesrp_common::_srp; freesrp_common::freesrp_common(const string &args) { diff --git a/lib/freesrp/freesrp_common.h b/lib/freesrp/freesrp_common.h index 9a5687ca46..8d13c47cef 100644 --- a/lib/freesrp/freesrp_common.h +++ b/lib/freesrp/freesrp_common.h @@ -1,6 +1,7 @@ #ifndef INCLUDED_FREESRP_COMMON_H #define INCLUDED_FREESRP_COMMON_H +#include <memory> #include <vector> #include <string> @@ -22,7 +23,7 @@ public: double set_freq_corr( double ppm, size_t chan = 0 ); double get_freq_corr( size_t chan = 0 ); protected: - static boost::shared_ptr<::FreeSRP::FreeSRP> _srp; + static std::shared_ptr<::FreeSRP::FreeSRP> _srp; bool _ignore_overflow = false; }; diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc index 7271109b15..1762934443 100644 --- a/lib/hackrf/hackrf_sink_c.cc +++ b/lib/hackrf/hackrf_sink_c.cc @@ -196,7 +196,7 @@ int hackrf_sink_c::hackrf_tx_callback(unsigned char *buffer, uint32_t length) *buffer++ = rand() % 255; #else { - std::unique_lock<std::mutex> lock(_buf_mutex); + std::lock_guard<std::mutex> lock(_buf_mutex); if ( ! cb_pop_front( &_cbuf, buffer ) ) { memset(buffer, 0, length); @@ -372,7 +372,7 @@ int hackrf_sink_c::work( int noutput_items, if((unsigned int)noutput_items >= remaining) { { - std::unique_lock<std::mutex> lock(_buf_mutex); + std::lock_guard<std::mutex> lock(_buf_mutex); if ( ! cb_push_back( &_cbuf, _buf ) ) { _buf_used = prev_buf_used; diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index eea5caafda..0c0ae21eb6 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -151,7 +151,7 @@ int hackrf_source_c::_hackrf_rx_callback(hackrf_transfer *transfer) int hackrf_source_c::hackrf_rx_callback(unsigned char *buf, uint32_t len) { { - std::unique_lock<std::mutex> lock(_buf_mutex); + std::lock_guard<std::mutex> lock(_buf_mutex); int buf_tail = (_buf_head + _buf_used) % _buf_num; memcpy(_buf[buf_tail], buf, len); @@ -231,7 +231,7 @@ int hackrf_source_c::work( int noutput_items, *out++ = _lut[ *(buf + i) ]; { - std::unique_lock<std::mutex> lock(_buf_mutex); + std::lock_guard<std::mutex> lock(_buf_mutex); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; diff --git a/lib/miri/miri_source_c.cc b/lib/miri/miri_source_c.cc index c9f81fac3b..c1b9428fbb 100644 --- a/lib/miri/miri_source_c.cc +++ b/lib/miri/miri_source_c.cc @@ -182,7 +182,7 @@ void miri_source_c::mirisdr_callback(unsigned char *buf, uint32_t len) } { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); if (len > BUF_SIZE) throw std::runtime_error("Buffer too small."); @@ -226,7 +226,7 @@ int miri_source_c::work( int noutput_items, gr_complex *out = (gr_complex *)output_items[0]; { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock( _buf_mutex ); while (_buf_used < 3 && _running) // collect at least 3 buffers _buf_cond.wait( lock ); @@ -250,7 +250,7 @@ int miri_source_c::work( int noutput_items, float(*(buf + i * 2 + 1)) * (1.0f/4096.0f) ); { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; diff --git a/lib/miri/miri_source_c.h b/lib/miri/miri_source_c.h index 5363db5382..1ea906f27a 100644 --- a/lib/miri/miri_source_c.h +++ b/lib/miri/miri_source_c.h @@ -23,8 +23,9 @@ #include <gnuradio/sync_block.h> #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include "source_iface.h" @@ -120,8 +121,8 @@ private: unsigned int _buf_num; unsigned int _buf_head; unsigned int _buf_used; - boost::mutex _buf_mutex; - boost::condition_variable _buf_cond; + std::mutex _buf_mutex; + std::condition_variable _buf_cond; bool _running; unsigned int _buf_offset; diff --git a/lib/osmosdr/osmosdr_src_c.cc b/lib/osmosdr/osmosdr_src_c.cc index de65373cb6..e4f8b89944 100644 --- a/lib/osmosdr/osmosdr_src_c.cc +++ b/lib/osmosdr/osmosdr_src_c.cc @@ -179,7 +179,7 @@ void osmosdr_src_c::osmosdr_callback(unsigned char *buf, uint32_t len) } { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); int buf_tail = (_buf_head + _buf_used) % _buf_num; memcpy(_buf[buf_tail], buf, len); @@ -219,7 +219,7 @@ int osmosdr_src_c::work( int noutput_items, gr_complex *out = (gr_complex *)output_items[0]; { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock( _buf_mutex ); while (_buf_used < 3 && _running) // collect at least 3 buffers _buf_cond.wait( lock ); @@ -243,7 +243,7 @@ int osmosdr_src_c::work( int noutput_items, float(*(buf + i * 2 + 1)) * (1.0f/32767.5f) ); { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; diff --git a/lib/osmosdr/osmosdr_src_c.h b/lib/osmosdr/osmosdr_src_c.h index 0f62b09b2c..f8f18ec776 100644 --- a/lib/osmosdr/osmosdr_src_c.h +++ b/lib/osmosdr/osmosdr_src_c.h @@ -23,8 +23,9 @@ #include <gnuradio/sync_block.h> #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include "source_iface.h" @@ -124,8 +125,8 @@ private: unsigned int _buf_len; unsigned int _buf_head; unsigned int _buf_used; - boost::mutex _buf_mutex; - boost::condition_variable _buf_cond; + std::mutex _buf_mutex; + std::condition_variable _buf_cond; bool _running; unsigned int _buf_offset; diff --git a/lib/rfspace/rfspace_source_c.cc b/lib/rfspace/rfspace_source_c.cc index 80f34df3c6..121dcde032 100644 --- a/lib/rfspace/rfspace_source_c.cc +++ b/lib/rfspace/rfspace_source_c.cc @@ -590,7 +590,7 @@ bool rfspace_source_c::transaction( const unsigned char *cmd, size_t size, if ( write(_usb, cmd, size) != (int)size ) return false; - boost::unique_lock<boost::mutex> lock(_resp_lock); + std::unique_lock<std::mutex> lock(_resp_lock); _resp_avail.wait(lock); rx_bytes = _resp.size(); @@ -598,7 +598,7 @@ bool rfspace_source_c::transaction( const unsigned char *cmd, size_t size, } else { - boost::mutex::scoped_lock lock(_tcp_lock); + std::lock_guard<std::mutex> lock(_tcp_lock); #ifdef USE_ASIO _t.write_some( boost::asio::buffer(cmd, size) ); @@ -829,7 +829,7 @@ int rfspace_source_c::work( int noutput_items, { gr_complex *out = (gr_complex *)output_items[0]; - boost::unique_lock<boost::mutex> lock(_fifo_lock); + std::unique_lock<std::mutex> lock(_fifo_lock); /* Wait until we have the requested number of samples */ int n_samples_avail = _fifo->size(); diff --git a/lib/rfspace/rfspace_source_c.h b/lib/rfspace/rfspace_source_c.h index c65606348b..a51bfc6f8a 100644 --- a/lib/rfspace/rfspace_source_c.h +++ b/lib/rfspace/rfspace_source_c.h @@ -30,8 +30,9 @@ #include <gnuradio/sync_block.h> #include <boost/circular_buffer.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include "osmosdr/ranges.h" #include "source_iface.h" @@ -164,15 +165,15 @@ private: /* members */ gr::thread::thread _thread; bool _run_usb_read_task; bool _run_tcp_keepalive_task; - boost::mutex _tcp_lock; + std::mutex _tcp_lock; boost::circular_buffer<gr_complex> *_fifo; - boost::mutex _fifo_lock; - boost::condition_variable _samp_avail; + std::mutex _fifo_lock; + std::condition_variable _samp_avail; std::vector< unsigned char > _resp; - boost::mutex _resp_lock; - boost::condition_variable _resp_avail; + std::mutex _resp_lock; + std::condition_variable _resp_avail; }; #endif /* INCLUDED_RFSPACE_SOURCE_C_H */ diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a37146402a..e312ed79ec 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -298,7 +298,7 @@ void rtl_source_c::rtlsdr_callback(unsigned char *buf, uint32_t len) } { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); int buf_tail = (_buf_head + _buf_used) % _buf_num; memcpy(_buf[buf_tail], buf, len); @@ -338,7 +338,7 @@ int rtl_source_c::work( int noutput_items, gr_complex *out = (gr_complex *)output_items[0]; { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock( _buf_mutex ); while (_buf_used < 3 && _running) // collect at least 3 buffers _buf_cond.wait( lock ); @@ -359,7 +359,7 @@ int rtl_source_c::work( int noutput_items, if (!_samp_avail) { { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::lock_guard<std::mutex> lock( _buf_mutex ); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; diff --git a/lib/rtl/rtl_source_c.h b/lib/rtl/rtl_source_c.h index 902b386ae8..de3e349b26 100644 --- a/lib/rtl/rtl_source_c.h +++ b/lib/rtl/rtl_source_c.h @@ -25,8 +25,9 @@ #include <gnuradio/sync_block.h> #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include "source_iface.h" @@ -131,8 +132,8 @@ private: unsigned int _buf_len; unsigned int _buf_head; unsigned int _buf_used; - boost::mutex _buf_mutex; - boost::condition_variable _buf_cond; + std::mutex _buf_mutex; + std::condition_variable _buf_cond; bool _running; unsigned int _buf_offset; diff --git a/lib/sdrplay/sdrplay_source_c.h b/lib/sdrplay/sdrplay_source_c.h index 2e4631ea8c..b59f44a754 100644 --- a/lib/sdrplay/sdrplay_source_c.h +++ b/lib/sdrplay/sdrplay_source_c.h @@ -24,8 +24,9 @@ #include <gnuradio/sync_block.h> #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> + +#include <mutex> +#include <condition_variable> #include "osmosdr/ranges.h" @@ -126,7 +127,7 @@ private: std::vector< short > _bufi; std::vector< short > _bufq; int _buf_offset; - boost::mutex _buf_mutex; + std::mutex _buf_mutex; bool _running; bool _uninit; diff --git a/lib/soapy/soapy_common.cc b/lib/soapy/soapy_common.cc index 0e277e4e21..e241967bb9 100644 --- a/lib/soapy/soapy_common.cc +++ b/lib/soapy/soapy_common.cc @@ -36,8 +36,8 @@ osmosdr::gain_range_t soapy_range_to_gain_range(const SoapySDR::Range &r) return osmosdr::gain_range_t(r.minimum(), r.maximum(), step); } -boost::mutex &get_soapy_maker_mutex(void) +std::mutex &get_soapy_maker_mutex(void) { - static boost::mutex m; + static std::mutex m; return m; } diff --git a/lib/soapy/soapy_common.h b/lib/soapy/soapy_common.h index 87e46a5730..8adb0db515 100644 --- a/lib/soapy/soapy_common.h +++ b/lib/soapy/soapy_common.h @@ -23,7 +23,8 @@ #include <osmosdr/ranges.h> #include <SoapySDR/Types.hpp> -#include <boost/thread/mutex.hpp> + +#include <mutex> /*! * Convert a soapy range to a gain range. @@ -35,6 +36,6 @@ osmosdr::gain_range_t soapy_range_to_gain_range(const SoapySDR::Range &r); * Global mutex to protect factory routines. * (optional under 0.5 release above) */ -boost::mutex &get_soapy_maker_mutex(void); +std::mutex &get_soapy_maker_mutex(void); #endif /* INCLUDED_SOAPY_COMMON_H */ diff --git a/lib/soapy/soapy_sink_c.cc b/lib/soapy/soapy_sink_c.cc index b12b8daca2..e4422f7f45 100644 --- a/lib/soapy/soapy_sink_c.cc +++ b/lib/soapy/soapy_sink_c.cc @@ -63,7 +63,7 @@ soapy_sink_c::soapy_sink_c (const std::string &args) gr::io_signature::make (0, 0, 0)) { { - boost::mutex::scoped_lock l(get_soapy_maker_mutex()); + std::lock_guard<std::mutex> l(get_soapy_maker_mutex()); _device = SoapySDR::Device::make(params_to_dict(args)); } _nchan = std::max(1, args_to_io_signature(args)->max_streams()); @@ -75,7 +75,7 @@ soapy_sink_c::soapy_sink_c (const std::string &args) soapy_sink_c::~soapy_sink_c(void) { _device->closeStream(_stream); - boost::mutex::scoped_lock l(get_soapy_maker_mutex()); + std::lock_guard<std::mutex> l(get_soapy_maker_mutex()); SoapySDR::Device::unmake(_device); } diff --git a/lib/soapy/soapy_source_c.cc b/lib/soapy/soapy_source_c.cc index a6453618ab..3f65b2766c 100644 --- a/lib/soapy/soapy_source_c.cc +++ b/lib/soapy/soapy_source_c.cc @@ -64,7 +64,7 @@ soapy_source_c::soapy_source_c (const std::string &args) args_to_io_signature(args)) { { - boost::mutex::scoped_lock l(get_soapy_maker_mutex()); + std::lock_guard<std::mutex> l(get_soapy_maker_mutex()); _device = SoapySDR::Device::make(params_to_dict(args)); } _nchan = std::max(1, args_to_io_signature(args)->max_streams()); @@ -76,7 +76,7 @@ soapy_source_c::soapy_source_c (const std::string &args) soapy_source_c::~soapy_source_c(void) { _device->closeStream(_stream); - boost::mutex::scoped_lock l(get_soapy_maker_mutex()); + std::lock_guard<std::mutex> l(get_soapy_maker_mutex()); SoapySDR::Device::unmake(_device); } -- 2.25.1

3 years, 11 months

1
0
0 0

[PATCH] fcd: restore support for FUNcube Dongle and Pro+

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Support for the original FUNcube Dongle used to live in GNU Radio's gr-fcd module, which was removed in version 3.8. As a result, gr-osmosdr lost support for both FUNcube Dongle and FUNcube Dongle Pro+. The gr-fcdproplus out-of-tree module subsequently added support for the original FUNcube Dongle, meaning that it now supports both types. As a result, FUNcube support can easily be restored in gr-osmosdr. The #ifdefs are no longer required, since everything is in a single module now. --- CMakeLists.txt | 1 + cmake/Modules/FindGnuradioFCDPP.cmake | 27 +++++++++++++++++++++++++++ lib/CMakeLists.txt | 8 ++++++++ lib/fcd/CMakeLists.txt | 21 ++++----------------- lib/fcd/fcd_source_c.cc | 18 +----------------- lib/fcd/fcd_source_c.h | 13 ++----------- 6 files changed, 43 insertions(+), 45 deletions(-) create mode 100644 cmake/Modules/FindGnuradioFCDPP.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a2cf9df3d..14a9ddda7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,7 @@ find_package(LibHackRF) find_package(LibAIRSPY) find_package(LibAIRSPYHF) find_package(LibbladeRF) +find_package(GnuradioFCDPP) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) find_package(Doxygen) diff --git a/cmake/Modules/FindGnuradioFCDPP.cmake b/cmake/Modules/FindGnuradioFCDPP.cmake new file mode 100644 index 0000000000..f81fe8aa41 --- /dev/null +++ b/cmake/Modules/FindGnuradioFCDPP.cmake @@ -0,0 +1,27 @@ +if(NOT GNURADIO_FCDPP_FOUND) + pkg_check_modules (GNURADIO_FCDPP_PKG libgnuradio-fcdproplus) + find_path(GNURADIO_FCDPP_INCLUDE_DIRS NAMES fcdproplus/api.h + PATHS + ${GNURADIO_FCDPP_PKG_INCLUDE_DIRS} + /usr/include + /usr/local/include + ) + + find_library(GNURADIO_FCDPP_LIBRARIES NAMES gnuradio-fcdproplus + PATHS + ${GNURADIO_FCDPP_PKG_LIBRARY_DIRS} + /usr/lib + /usr/local/lib + ) + +if(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + set(GNURADIO_FCDPP_FOUND TRUE CACHE INTERNAL "gnuradio-fcdproplus found") + message(STATUS "Found gnuradio-fcdproplus: ${GNURADIO_FCDPP_INCLUDE_DIRS}, ${GNURADIO_FCDPP_LIBRARIES}") +else(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + set(GNURADIO_FCDPP_FOUND FALSE CACHE INTERNAL "gnuradio-fcdproplus found") + message(STATUS "gnuradio-fcdproplus not found.") +endif(GNURADIO_FCDPP_INCLUDE_DIRS AND GNURADIO_FCDPP_LIBRARIES) + +mark_as_advanced(GNURADIO_FCDPP_LIBRARIES GNURADIO_FCDPP_INCLUDE_DIRS) + +endif(NOT GNURADIO_FCDPP_FOUND) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d04cb1d402..3199ef3d79 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -135,6 +135,14 @@ if(ENABLE_OSMOSDR) add_subdirectory(osmosdr) endif(ENABLE_OSMOSDR) +######################################################################## +# Setup FCD component +######################################################################## +GR_REGISTER_COMPONENT("FUNcube Dongle" ENABLE_FCD GNURADIO_FCDPP_FOUND) +if(ENABLE_FCD) + add_subdirectory(fcd) +endif(ENABLE_FCD) + ######################################################################## # Setup File component ######################################################################## diff --git a/lib/fcd/CMakeLists.txt b/lib/fcd/CMakeLists.txt index 146191f7ac..7a515c71fc 100644 --- a/lib/fcd/CMakeLists.txt +++ b/lib/fcd/CMakeLists.txt @@ -23,25 +23,12 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${GNURADIO_FCDPP_INCLUDE_DIRS} ) -if(ENABLE_FCD) - target_include_directories(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcd_INCLUDE_DIRS} - ) - target_link_libraries(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcd_LIBRARIES} - ) -endif(ENABLE_FCD) - -if(ENABLE_FCDPP) - target_include_directories(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcdpp_INCLUDE_DIRS} - ) - target_link_libraries(gnuradio-osmosdr PRIVATE - ${Gnuradio-fcdpp_LIBRARIES} - ) -endif(ENABLE_FCDPP) +target_link_libraries(gnuradio-osmosdr + ${GNURADIO_FCDPP_LIBRARIES} +) list(APPEND gr_osmosdr_srcs ${CMAKE_CURRENT_SOURCE_DIR}/fcd_source_c.cc diff --git a/lib/fcd/fcd_source_c.cc b/lib/fcd/fcd_source_c.cc index 885d514787..744fa69553 100644 --- a/lib/fcd/fcd_source_c.cc +++ b/lib/fcd/fcd_source_c.cc @@ -142,18 +142,15 @@ fcd_source_c::fcd_source_c(const std::string &args) : std::cerr << "Using " << name() << " (" << dev_name << ")" << std::endl; -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) { - _src_v1 = gr::fcd::source_c::make( dev_name ); + _src_v1 = gr::fcdproplus::fcd::make( dev_name ); connect( _src_v1, 0, self(), 0 ); set_gain( 20, "LNA" ); set_gain( 12, "MIX" ); } -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) { _src_v2 = gr::fcdproplus::fcdproplus::make( dev_name ); @@ -163,7 +160,6 @@ fcd_source_c::fcd_source_c(const std::string &args) : set_gain( 1, "MIX" ); set_gain( 15, "BB" ); } -#endif } fcd_source_c::~fcd_source_c() @@ -241,15 +237,11 @@ osmosdr::freq_range_t fcd_source_c::get_freq_range( size_t chan ) double fcd_source_c::set_center_freq( double freq, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) _src_v1->set_freq( float(freq) ); -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) _src_v2->set_freq( float(freq) ); -#endif _freq = freq; @@ -263,15 +255,11 @@ double fcd_source_c::get_center_freq( size_t chan ) double fcd_source_c::set_freq_corr( double ppm, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) _src_v1->set_freq_corr( ppm ); -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) _src_v2->set_freq_corr( ppm ); -#endif _correct = ppm; @@ -343,7 +331,6 @@ double fcd_source_c::set_gain( double gain, size_t chan ) double fcd_source_c::set_gain( double gain, const std::string & name, size_t chan ) { -#ifdef HAVE_FCD if ( FUNCUBE_V1 == _type ) { if ( "LNA" == name ) @@ -357,9 +344,7 @@ double fcd_source_c::set_gain( double gain, const std::string & name, size_t cha _src_v1->set_mixer_gain(_mix_gain); } } -#endif -#ifdef HAVE_FCDPP if ( FUNCUBE_V2 == _type ) { if ( "LNA" == name ) @@ -378,7 +363,6 @@ double fcd_source_c::set_gain( double gain, const std::string & name, size_t cha _src_v2->set_if_gain(_bb_gain); } } -#endif return get_gain( name, chan ); } diff --git a/lib/fcd/fcd_source_c.h b/lib/fcd/fcd_source_c.h index 70239f8533..2b02eb1052 100644 --- a/lib/fcd/fcd_source_c.h +++ b/lib/fcd/fcd_source_c.h @@ -22,13 +22,8 @@ #include <gnuradio/hier_block2.h> -#ifdef HAVE_FCD -#include <gnuradio/fcd/source_c.h> -#endif - -#ifdef HAVE_FCDPP +#include <fcdproplus/fcd.h> #include <fcdproplus/fcdproplus.h> -#endif #include "source_iface.h" @@ -86,12 +81,8 @@ public: private: dongle_type _type; -#ifdef HAVE_FCD - gr::fcd::source_c::sptr _src_v1; -#endif -#ifdef HAVE_FCDPP + gr::fcdproplus::fcd::sptr _src_v1; gr::fcdproplus::fcdproplus::sptr _src_v2; -#endif double _lna_gain, _mix_gain, _bb_gain, _freq; int _correct; }; -- 2.25.1

3 years, 11 months

1
0
0 0

fl2k on rpi4: no more USB error

by Carl-Fredrik Enell

Dear all, I found that the fix for the USB issue on ARM systems has finally made it into the Linux kernel, 5.6.14 and 5.7-rc6. Today I installed the latest Manjaro 64 unstable mainline kernel on my rpi4 and made some quick tests with fl-wspr (https://github.com/tejeez/fl2k-tool). There are no more USB errors*, but I still get underflow errors at high sample rates. In my quick tests the maximum reliable sample rate was about 20 MHz when running in an X session with other programs. When I stopped the X server and ran in a text console I could go above 30 MHz without underflows. This means that the rpi4 is fine as an SDR transceiver for many purposes- but it would be nice to know if it is possible to tune the system for a bit higher sample rates! All the best SM2YHP Fredrik * Installed AUR package libosmo-fl2k-git to fix other USB device issues -- ------------------ Carl-Fredrik Enell Föraregatan 26B SE-98139 Kiruna +46705508256 -----------------

3 years, 11 months

1
0
0 0

[PATCH] Loop in soapy_source_c::work() when readStream() returns SOAPY_SDR_OVERFLOW

by Anton Blanchard

I'm using an Airspy HF+ Discovery with the Soapy driver. Whenever I turn AGC off it stops receiving samples. On closer inspection, switching AGC off results in samples stalling for an extended period (hundreds of milliseconds). As such, we hit the timeout in SoapyAirspyHF::readStream() and return SOAPY_SDR_TIMEOUT (-1). Things go wrong at this point. It takes a long time before readStream() is called again, presumably because we returned 0 from work(). By this time our buffers have overflown, readStream() returns SOAPY_SDR_OVERFLOW (-2) and work() returns 0. We loop forever, continually overflowing buffers. Fix this by looping in soapy_source_c::work() when ->readStream() returns SOAPY_SDR_OVERFLOW so that we consume the buffers straight away. Signed-off-by: Anton Blanchard <anton(a)ozlabs.org> --- lib/soapy/soapy_source_c.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/soapy/soapy_source_c.cc b/lib/soapy/soapy_source_c.cc index a645361..9dcc885 100644 --- a/lib/soapy/soapy_source_c.cc +++ b/lib/soapy/soapy_source_c.cc @@ -96,9 +96,13 @@ int soapy_source_c::work( int noutput_items, { int flags = 0; long long timeNs = 0; - int ret = _device->readStream( - _stream, &output_items[0], - noutput_items, flags, timeNs); + int ret; + + do { + ret = _device->readStream( + _stream, &output_items[0], + noutput_items, flags, timeNs); + } while (ret == SOAPY_SDR_OVERFLOW); if (ret < 0) return 0; //call again return ret; -- 2.25.2

3 years, 11 months

3
4
0 0

[PATCH] librtlsdr: cmake: add options to enable/disable static or shared target in build

by Gwenhael Goavec-Merou

When librtlsdr is build with an environment with static libraries, the build fails with messages like: /buildroot/librtl/output/host/lib/gcc/aarch64-buildroot-linux-uclibc/8.4.0/../../../../aarch64-buildroot-linux-uclibc/bin/ld: /buildroot/librtl/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.a(libusb_1_0_la-core.o): relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `stderr' which may bind externally can not be used when making a shared object; recompile with -fPIC /buildroot/librtl/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.a(libusb_1_0_la-core.o): in function `usbi_log_str': core.c:(.text+0xf8): dangerous relocation: unsupported relocation This patch add options to select if librtlsdr must be build in static mode, shared mode or both. Adapted from https://github.com/steve-m/librtlsdr/pull/46 and https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_sha… Signed-off-by: Yuvaraj Patil <yuvaraj.patil(a)wipro.com> Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> --- src/CMakeLists.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33faee7..d82fc87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,8 @@ ######################################################################## # Setup shared library variant ######################################################################## +option(BUILD_SHARED_LIBS "Build shared library" ON) +if(BUILD_SHARED_LIBS) add_library(rtlsdr SHARED librtlsdr.c tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) target_link_libraries(rtlsdr PkgConfig::LIBUSB) @@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) generate_export_header(rtlsdr) +list(APPEND rtlsdr_lib rtlsdr) +endif() ######################################################################## # Setup static library variant ######################################################################## +option(BUILD_STATIC_LIBS "Build static library" ON) +if(BUILD_STATIC_LIBS) add_library(rtlsdr_static STATIC librtlsdr.c tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) @@ -47,6 +53,8 @@ if(NOT WIN32) set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) endif() generate_export_header(rtlsdr_static) +list(APPEND rtlsdr_lib rtlsdr_static) +endif() ######################################################################## # Set up Windows DLL resource files @@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) add_executable(rtl_adsb rtl_adsb.c) add_executable(rtl_power rtl_power.c) add_executable(rtl_biast rtl_biast.c) -set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) +set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -target_link_libraries(rtl_sdr rtlsdr convenience_static +target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_tcp rtlsdr convenience_static +target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_test rtlsdr convenience_static +target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_fm rtlsdr convenience_static +target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_eeprom rtlsdr convenience_static +target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_adsb rtlsdr convenience_static +target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_power rtlsdr convenience_static +target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -target_link_libraries(rtl_biast rtlsdr convenience_static +target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) @@ -156,12 +164,16 @@ endif() ######################################################################## # Install built library files & utilities ######################################################################## +if(BUILD_SHARED_LIBS) install(TARGETS rtlsdr EXPORT RTLSDR-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file ) +endif() +if(BUILD_STATIC_LIBS) install(TARGETS rtlsdr_static EXPORT RTLSDR-export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file ) +endif() install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power DESTINATION ${CMAKE_INSTALL_BINDIR} ) -- 2.26.2

3 years, 11 months

1
0
0 0

PS Name and PI code modification

by Marco Domenico Cimato

Hi everyone, thanks in advance for the support, where I can modify the subject value. I have found the variable inside rds_mod.c but I didn't find anywhere they are set. The request is made because seems the windows binaries has them but they were set and compiled or it's me that I didn't find where they are? Kind regards, Marco

4 years

2
2
0 0

Bug in rtl_sdr

by John Tiller

I believe there is a bug in rtl_sdr.c at lines 89 and 242. When bytes_to_read == len (or n_read), then bytes_to_read becomes 0 at lines 101 and 258 and the read never terminates since 0 means infinite read. I believe the fix is to change lines 89 and 242 to read: if ((bytes_to_read > 0) && (bytes_to_read <= len)) { // Versus bytes_to_read < len if ((bytes_to_read > 0) && (bytes_to_read <= (uint32_t)n_read)) { // Likewise John Tiller

4 years

1
0
0 0

OSMOCOM TRX_BTS_BSC Connection Issue

by Aalto Koskinen

Hi, I looked at the forum for answers before posting, but I unfortunately couldn't get answers to what I was looking for. I looked into particular https://www.mail-archive.com/openbsc@lists.osmocom.org/msg09819.html for solving my issue. Issue: I cannot connect BTS,TRX and BSC. The other modules of the network are able to connect to each other. I have the RSP POWEROFF message originating in log from TRX-UHD module and the BTS module is shuttiing down. BTS connects via OML but fails to connect RSL. I looked through the configuration files and seem correct to me. As per the previous email archive, I wanted to login to VTY and check the logs, but, it logs out as the BTS module shuts down (I cannot connect and see what's happening). Any suggestions would be appreciated on solving the issue. I am trying to create a test 2G OSMOCOM network. Logs are written below and configuration as attachments. Thanks for your help! *OSMO_BTS_TRX log:* systemd[1]: Started Osmocom osmo-bts for osmo-trx. osmo-bts-trx[23221]: <0017> control_if.c:911 CTRL at 127.0.0.1 4238 osmo-bts-trx[23221]: <0010> telnet_interface.c:104 Available via telnet 127.0.0.1 4241 osmo-bts-trx[23221]: <0012> input/ipaccess.c:1024 enabling ipaccess BTS mode, OML connecting to 192.168.0.9:3002 osmo-bts-trx[23221]: <000b> trx_if.c:1174 phy0.0: Open transceiver osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: <000d> abis.c:142 Signalling link down osmo-bts-trx[23221]: <0001> bts.c:292 Shutting down BTS 0, Reason Abis close osmo-bts-trx[23221]: <000b> trx_if.c:185 phy0.0: No satisfactory response from transceiver(CMD POWEROFF) osmo-bts-trx[23221]: Shutdown timer expired osmo-bts-trx[23221]: ((*)) osmo-bts-trx[23221]: | osmo-bts-trx[23221]: / \ OsmoBTS *OSMO_TRX_UHD log:* osmo-trx-lms[7995]: DTRXCTRL <0001> Transceiver.cpp:773 [tid=140437098583808][chan=0] command is 'POWEROFF' osmo-trx-lms[7995]: DTRXCTRL <0001> Transceiver.cpp:918 [tid=140437098583808][chan=0] response is 'RSP POWEROFF 0'

4 years

2
1
0 0

RTL-SDR Installation on Ubuntu 18.04

by Jenrica Decafe

Good day! I am Jenrica from the Philippines and I am currently developing a low-cost SDR ground radio receiver for L/S band satellites. I personally emailed you to ask for your build steps for rtlsdr on gnu radio installation (ubuntu 18.04). I have tried many ways already but I still can't find the rtl-sdr source in the GRC. Your positive response is highly appreciated. Thank you

4 years

2
1
0 0

Request for Comment: Creating a binary format output for rtl_power

by Bill Gaylord

Hello, I am working on making a binary format for rtl_power to save space on my server for observing the spectrum. I am wondering if anyone else would be interested in this idea. I am hoping keep the same format in terms of how the data is organized in the file but instead of using text use some form of binary format. For example for the date and time I think using a unix epoch timestamp would work. I am hoping to receive any comments or criticism. Thanks, KD9KCK

4 years, 1 month

6
7
0 0

Fix 64 bit casts in librtlsdr

by Christian Ebner

4 years, 2 months

2
1
0 0

[PATCH] cmake: Go back CMake min ver. 3.8 by removing need for CMP0079

by Piotr Krysik

CMake 3.13 is not present in older (~2 years old) Linux distributions and GNU Radio requires min CMake version 3.8. All that is needed in order to avoid bumping CMake version is to not use 'target_link_libraries' in subdirectories. Here this is done by creating a list of needed libraries and adding them for linking at the end (like it was done in gr-osmosdr before porting to GNU Radio 3.8). One thing that is lost here is 'PRIVATE' statement in case of FCD libraries linking. --- CMakeLists.txt | 3 +-- lib/CMakeLists.txt | 7 ++++--- lib/airspy/CMakeLists.txt | 2 +- lib/airspyhf/CMakeLists.txt | 2 +- lib/bladerf/CMakeLists.txt | 2 +- lib/fcd/CMakeLists.txt | 5 +++-- lib/file/CMakeLists.txt | 2 +- lib/freesrp/CMakeLists.txt | 2 +- lib/hackrf/CMakeLists.txt | 2 +- lib/miri/CMakeLists.txt | 2 +- lib/osmosdr/CMakeLists.txt | 2 +- lib/redpitaya/CMakeLists.txt | 2 +- lib/rtl/CMakeLists.txt | 2 +- lib/rtl_tcp/CMakeLists.txt | 2 +- lib/sdrplay/CMakeLists.txt | 2 +- lib/soapy/CMakeLists.txt | 2 +- lib/uhd/CMakeLists.txt | 2 +- 17 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a2cf9d..cf24991 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,14 +20,13 @@ ######################################################################## # Project setup ######################################################################## -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.8) include(GNUInstallDirs) project(gr-osmosdr CXX C) enable_testing() #policy setup cmake_policy(SET CMP0011 NEW) -cmake_policy(SET CMP0079 NEW) #select the release build type by default to get optimization flags if(NOT CMAKE_BUILD_TYPE) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d04cb1d..f8c9db7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -41,7 +41,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif() add_library(gnuradio-osmosdr SHARED) -target_link_libraries(gnuradio-osmosdr ${Boost_LIBRARIES} gnuradio::gnuradio-runtime) +list(APPEND gr_osmosdr_libs ${Boost_LIBRARIES} gnuradio::gnuradio-runtime) target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${Boost_INCLUDE_DIRS} @@ -100,7 +100,7 @@ CHECK_CXX_SOURCE_COMPILES(" if(HAVE_CLOCK_GETTIME) message(STATUS " High resolution timing supported through clock_gettime.") set(TIME_SPEC_DEFS HAVE_CLOCK_GETTIME) - target_link_libraries(gnuradio-osmosdr "-lrt") + list(APPEND gr_osmosdr_libs "-lrt") elseif(HAVE_MACH_ABSOLUTE_TIME) message(STATUS " High resolution timing supported through mach_absolute_time.") set(TIME_SPEC_DEFS HAVE_MACH_ABSOLUTE_TIME) @@ -124,7 +124,7 @@ GR_REGISTER_COMPONENT("Osmocom IQ Imbalance Correction" ENABLE_IQBALANCE gnuradi if(ENABLE_IQBALANCE) add_definitions(-DHAVE_IQBALANCE=1) target_include_directories(gnuradio-osmosdr PRIVATE ${gnuradio-iqbalance_INCLUDE_DIRS}) - target_link_libraries(gnuradio-osmosdr gnuradio::gnuradio-iqbalance) + list(APPEND gr_osmosdr_libs gnuradio::gnuradio-iqbalance) endif(ENABLE_IQBALANCE) ######################################################################## @@ -263,6 +263,7 @@ configure_file( # Finalize target ######################################################################## set_target_properties(gnuradio-osmosdr PROPERTIES SOURCES "${gr_osmosdr_srcs}") +target_link_libraries(gnuradio-osmosdr ${gr_osmosdr_libs}) ######################################################################## # Install built library files diff --git a/lib/airspy/CMakeLists.txt b/lib/airspy/CMakeLists.txt index 4a60138..848a91a 100644 --- a/lib/airspy/CMakeLists.txt +++ b/lib/airspy/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBAIRSPY_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs gnuradio::gnuradio-filter ${Gnuradio-blocks_LIBRARIES} ${LIBAIRSPY_LIBRARIES} diff --git a/lib/airspyhf/CMakeLists.txt b/lib/airspyhf/CMakeLists.txt index 122a67c..e2c63d7 100644 --- a/lib/airspyhf/CMakeLists.txt +++ b/lib/airspyhf/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBAIRSPYHF_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${Gnuradio-blocks_LIBRARIES} ${LIBAIRSPYHF_LIBRARIES} ) diff --git a/lib/bladerf/CMakeLists.txt b/lib/bladerf/CMakeLists.txt index e09a4d7..6cf2f7d 100644 --- a/lib/bladerf/CMakeLists.txt +++ b/lib/bladerf/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${Volk_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBBLADERF_LIBRARIES} ${Volk_LIBRARIES} ) diff --git a/lib/fcd/CMakeLists.txt b/lib/fcd/CMakeLists.txt index 146191f..80f88d3 100644 --- a/lib/fcd/CMakeLists.txt +++ b/lib/fcd/CMakeLists.txt @@ -29,7 +29,8 @@ if(ENABLE_FCD) target_include_directories(gnuradio-osmosdr PRIVATE ${Gnuradio-fcd_INCLUDE_DIRS} ) - target_link_libraries(gnuradio-osmosdr PRIVATE + + list(APPEND gr_osmosdr_libs ${Gnuradio-fcd_LIBRARIES} ) endif(ENABLE_FCD) @@ -38,7 +39,7 @@ if(ENABLE_FCDPP) target_include_directories(gnuradio-osmosdr PRIVATE ${Gnuradio-fcdpp_INCLUDE_DIRS} ) - target_link_libraries(gnuradio-osmosdr PRIVATE + list(APPEND gr_osmosdr_libs ${Gnuradio-fcdpp_LIBRARIES} ) endif(ENABLE_FCDPP) diff --git a/lib/file/CMakeLists.txt b/lib/file/CMakeLists.txt index 2897589..98e60f7 100644 --- a/lib/file/CMakeLists.txt +++ b/lib/file/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs gnuradio::gnuradio-blocks ) message(STATUS ${gnuradio-blocks_LIBRARIES}) diff --git a/lib/freesrp/CMakeLists.txt b/lib/freesrp/CMakeLists.txt index 85eb64d..ec1ed85 100644 --- a/lib/freesrp/CMakeLists.txt +++ b/lib/freesrp/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBFREESRP_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBFREESRP_LIBRARIES} ) diff --git a/lib/hackrf/CMakeLists.txt b/lib/hackrf/CMakeLists.txt index d099b41..32dd0ea 100644 --- a/lib/hackrf/CMakeLists.txt +++ b/lib/hackrf/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBHACKRF_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBHACKRF_LIBRARIES} ) diff --git a/lib/miri/CMakeLists.txt b/lib/miri/CMakeLists.txt index 5415a9d..e999927 100644 --- a/lib/miri/CMakeLists.txt +++ b/lib/miri/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBMIRISDR_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBMIRISDR_LIBRARIES} ) diff --git a/lib/osmosdr/CMakeLists.txt b/lib/osmosdr/CMakeLists.txt index 83d6dbc..c9dabdd 100644 --- a/lib/osmosdr/CMakeLists.txt +++ b/lib/osmosdr/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBOSMOSDR_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBOSMOSDR_LIBRARIES} ) diff --git a/lib/redpitaya/CMakeLists.txt b/lib/redpitaya/CMakeLists.txt index 0d13c48..695ef5b 100644 --- a/lib/redpitaya/CMakeLists.txt +++ b/lib/redpitaya/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${Gnuradio-blocks_LIBRARIES} ) diff --git a/lib/rtl/CMakeLists.txt b/lib/rtl/CMakeLists.txt index ad3a7dc..d70338e 100644 --- a/lib/rtl/CMakeLists.txt +++ b/lib/rtl/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBRTLSDR_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBRTLSDR_LIBRARIES} ) diff --git a/lib/rtl_tcp/CMakeLists.txt b/lib/rtl_tcp/CMakeLists.txt index 7acb614..f723668 100644 --- a/lib/rtl_tcp/CMakeLists.txt +++ b/lib/rtl_tcp/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${Gnuradio-blocks_LIBRARIES} ) diff --git a/lib/sdrplay/CMakeLists.txt b/lib/sdrplay/CMakeLists.txt index c310f5d..6b73cbf 100644 --- a/lib/sdrplay/CMakeLists.txt +++ b/lib/sdrplay/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${LIBSDRPLAY_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${LIBSDRPLAY_LIBRARIES} ) diff --git a/lib/soapy/CMakeLists.txt b/lib/soapy/CMakeLists.txt index d2a725b..5277483 100644 --- a/lib/soapy/CMakeLists.txt +++ b/lib/soapy/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${SoapySDR_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs ${SoapySDR_LIBRARIES} ) diff --git a/lib/uhd/CMakeLists.txt b/lib/uhd/CMakeLists.txt index f9fb196..db089f5 100644 --- a/lib/uhd/CMakeLists.txt +++ b/lib/uhd/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ${UHD_INCLUDE_DIRS} ) -target_link_libraries(gnuradio-osmosdr +list(APPEND gr_osmosdr_libs gnuradio::gnuradio-uhd ${UHD_LIBRARIES} ) -- 2.7.4

4 years, 2 months

1
0
0 0

[PATCH] build: Allow building with GNU Radio master

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Currently gr-osmosdr does not build with GNU Radio's master branch, which declares itself to be version 3.9. This change allows both 3.8 and 3.9. --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56c1a6b185..f3186dee0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,13 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio (pmt and runtime are core, always included) -find_package(Gnuradio "3.8" REQUIRED COMPONENTS blocks fft filter) +find_package(Gnuradio "3.8" COMPONENTS blocks fft filter) +if(NOT Gnuradio_FOUND) + find_package(Gnuradio "3.9" COMPONENTS blocks fft filter) + if(NOT Gnuradio_FOUND) + message(FATAL_ERROR "Unable to find GNURadio") + ENDIF(NOT Gnuradio_FOUND) +ENDIF(NOT Gnuradio_FOUND) # Set the version information here set(VERSION_MAJOR 0) -- 2.17.1

4 years, 2 months

4
4
0 0

[PATCH] rtl_tcp: Throw an exception if TCP connection fails

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Currently, rtl_tcp_source_c repeatedly calls ::connect until it succeeds. This can result in 100% CPU utilization and/or a lot of network traffic. In addition, GUI applications like Gqrx freeze up. To solve these problems, I've changed the code to report an error if ::connect fails. Also, I removed rtl_tcp_source_f since it is no longer used, and corrected a few error messages in rtl_tcp_source_c so they print the correct class name. --- lib/rtl_tcp/rtl_tcp_source_c.cc | 10 +- lib/rtl_tcp/rtl_tcp_source_f.cc | 327 -------------------------------- lib/rtl_tcp/rtl_tcp_source_f.h | 125 ------------ 3 files changed, 5 insertions(+), 457 deletions(-) delete mode 100644 lib/rtl_tcp/rtl_tcp_source_f.cc delete mode 100644 lib/rtl_tcp/rtl_tcp_source_f.h diff --git a/lib/rtl_tcp/rtl_tcp_source_c.cc b/lib/rtl_tcp/rtl_tcp_source_c.cc index ecdeee0216..af8e30006b 100644 --- a/lib/rtl_tcp/rtl_tcp_source_c.cc +++ b/lib/rtl_tcp/rtl_tcp_source_c.cc @@ -98,7 +98,7 @@ static int is_error( int perr ) case WSAENOPROTOOPT: return( perr == ENOPROTOOPT ); default: - fprintf(stderr,"rtl_tcp_source_f: unknown error %d WS err %d \n", perr, werr ); + fprintf(stderr,"rtl_tcp_source_c: unknown error %d WS err %d \n", perr, werr ); throw std::runtime_error("internal error"); } return 0; @@ -200,7 +200,7 @@ rtl_tcp_source_c::rtl_tcp_source_c(const std::string &args) : WSADATA wsaData; int iResult = WSAStartup( MAKEWORD(2,2), &wsaData ); if( iResult != NO_ERROR ) { - report_error( "rtl_tcp_source_f WSAStartup", "can't open socket" ); + report_error( "rtl_tcp_source_c WSAStartup", "can't open socket" ); } #endif @@ -219,7 +219,7 @@ rtl_tcp_source_c::rtl_tcp_source_c(const std::string &args) : // FIXME leaks if report_error throws below int ret = getaddrinfo(host.c_str(), port_str, &hints, &ip_src); if (ret != 0) - report_error("rtl_tcp_source_f/getaddrinfo", + report_error("rtl_tcp_source_c/getaddrinfo", "can't initialize source socket" ); d_temp_buff = new unsigned char[payload_size]; // allow it to hold up to payload_size bytes @@ -261,8 +261,8 @@ rtl_tcp_source_c::rtl_tcp_source_c(const std::string &args) : report_error("SO_RCVTIMEO","can't set socket option SO_RCVTIMEO"); #endif // USE_RCV_TIMEO - while (::connect(d_socket, ip_src->ai_addr, ip_src->ai_addrlen) != 0) - ; // FIXME handle errors? + if (::connect(d_socket, ip_src->ai_addr, ip_src->ai_addrlen) != 0) + report_error("rtl_tcp_source_c/connect","can't open TCP connection"); freeaddrinfo(ip_src); int flag = 1; diff --git a/lib/rtl_tcp/rtl_tcp_source_f.cc b/lib/rtl_tcp/rtl_tcp_source_f.cc deleted file mode 100644 index a17594c916..0000000000 --- a/lib/rtl_tcp/rtl_tcp_source_f.cc +++ /dev/null @@ -1,327 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Hoernchen <la(a)tfc-server.de> - * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ -//#define HAVE_WINDOWS_H - - -#include <rtl_tcp_source_f.h> -#include <gnuradio/io_signature.h> -#include <stdexcept> -#include <errno.h> -#include <stdio.h> -#include <string.h> - -#ifndef _WIN32 -#include <netinet/in.h> -#else -#include <WinSock2.h> -#endif - -/* copied from rtl sdr code */ -typedef struct { /* structure size must be multiple of 2 bytes */ - char magic[4]; - uint32_t tuner_type; - uint32_t tuner_gain_count; -} dongle_info_t; - -#define USE_SELECT 1 // non-blocking receive on all platforms -#define USE_RCV_TIMEO 0 // non-blocking receive on all but Cygwin -#define SRC_VERBOSE 0 -#define SNK_VERBOSE 0 - -static int is_error( int perr ) -{ - // Compare error to posix error code; return nonzero if match. -#if defined(USING_WINSOCK) -#define ENOPROTOOPT 109 - // All codes to be checked for must be defined below - int werr = WSAGetLastError(); - switch( werr ) { - case WSAETIMEDOUT: - return( perr == EAGAIN ); - case WSAENOPROTOOPT: - return( perr == ENOPROTOOPT ); - default: - fprintf(stderr,"rtl_tcp_source_f: unknown error %d WS err %d \n", perr, werr ); - throw std::runtime_error("internal error"); - } - return 0; -#else - return( perr == errno ); -#endif -} - -static void report_error( const char *msg1, const char *msg2 ) -{ - // Deal with errors, both posix and winsock -#if defined(USING_WINSOCK) - int werr = WSAGetLastError(); - fprintf(stderr, "%s: winsock error %d\n", msg1, werr ); -#else - perror(msg1); -#endif - if( msg2 != NULL ) - throw std::runtime_error(msg2); - return; -} - -rtl_tcp_source_f::rtl_tcp_source_f(size_t itemsize, - const char *host, - unsigned short port, - int payload_size, - bool eof, - bool wait) - : gr::sync_block ("rtl_tcp_source_f", - gr::io_signature::make(0, 0, 0), - gr::io_signature::make(1, 1, sizeof(float))), - d_itemsize(itemsize), - d_payload_size(payload_size), - d_eof(eof), - d_wait(wait), - d_socket(-1), - d_temp_offset(0) -{ - int ret = 0; -#if defined(USING_WINSOCK) // for Windows (with MinGW) - // initialize winsock DLL - WSADATA wsaData; - int iResult = WSAStartup( MAKEWORD(2,2), &wsaData ); - if( iResult != NO_ERROR ) { - report_error( "rtl_tcp_source_f WSAStartup", "can't open socket" ); - } -#endif - - // Set up the address stucture for the source address and port numbers - // Get the source IP address from the host name - struct addrinfo *ip_src; // store the source IP address to use - struct addrinfo hints; - memset( (void*)&hints, 0, sizeof(hints) ); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = IPPROTO_TCP; - hints.ai_flags = AI_PASSIVE; - char port_str[12]; - sprintf( port_str, "%d", port ); - - // FIXME leaks if report_error throws below - ret = getaddrinfo( host, port_str, &hints, &ip_src ); - if( ret != 0 ) - report_error("rtl_tcp_source_f/getaddrinfo", - "can't initialize source socket" ); - - // FIXME leaks if report_error throws below - d_temp_buff = new unsigned char[d_payload_size]; // allow it to hold up to payload_size bytes - d_LUT= new float[0xff+1]; - for(int i=0; i <=(0xff);++i){ - d_LUT[i] = (((float)(i&0xff))-127.4f)*(1.0f/128.0f); - } - // create socket - d_socket = socket(ip_src->ai_family, ip_src->ai_socktype, - ip_src->ai_protocol); - if(d_socket == -1) { - report_error("socket open","can't open socket"); - } - - // Turn on reuse address - int opt_val = 1; - if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (optval_t)&opt_val, sizeof(int)) == -1) { - report_error("SO_REUSEADDR","can't set socket option SO_REUSEADDR"); - } - - // Don't wait when shutting down - linger lngr; - lngr.l_onoff = 1; - lngr.l_linger = 0; - if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (optval_t)&lngr, sizeof(linger)) == -1) { - if( !is_error(ENOPROTOOPT) ) { // no SO_LINGER for SOCK_DGRAM on Windows - report_error("SO_LINGER","can't set socket option SO_LINGER"); - } - } - -#if USE_RCV_TIMEO - // Set a timeout on the receive function to not block indefinitely - // This value can (and probably should) be changed - // Ignored on Cygwin -#if defined(USING_WINSOCK) - DWORD timeout = 1000; // milliseconds -#else - timeval timeout; - timeout.tv_sec = 1; - timeout.tv_usec = 0; -#endif - if(setsockopt(d_socket, SOL_SOCKET, SO_RCVTIMEO, (optval_t)&timeout, sizeof(timeout)) == -1) { - report_error("SO_RCVTIMEO","can't set socket option SO_RCVTIMEO"); - } -#endif // USE_RCV_TIMEO - - while(connect(d_socket, ip_src->ai_addr, ip_src->ai_addrlen) != 0); - freeaddrinfo(ip_src); - - int flag = 1; - setsockopt(d_socket, IPPROTO_TCP, TCP_NODELAY, (char *)&flag,sizeof(flag)); - - dongle_info_t dongle_info; - ret = recv(d_socket, (char*)&dongle_info, sizeof(dongle_info), 0); - if (sizeof(dongle_info) != ret) - fprintf(stderr,"failed to read dongle info\n"); - - d_tuner_type = RTLSDR_TUNER_UNKNOWN; - d_tuner_gain_count = 0; - d_tuner_if_gain_count = 0; - - if (memcmp(dongle_info.magic, "RTL0", 4) == 0) - { - d_tuner_type = ntohl(dongle_info.tuner_type); - d_tuner_gain_count = ntohl(dongle_info.tuner_gain_count); - if ( RTLSDR_TUNER_E4000 == d_tuner_type ) - d_tuner_if_gain_count = 53; - } -} - -rtl_tcp_source_f_sptr make_rtl_tcp_source_f (size_t itemsize, - const char *ipaddr, - unsigned short port, - int payload_size, - bool eof, - bool wait) -{ - return gnuradio::get_initial_sptr(new rtl_tcp_source_f ( - itemsize, - ipaddr, - port, - payload_size, - eof, - wait)); -} - -rtl_tcp_source_f::~rtl_tcp_source_f () -{ - delete [] d_temp_buff; - - if (d_socket != -1){ - shutdown(d_socket, SHUT_RDWR); -#if defined(USING_WINSOCK) - closesocket(d_socket); -#else - ::close(d_socket); -#endif - d_socket = -1; - } - -#if defined(USING_WINSOCK) // for Windows (with MinGW) - // free winsock resources - WSACleanup(); -#endif -} - -int rtl_tcp_source_f::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - float *out = (float *) output_items[0]; - ssize_t r = 0; - - int bytesleft = noutput_items; - int index = 0; - int receivedbytes = 0; - while(bytesleft > 0) { - receivedbytes = recv(d_socket, (char*)&d_temp_buff[index], bytesleft, 0); - - if(receivedbytes == -1 && !is_error(EAGAIN)){ - fprintf(stderr, "socket error\n"); - return -1; - } - bytesleft -= receivedbytes; - index += receivedbytes; - } - r = noutput_items; - - for(int i=0; i<r; ++i) - out[i]=d_LUT[*(d_temp_buff+d_temp_offset+i)]; - - return r; -} - -#ifdef _WIN32 -#define __attribute__(x) -#pragma pack(push, 1) -#endif -struct command{ - unsigned char cmd; - unsigned int param; -}__attribute__((packed)); -#ifdef _WIN32 -#pragma pack(pop) -#endif - -void rtl_tcp_source_f::set_freq(int freq) -{ - struct command cmd = { 0x01, htonl(freq) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_sample_rate(int sample_rate) -{ - struct command cmd = { 0x02, htonl(sample_rate) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_gain_mode(int manual) -{ - struct command cmd = { 0x03, htonl(manual) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_gain(int gain) -{ - struct command cmd = { 0x04, htonl(gain) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_freq_corr(int ppm) -{ - struct command cmd = { 0x05, htonl(ppm) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_if_gain(int stage, int gain) -{ - uint32_t params = stage << 16 | (gain & 0xffff); - struct command cmd = { 0x06, htonl(params) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_agc_mode(int on) -{ - struct command cmd = { 0x08, htonl(on) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_direct_sampling(int on) -{ - struct command cmd = { 0x09, htonl(on) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} - -void rtl_tcp_source_f::set_offset_tuning(int on) -{ - struct command cmd = { 0x0a, htonl(on) }; - send(d_socket, (const char*)&cmd, sizeof(cmd), 0); -} diff --git a/lib/rtl_tcp/rtl_tcp_source_f.h b/lib/rtl_tcp/rtl_tcp_source_f.h deleted file mode 100644 index 84ac57a2cd..0000000000 --- a/lib/rtl_tcp/rtl_tcp_source_f.h +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2012 Hoernchen <la(a)tfc-server.de> - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef RTL_TCP_SOURCE_F_H -#define RTL_TCP_SOURCE_F_H - -#include <gnuradio/sync_block.h> -#include <gnuradio/thread/thread.h> - -#if defined(_WIN32) -// if not posix, assume winsock -#pragma comment(lib, "ws2_32.lib") -#define USING_WINSOCK -#include <winsock2.h> -#include <ws2tcpip.h> -#define SHUT_RDWR 2 -typedef char* optval_t; -#else -#include <netdb.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/tcp.h> -#include <arpa/inet.h> -typedef void* optval_t; -#endif - -#ifdef _MSC_VER -#include <cstddef> -typedef ptrdiff_t ssize_t; -#endif //_MSC_VER - -/* copied from rtl sdr */ -enum rtlsdr_tuner { - RTLSDR_TUNER_UNKNOWN = 0, - RTLSDR_TUNER_E4000, - RTLSDR_TUNER_FC0012, - RTLSDR_TUNER_FC0013, - RTLSDR_TUNER_FC2580, - RTLSDR_TUNER_R820T, - RTLSDR_TUNER_R828D -}; - -class rtl_tcp_source_f; -typedef boost::shared_ptr<rtl_tcp_source_f> rtl_tcp_source_f_sptr; - -rtl_tcp_source_f_sptr make_rtl_tcp_source_f ( - size_t itemsize, - const char *host, - unsigned short port, - int payload_size, - bool eof = false, - bool wait = false); - -class rtl_tcp_source_f : public gr::sync_block -{ -private: - size_t d_itemsize; - int d_payload_size; // maximum transmission unit (packet length) - bool d_eof; // zero-length packet is EOF - bool d_wait; // wait if data if not immediately available - int d_socket; // handle to socket - unsigned char *d_temp_buff; // hold buffer between calls - size_t d_temp_offset; // point to temp buffer location offset - float *d_LUT; - - unsigned int d_tuner_type; - unsigned int d_tuner_gain_count; - unsigned int d_tuner_if_gain_count; - -private: - rtl_tcp_source_f(size_t itemsize, const char *host, - unsigned short port, int payload_size, bool eof, bool wait); - - // The friend declaration allows make_source_c to - // access the private constructor. - friend rtl_tcp_source_f_sptr make_rtl_tcp_source_f ( - size_t itemsize, - const char *host, - unsigned short port, - int payload_size, - bool eof, - bool wait); - -public: - ~rtl_tcp_source_f(); - - enum rtlsdr_tuner get_tuner_type() { return (enum rtlsdr_tuner) d_tuner_type; } - unsigned int get_tuner_gain_count() { return d_tuner_gain_count; } - unsigned int get_tuner_if_gain_count() { return d_tuner_if_gain_count; } - - int work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - void set_freq(int freq); - void set_sample_rate(int sample_rate); - void set_gain_mode(int manual); - void set_gain(int gain); - void set_freq_corr(int ppm); - void set_if_gain(int stage, int gain); - void set_agc_mode(int on); - void set_direct_sampling(int on); - void set_offset_tuning(int on); -}; - - -#endif /* RTL_TCP_SOURCE_F_H */ -- 2.17.1

4 years, 2 months

1
0
0 0

[PATCH] build: Allow building with GNU Radio master

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Currently gr-iqbal does not build with GNU Radio's master branch, which declares itself to be version 3.9. This change allows both 3.8 and 3.9. --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8c0a5754..bc8a1aef0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,13 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio -find_package(Gnuradio "3.8" REQUIRED) +find_package(Gnuradio "3.8") +if(NOT Gnuradio_FOUND) + find_package(Gnuradio "3.9") + if(NOT Gnuradio_FOUND) + message(FATAL_ERROR "Unable to find GNURadio") + ENDIF(NOT Gnuradio_FOUND) +ENDIF(NOT Gnuradio_FOUND) # Set the version information here set(VERSION_MAJOR 3) -- 2.17.1

4 years, 2 months

1
0
0 0

[PATCH] hackrf: replace boost::assign with C++11

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> Since GNU Radio is gradually replacing Boost with C++11, it seemed worth doing that for the HackRF blocks I was working on. This change removes all usage of boost::assign. --- lib/hackrf/hackrf_common.cc | 54 +++++++++++++++-------------------- lib/hackrf/hackrf_common.h | 1 + lib/hackrf/hackrf_sink_c.cc | 11 +------ lib/hackrf/hackrf_source_c.cc | 11 +------ 4 files changed, 26 insertions(+), 51 deletions(-) diff --git a/lib/hackrf/hackrf_common.cc b/lib/hackrf/hackrf_common.cc index 0a20f2ec9c..a6de22aab6 100644 --- a/lib/hackrf/hackrf_common.cc +++ b/lib/hackrf/hackrf_common.cc @@ -21,14 +21,10 @@ #include "config.h" #endif -#include <boost/assign.hpp> - #include "hackrf_common.h" #include "arg_helpers.h" -using namespace boost::assign; - int hackrf_common::_usage = 0; std::mutex hackrf_common::_usage_mutex; @@ -213,11 +209,11 @@ osmosdr::meta_range_t hackrf_common::get_sample_rates() * the user is allowed to request arbitrary (fractional) rates within these * boundaries. */ - range += osmosdr::range_t( 8e6 ); - range += osmosdr::range_t( 10e6 ); - range += osmosdr::range_t( 12.5e6 ); - range += osmosdr::range_t( 16e6 ); - range += osmosdr::range_t( 20e6 ); /* confirmed to work on fast machines */ + range.push_back(osmosdr::range_t( 8e6 )); + range.push_back(osmosdr::range_t( 10e6 )); + range.push_back(osmosdr::range_t( 12.5e6 )); + range.push_back(osmosdr::range_t( 16e6 )); + range.push_back(osmosdr::range_t( 20e6 )); /* confirmed to work on fast machines */ return range; } @@ -246,7 +242,7 @@ osmosdr::freq_range_t hackrf_common::get_freq_range( size_t chan ) { osmosdr::freq_range_t range; - range += osmosdr::range_t( _sample_rate / 2, 7250e6 - _sample_rate / 2 ); + range.push_back(osmosdr::range_t( _sample_rate / 2, 7250e6 - _sample_rate / 2 )); return range; } @@ -325,11 +321,7 @@ double hackrf_common::get_gain( size_t chan ) std::vector< std::string > hackrf_common::get_antennas( size_t chan ) { - std::vector< std::string > antennas; - - antennas += get_antenna( chan ); - - return antennas; + return { get_antenna( chan ) }; } std::string hackrf_common::set_antenna( const std::string & antenna, size_t chan ) @@ -375,22 +367,22 @@ osmosdr::freq_range_t hackrf_common::get_bandwidth_range( size_t chan ) // TODO: read out from libhackrf when an API is available - bandwidths += osmosdr::range_t( 1750000 ); - bandwidths += osmosdr::range_t( 2500000 ); - bandwidths += osmosdr::range_t( 3500000 ); - bandwidths += osmosdr::range_t( 5000000 ); - bandwidths += osmosdr::range_t( 5500000 ); - bandwidths += osmosdr::range_t( 6000000 ); - bandwidths += osmosdr::range_t( 7000000 ); - bandwidths += osmosdr::range_t( 8000000 ); - bandwidths += osmosdr::range_t( 9000000 ); - bandwidths += osmosdr::range_t( 10000000 ); - bandwidths += osmosdr::range_t( 12000000 ); - bandwidths += osmosdr::range_t( 14000000 ); - bandwidths += osmosdr::range_t( 15000000 ); - bandwidths += osmosdr::range_t( 20000000 ); - bandwidths += osmosdr::range_t( 24000000 ); - bandwidths += osmosdr::range_t( 28000000 ); + bandwidths.push_back(osmosdr::range_t( 1750000 )); + bandwidths.push_back(osmosdr::range_t( 2500000 )); + bandwidths.push_back(osmosdr::range_t( 3500000 )); + bandwidths.push_back(osmosdr::range_t( 5000000 )); + bandwidths.push_back(osmosdr::range_t( 5500000 )); + bandwidths.push_back(osmosdr::range_t( 6000000 )); + bandwidths.push_back(osmosdr::range_t( 7000000 )); + bandwidths.push_back(osmosdr::range_t( 8000000 )); + bandwidths.push_back(osmosdr::range_t( 9000000 )); + bandwidths.push_back(osmosdr::range_t( 10000000 )); + bandwidths.push_back(osmosdr::range_t( 12000000 )); + bandwidths.push_back(osmosdr::range_t( 14000000 )); + bandwidths.push_back(osmosdr::range_t( 15000000 )); + bandwidths.push_back(osmosdr::range_t( 20000000 )); + bandwidths.push_back(osmosdr::range_t( 24000000 )); + bandwidths.push_back(osmosdr::range_t( 28000000 )); return bandwidths; } diff --git a/lib/hackrf/hackrf_common.h b/lib/hackrf/hackrf_common.h index 02eabd2f0c..ea093b9680 100644 --- a/lib/hackrf/hackrf_common.h +++ b/lib/hackrf/hackrf_common.h @@ -20,6 +20,7 @@ #ifndef INCLUDED_HACKRF_COMMON_H #define INCLUDED_HACKRF_COMMON_H +#include <map> #include <memory> #include <mutex> #include <string> diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc index f003b89ce3..7271109b15 100644 --- a/lib/hackrf/hackrf_sink_c.cc +++ b/lib/hackrf/hackrf_sink_c.cc @@ -38,16 +38,12 @@ #include <emmintrin.h> #endif -#include <boost/assign.hpp> - #include <gnuradio/io_signature.h> #include "hackrf_sink_c.h" #include "arg_helpers.h" -using namespace boost::assign; - static inline bool cb_init(circular_buffer_t *cb, size_t capacity, size_t sz) { cb->buffer = malloc(capacity * sz); @@ -449,12 +445,7 @@ double hackrf_sink_c::get_freq_corr( size_t chan ) std::vector<std::string> hackrf_sink_c::get_gain_names( size_t chan ) { - std::vector< std::string > names; - - names += "RF"; - names += "IF"; - - return names; + return { "RF", "IF" }; } osmosdr::gain_range_t hackrf_sink_c::get_gain_range( size_t chan ) diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index 51a6580eca..eea5caafda 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -31,7 +31,6 @@ #include <stdexcept> #include <iostream> -#include <boost/assign.hpp> #include <boost/detail/endian.hpp> #include <gnuradio/io_signature.h> @@ -40,8 +39,6 @@ #include "arg_helpers.h" -using namespace boost::assign; - hackrf_source_c_sptr make_hackrf_source_c (const std::string & args) { return gnuradio::get_initial_sptr(new hackrf_source_c (args)); @@ -306,13 +303,7 @@ double hackrf_source_c::get_freq_corr( size_t chan ) std::vector<std::string> hackrf_source_c::get_gain_names( size_t chan ) { - std::vector< std::string > names; - - names += "RF"; - names += "IF"; - names += "BB"; - - return names; + return { "RF", "IF", "BB" }; } osmosdr::gain_range_t hackrf_source_c::get_gain_range( size_t chan ) -- 2.17.1

4 years, 3 months

2
1
0 0

Osmo-fl2k Please Help ?

by Murat Özen

I can not transmit signal please help ? I am taking a low signal 165MHz after device is stopping to send signal. Why ? Please Help? İn this picture I take a very low signal after device stopped to send signal . Why I dont understand ?

4 years, 3 months

1
0
0 0

Please Help Osmo-Fl2k

by Murat Özen

I started application but dont transmit any signal ? Why ? I dont understand ? I am listening in rtl sdr but dont transmit any signal . What is my error ? I dont contact any antenna to the device . murat@murat-VivoBook-14-ASUS-Laptop-X407MA-X407MA:~$ pacat -r -d alsa_output.pci-0000_00_0e.0.analog-stereo.monitor | \ > pv -B 256k | \ > sox -t raw -r 44100 -e signed-integer -L -b 16 -c 2 - -c 1 -e signed-integer -b 16 -t raw - \ > biquad 4.76963 -2.98129 0 1 0.78833 0 sinc -15k loudness 5 | \ > fl2k_fm - -s 130e6 -c 30e6 -i 44100 Samplerate: 130.00 MHz Carrier: 30.00 MHz Frequencies: 100.00 MHz, 160.00 MHz Failed to switch interface 0 to altsetting 1, trying to use interface 1 Allocating 6 zero-copy buffers ^C24,2MiB 0:18:45 [0,00 B/s] [ <=> ] Signal caught, exiting! ^CSignal caught, exiting!

4 years, 3 months

1
0
0 0

[PATCH] hackrf: allow transmit/receive switching

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> To allow switching between transmit and receive mode within a single flow graph, I've followed the model used by the BladeRF: I factored common code into hackrf_common.cc and hackrf_common.h, and created a "_devs" map there to keep track of which devices have been previously opened. Shared pointers are used to track how many source & sink blocks are using a particular device. Because some properties (center frequency, sample rate, bandwidth, RF amplifier state, bias tee) are shared between receive and transmit, the blocks defer setting these until receiving or transmitting is started. That way a source and sink can safely use different values for these properties, and the correct values are set during T/R switching. Because the HackRF driver and/or hardware does not seem to fully transmit all samples sent to it, the code adds some silence to the end of transmissions to ensure all samples are transmitted. I've also replaced boost with C++11 code where possible. --- lib/hackrf/CMakeLists.txt | 10 +- lib/hackrf/hackrf_common.cc | 432 ++++++++++++++++++++++++++++++++++ lib/hackrf/hackrf_common.h | 111 +++++++++ lib/hackrf/hackrf_sink_c.cc | 414 +++++++------------------------- lib/hackrf/hackrf_sink_c.h | 37 +-- lib/hackrf/hackrf_source_c.cc | 405 ++++--------------------------- lib/hackrf/hackrf_source_c.h | 36 +-- 7 files changed, 693 insertions(+), 752 deletions(-) create mode 100644 lib/hackrf/hackrf_common.cc create mode 100644 lib/hackrf/hackrf_common.h diff --git a/lib/hackrf/CMakeLists.txt b/lib/hackrf/CMakeLists.txt index b817518f4c..d099b41c39 100644 --- a/lib/hackrf/CMakeLists.txt +++ b/lib/hackrf/CMakeLists.txt @@ -31,16 +31,8 @@ target_link_libraries(gnuradio-osmosdr ) list(APPEND gr_osmosdr_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/hackrf_common.cc ${CMAKE_CURRENT_SOURCE_DIR}/hackrf_source_c.cc ${CMAKE_CURRENT_SOURCE_DIR}/hackrf_sink_c.cc ) set(gr_osmosdr_srcs ${gr_osmosdr_srcs} PARENT_SCOPE) - -include(CheckFunctionExists) -set(CMAKE_REQUIRED_LIBRARIES ${LIBHACKRF_LIBRARIES}) -CHECK_FUNCTION_EXISTS(hackrf_device_list LIBHACKRF_HAVE_DEVICE_LIST) - -if(LIBHACKRF_HAVE_DEVICE_LIST) - message(STATUS "HackRF multiple device support enabled") - target_compile_definitions(gnuradio-osmosdr PRIVATE -DLIBHACKRF_HAVE_DEVICE_LIST) -endif(LIBHACKRF_HAVE_DEVICE_LIST) diff --git a/lib/hackrf/hackrf_common.cc b/lib/hackrf/hackrf_common.cc new file mode 100644 index 0000000000..0a20f2ec9c --- /dev/null +++ b/lib/hackrf/hackrf_common.cc @@ -0,0 +1,432 @@ +/* -*- c++ -*- */ +/* + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> + * + * gr-osmosdr is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * gr-osmosdr is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-osmosdr; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <boost/assign.hpp> + +#include "hackrf_common.h" + +#include "arg_helpers.h" + +using namespace boost::assign; + +int hackrf_common::_usage = 0; +std::mutex hackrf_common::_usage_mutex; + +std::map<std::string, std::weak_ptr<hackrf_device>> hackrf_common::_devs; +std::mutex hackrf_common::_devs_mutex; + +hackrf_common::hackrf_common(const std::string &args) : + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _auto_gain(false), + _bandwidth(0), + _bias(false), + _started(false) +{ + int ret; + hackrf_device *raw_dev; + hackrf_device_list_t *list; + int dev_index; + std::string target_serial = "0"; + std::string final_serial = ""; + + dict_t dict = params_to_dict(args); + if (dict.count("hackrf") > 0 && dict["hackrf"].length() > 0) { + target_serial = dict["hackrf"]; + } + + { + std::lock_guard<std::mutex> guard(_usage_mutex); + + if (_usage == 0) { + hackrf_init(); /* call only once before the first open */ + } + + _usage++; + } + + list = hackrf_device_list(); + + if (target_serial.length() > 1) { + for (dev_index = 0; dev_index < list->devicecount; dev_index++) { + if (list->serial_numbers[dev_index]) { + std::string serial(list->serial_numbers[dev_index]); + if (serial.compare(serial.length() - target_serial.length(), + target_serial.length(), target_serial) == 0) { + break; + } + } + } + + if (dev_index >= list->devicecount) { + hackrf_device_list_free(list); + throw std::runtime_error( + "No device found with serial number '" + target_serial + "'"); + } + } else { + try { + dev_index = std::stoi(target_serial); + } catch (std::exception &ex) { + hackrf_device_list_free(list); + throw std::runtime_error( + "Failed to use '" + target_serial + "' as HackRF device index number"); + } + + if (dev_index >= list->devicecount) { + hackrf_device_list_free(list); + throw std::runtime_error( + "Failed to use '" + target_serial + "' as HackRF device index: not enough devices"); + } + } + + if (list->serial_numbers[dev_index]) { + final_serial = list->serial_numbers[dev_index]; + } + + { + std::lock_guard<std::mutex> guard(_devs_mutex); + + if (_devs.count(final_serial) > 0 && !_devs[final_serial].expired()) { + _dev = hackrf_sptr(_devs[final_serial]); + } else { + ret = hackrf_device_list_open(list, dev_index, &raw_dev); + HACKRF_THROW_ON_ERROR(ret, "Failed to open HackRF device") + _dev = hackrf_sptr(raw_dev, hackrf_common::close); + _devs[final_serial] = static_cast<std::weak_ptr<struct hackrf_device>>(_dev); + } + } + + hackrf_device_list_free(list); + + uint8_t board_id; + ret = hackrf_board_id_read(_dev.get(), &board_id); + HACKRF_THROW_ON_ERROR(ret, "Failed to get HackRF board id") + + char version[40]; + memset(version, 0, sizeof(version)); + ret = hackrf_version_string_read(_dev.get(), version, sizeof(version)); + HACKRF_THROW_ON_ERROR(ret, "Failed to read version string") + + std::cerr << "Using " << hackrf_board_id_name(hackrf_board_id(board_id)) << " " + << "with firmware " << version + << std::endl; +} + +void hackrf_common::close(void *dev) +{ + int ret = hackrf_close(static_cast<hackrf_device *>(dev)); + if (ret != HACKRF_SUCCESS) + { + std::cerr << HACKRF_FORMAT_ERROR(ret, "Failed to close HackRF") << std::endl; + } + + { + std::lock_guard<std::mutex> guard(_usage_mutex); + + _usage--; + + if (_usage == 0) { + hackrf_exit(); /* call only once after last close */ + } + } +} + +std::vector<std::string> hackrf_common::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + { + std::lock_guard<std::mutex> guard(_usage_mutex); + + if (_usage == 0) { + hackrf_init(); /* call only once before the first open */ + } + + _usage++; + } + + hackrf_device_list_t *list = hackrf_device_list(); + + for (int i = 0; i < list->devicecount; i++) { + label = "HackRF "; + label += hackrf_usb_board_id_name(list->usb_board_ids[i]); + + std::string args; + if (list->serial_numbers[i]) { + std::string serial(list->serial_numbers[i]); + if (serial.length() > 6) + serial = serial.substr(serial.length() - 6, 6); + args = "hackrf=" + serial; + if (serial.length() ) + label += " " + serial; + } else { + args = "hackrf"; /* will pick the first one, serial number is required for choosing a specific one */ + } + + args += ",label='" + label + "'"; + devices.push_back(args); + } + + hackrf_device_list_free(list); + + { + std::lock_guard<std::mutex> guard(_usage_mutex); + + _usage--; + + if (_usage == 0) { + hackrf_exit(); /* call only once after last close */ + } + } + + return devices; +} + +osmosdr::meta_range_t hackrf_common::get_sample_rates() +{ + osmosdr::meta_range_t range; + + /* we only add integer rates here because of better phase noise performance. + * the user is allowed to request arbitrary (fractional) rates within these + * boundaries. */ + + range += osmosdr::range_t( 8e6 ); + range += osmosdr::range_t( 10e6 ); + range += osmosdr::range_t( 12.5e6 ); + range += osmosdr::range_t( 16e6 ); + range += osmosdr::range_t( 20e6 ); /* confirmed to work on fast machines */ + + return range; +} + +double hackrf_common::set_sample_rate( double rate ) +{ + int ret; + + if (_dev.get() && _started) { + ret = hackrf_set_sample_rate( _dev.get(), rate ); + if ( HACKRF_SUCCESS != ret ) { + HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_sample_rate", rate ) ) + } + } + + _sample_rate = rate; + return get_sample_rate(); +} + +double hackrf_common::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t hackrf_common::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( _sample_rate / 2, 7250e6 - _sample_rate / 2 ); + + return range; +} + +double hackrf_common::set_center_freq( double freq, size_t chan ) +{ + int ret; + + #define APPLY_PPM_CORR(val, ppm) ((val) * (1.0 + (ppm) * 0.000001)) + + if (_dev.get() && _started) { + double corr_freq = APPLY_PPM_CORR( freq, _freq_corr ); + ret = hackrf_set_freq( _dev.get(), uint64_t(corr_freq) ); + if ( HACKRF_SUCCESS != ret ) { + HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_freq", corr_freq ) ) + } + } + + _center_freq = freq; + return get_center_freq( chan ); +} + +double hackrf_common::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double hackrf_common::set_freq_corr( double ppm, size_t chan ) +{ + _freq_corr = ppm; + + set_center_freq( _center_freq ); + + return get_freq_corr( chan ); +} + +double hackrf_common::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +bool hackrf_common::set_gain_mode( bool automatic, size_t chan ) +{ + _auto_gain = automatic; + + return get_gain_mode(chan); +} + +bool hackrf_common::get_gain_mode( size_t chan ) +{ + return _auto_gain; +} + +double hackrf_common::set_gain( double gain, size_t chan ) +{ + int ret; + double clip_gain = (gain >= 14.0) ? 14.0 : 0.0; + + if (_dev.get() && _started) { + uint8_t value = (clip_gain == 14.0) ? 1 : 0; + + ret = hackrf_set_amp_enable( _dev.get(), value ); + if ( HACKRF_SUCCESS != ret ) { + HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_amp_enable", value ) ) + } + } + + _amp_gain = clip_gain; + return hackrf_common::get_gain(chan); +} + +double hackrf_common::get_gain( size_t chan ) +{ + return _amp_gain; +} + +std::vector< std::string > hackrf_common::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += get_antenna( chan ); + + return antennas; +} + +std::string hackrf_common::set_antenna( const std::string & antenna, size_t chan ) +{ + return get_antenna( chan ); +} + +std::string hackrf_common::get_antenna( size_t chan ) +{ + return "TX/RX"; +} + +double hackrf_common::set_bandwidth( double bandwidth, size_t chan ) +{ + int ret; +// osmosdr::freq_range_t bandwidths = get_bandwidth_range( chan ); + + if ( bandwidth == 0.0 ) /* bandwidth of 0 means automatic filter selection */ + bandwidth = _sample_rate * 0.75; /* select narrower filters to prevent aliasing */ + + /* compute best default value depending on sample rate (auto filter) */ + uint32_t bw = hackrf_compute_baseband_filter_bw( uint32_t(bandwidth) ); + + if (_dev.get() && _started) { + ret = hackrf_set_baseband_filter_bandwidth( _dev.get(), bw ); + if (HACKRF_SUCCESS != ret) { + HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_baseband_filter_bandwidth", bw ) ) + } + } + + _bandwidth = bw; + return get_bandwidth(chan); +} + +double hackrf_common::get_bandwidth( size_t chan ) +{ + return _bandwidth; +} + +osmosdr::freq_range_t hackrf_common::get_bandwidth_range( size_t chan ) +{ + osmosdr::freq_range_t bandwidths; + + // TODO: read out from libhackrf when an API is available + + bandwidths += osmosdr::range_t( 1750000 ); + bandwidths += osmosdr::range_t( 2500000 ); + bandwidths += osmosdr::range_t( 3500000 ); + bandwidths += osmosdr::range_t( 5000000 ); + bandwidths += osmosdr::range_t( 5500000 ); + bandwidths += osmosdr::range_t( 6000000 ); + bandwidths += osmosdr::range_t( 7000000 ); + bandwidths += osmosdr::range_t( 8000000 ); + bandwidths += osmosdr::range_t( 9000000 ); + bandwidths += osmosdr::range_t( 10000000 ); + bandwidths += osmosdr::range_t( 12000000 ); + bandwidths += osmosdr::range_t( 14000000 ); + bandwidths += osmosdr::range_t( 15000000 ); + bandwidths += osmosdr::range_t( 20000000 ); + bandwidths += osmosdr::range_t( 24000000 ); + bandwidths += osmosdr::range_t( 28000000 ); + + return bandwidths; +} + +bool hackrf_common::set_bias( bool bias ) +{ + int ret; + + if (_dev.get() && _started) { + ret = hackrf_set_antenna_enable(_dev.get(), static_cast<uint8_t>(bias)); + if (ret != HACKRF_SUCCESS) + { + std::cerr << "Failed to apply antenna bias voltage state: " << bias << HACKRF_FORMAT_ERROR(ret, "") << std::endl; + } + } + + _bias = bias; + return get_bias(); +} + +bool hackrf_common::get_bias() +{ + return _bias; +} + +void hackrf_common::start() +{ + _started = true; + set_bandwidth(get_bandwidth()); + set_center_freq(get_center_freq()); + set_sample_rate(get_sample_rate()); + set_gain(get_gain()); + set_bias(get_bias()); +} + +void hackrf_common::stop() +{ + _started = false; +} diff --git a/lib/hackrf/hackrf_common.h b/lib/hackrf/hackrf_common.h new file mode 100644 index 0000000000..02eabd2f0c --- /dev/null +++ b/lib/hackrf/hackrf_common.h @@ -0,0 +1,111 @@ +/* -*- c++ -*- */ +/* + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> + * + * gr-osmosdr is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * gr-osmosdr is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-osmosdr; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ +#ifndef INCLUDED_HACKRF_COMMON_H +#define INCLUDED_HACKRF_COMMON_H + +#include <memory> +#include <mutex> +#include <string> +#include <vector> + +#include <boost/format.hpp> + +#include <osmosdr/ranges.h> +#include <libhackrf/hackrf.h> + +#define BUF_LEN (16 * 32 * 512) /* must be multiple of 512 */ +#define BUF_NUM 15 + +#define BYTES_PER_SAMPLE 2 /* HackRF device produces/consumes 8 bit unsigned IQ data */ + +#define HACKRF_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%) %2%") \ + % ret % hackrf_error_name((enum hackrf_error)ret) ) + +#define HACKRF_THROW_ON_ERROR(ret, msg) \ + if ( ret != HACKRF_SUCCESS ) \ + { \ + throw std::runtime_error( HACKRF_FORMAT_ERROR(ret, msg) ); \ + } + +#define HACKRF_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +typedef std::shared_ptr<hackrf_device> hackrf_sptr; + +class hackrf_common +{ +public: + hackrf_common(const std::string &args); + +protected: + static std::vector< std::string > get_devices(); + + osmosdr::meta_range_t get_sample_rates( void ); + double set_sample_rate( double rate ); + double get_sample_rate( void ); + + osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); + double set_center_freq( double freq, size_t chan = 0 ); + double get_center_freq( size_t chan = 0 ); + double set_freq_corr( double ppm, size_t chan = 0 ); + double get_freq_corr( size_t chan = 0 ); + + bool set_gain_mode( bool automatic, size_t chan = 0 ); + bool get_gain_mode( size_t chan = 0 ); + double set_gain( double gain, size_t chan = 0 ); + double get_gain( size_t chan = 0 ); + + std::vector< std::string > get_antennas( size_t chan = 0 ); + std::string set_antenna( const std::string & antenna, size_t chan = 0 ); + std::string get_antenna( size_t chan = 0 ); + + double set_bandwidth( double bandwidth, size_t chan = 0 ); + double get_bandwidth( size_t chan = 0 ); + osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ); + + bool set_bias( bool bias ); + bool get_bias(); + + void start(); + void stop(); + + hackrf_sptr _dev; + +private: + static void close(void *dev); + + static int _usage; + static std::mutex _usage_mutex; + + static std::map<std::string, std::weak_ptr<hackrf_device>> _devs; + static std::mutex _devs_mutex; + + double _sample_rate; + double _center_freq; + double _freq_corr; + bool _auto_gain; + double _amp_gain; + double _bandwidth; + bool _bias; + bool _started; +}; + +#endif /* INCLUDED_HACKRF_COMMON_H */ diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc index ee089c642c..f003b89ce3 100644 --- a/lib/hackrf/hackrf_sink_c.cc +++ b/lib/hackrf/hackrf_sink_c.cc @@ -2,19 +2,20 @@ /* * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> * Copyright 2014 Hoernchen <la(a)tfc-server.de> + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> * - * GNU Radio is free software; you can redistribute it and/or modify + * gr-osmosdr is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * gr-osmosdr is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to + * along with gr-osmosdr; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ @@ -38,10 +39,6 @@ #endif #include <boost/assign.hpp> -#include <boost/format.hpp> -#include <boost/detail/endian.hpp> -#include <boost/algorithm/string.hpp> -#include <boost/thread/thread.hpp> #include <gnuradio/io_signature.h> @@ -51,24 +48,6 @@ using namespace boost::assign; -#define BUF_LEN (16 * 32 * 512) /* must be multiple of 512 */ -#define BUF_NUM 15 - -#define BYTES_PER_SAMPLE 2 /* HackRF device consumes 8 bit unsigned IQ data */ - -#define HACKRF_FORMAT_ERROR(ret, msg) \ - boost::str( boost::format(msg " (%1%) %2%") \ - % ret % hackrf_error_name((enum hackrf_error)ret) ) - -#define HACKRF_THROW_ON_ERROR(ret, msg) \ - if ( ret != HACKRF_SUCCESS ) \ - { \ - throw std::runtime_error( HACKRF_FORMAT_ERROR(ret, msg) ); \ - } - -#define HACKRF_FUNC_STR(func, arg) \ - boost::str(boost::format(func "(%1%)") % arg) + " has failed" - static inline bool cb_init(circular_buffer_t *cb, size_t capacity, size_t sz) { cb->buffer = malloc(capacity * sz); @@ -103,6 +82,11 @@ static inline bool cb_has_room(circular_buffer_t *cb) return true; } +static inline bool cb_is_empty(circular_buffer_t *cb) +{ + return cb->count == 0; +} + static inline bool cb_push_back(circular_buffer_t *cb, const void *item) { if(cb->count == cb->capacity) @@ -127,9 +111,6 @@ static inline bool cb_pop_front(circular_buffer_t *cb, void *item) return true; } -int hackrf_sink_c::_usage = 0; -boost::mutex hackrf_sink_c::_usage_mutex; - hackrf_sink_c_sptr make_hackrf_sink_c (const std::string & args) { return gnuradio::get_initial_sptr(new hackrf_sink_c (args)); @@ -156,66 +137,21 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args) : gr::sync_block ("hackrf_sink_c", gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), - _dev(NULL), + hackrf_common::hackrf_common(args), _buf(NULL), - _sample_rate(0), - _center_freq(0), - _freq_corr(0), - _auto_gain(false), - _amp_gain(0), - _vga_gain(0), - _bandwidth(0) + _vga_gain(0) { - int ret; - std::string *hackrf_serial = NULL; - dict_t dict = params_to_dict(args); - if (dict.count("hackrf") && dict["hackrf"].length() > 0) - hackrf_serial = &dict["hackrf"]; - _buf_num = 0; if (dict.count("buffers")) - _buf_num = boost::lexical_cast< unsigned int >( dict["buffers"] ); + _buf_num = std::stoi(dict["buffers"]); if (0 == _buf_num) _buf_num = BUF_NUM; - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - if ( _usage == 0 ) - hackrf_init(); /* call only once before the first open */ - - _usage++; - } - - _dev = NULL; -#ifdef LIBHACKRF_HAVE_DEVICE_LIST - if ( hackrf_serial ) - ret = hackrf_open_by_serial( hackrf_serial->c_str(), &_dev ); - else -#endif - ret = hackrf_open( &_dev ); - HACKRF_THROW_ON_ERROR(ret, "Failed to open HackRF device") - - uint8_t board_id; - ret = hackrf_board_id_read( _dev, &board_id ); - HACKRF_THROW_ON_ERROR(ret, "Failed to get HackRF board id") - - char version[40]; - memset(version, 0, sizeof(version)); - ret = hackrf_version_string_read( _dev, version, sizeof(version)); - HACKRF_THROW_ON_ERROR(ret, "Failed to read version string") -#if 0 - read_partid_serialno_t serial_number; - ret = hackrf_board_partid_serialno_read( _dev, &serial_number ); - HACKRF_THROW_ON_ERROR(ret, "Failed to read serial number") -#endif - std::cerr << "Using " << hackrf_board_id_name(hackrf_board_id(board_id)) << " " - << "with firmware " << version << " " - << std::endl; + _stopping = false; if ( BUF_NUM != _buf_num ) { std::cerr << "Using " << _buf_num << " buffers of size " << BUF_LEN << "." @@ -232,26 +168,12 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args) // Check device args to find out if bias/phantom power is desired. if ( dict.count("bias_tx") ) { - bool bias = boost::lexical_cast<bool>( dict["bias_tx"] ); - ret = hackrf_set_antenna_enable(_dev, static_cast<uint8_t>(bias)); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << "Failed to apply antenna bias voltage state: " << bias << HACKRF_FORMAT_ERROR(ret, "") << std::endl; - } - else - { - std::cerr << (bias ? "Enabled" : "Disabled") << " antenna bias voltage" << std::endl; - } + hackrf_common::set_bias(dict["bias_tx"] == "1"); } _buf = (int8_t *) malloc( BUF_LEN ); cb_init( &_cbuf, _buf_num, BUF_LEN ); - -// _thread = gr::thread::thread(_hackrf_wait, this); - - ret = hackrf_start_tx( _dev, _hackrf_tx_callback, (void *)this ); - HACKRF_THROW_ON_ERROR(ret, "Failed to start TX streaming") } /* @@ -259,30 +181,6 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args) */ hackrf_sink_c::~hackrf_sink_c () { - if (_dev) { -// _thread.join(); - int ret = hackrf_stop_tx( _dev ); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << HACKRF_FORMAT_ERROR(ret, "Failed to stop TX streaming") << std::endl; - } - ret = hackrf_close( _dev ); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << HACKRF_FORMAT_ERROR(ret, "Failed to close HackRF") << std::endl; - } - _dev = NULL; - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - _usage--; - - if ( _usage == 0 ) - hackrf_exit(); /* call only once after last close */ - } - } - free(_buf); _buf = NULL; @@ -302,11 +200,16 @@ int hackrf_sink_c::hackrf_tx_callback(unsigned char *buffer, uint32_t length) *buffer++ = rand() % 255; #else { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); if ( ! cb_pop_front( &_cbuf, buffer ) ) { memset(buffer, 0, length); - std::cerr << "U" << std::flush; + if (_stopping) { + _buf_cond.notify_one(); + return -1; + } else { + std::cerr << "U" << std::flush; + } } else { // std::cerr << "-" << std::flush; _buf_cond.notify_one(); @@ -316,42 +219,61 @@ int hackrf_sink_c::hackrf_tx_callback(unsigned char *buffer, uint32_t length) return 0; // TODO: return -1 on error/stop } -void hackrf_sink_c::_hackrf_wait(hackrf_sink_c *obj) -{ - obj->hackrf_wait(); -} - -void hackrf_sink_c::hackrf_wait() -{ -} - bool hackrf_sink_c::start() { - if ( ! _dev ) + if ( ! _dev.get() ) return false; + _stopping = false; _buf_used = 0; -#if 0 - int ret = hackrf_start_tx( _dev, _hackrf_tx_callback, (void *)this ); + hackrf_common::start(); + int ret = hackrf_start_tx( _dev.get(), _hackrf_tx_callback, (void *)this ); if ( ret != HACKRF_SUCCESS ) { std::cerr << "Failed to start TX streaming (" << ret << ")" << std::endl; return false; } -#endif return true; } bool hackrf_sink_c::stop() { - if ( ! _dev ) + int i; + + if ( ! _dev.get() ) return false; -#if 0 - int ret = hackrf_stop_tx( _dev ); + + { + std::unique_lock<std::mutex> lock(_buf_mutex); + + while ( ! cb_has_room(&_cbuf) ) + _buf_cond.wait( lock ); + + // Fill the rest of the current buffer with silence. + memset(_buf + _buf_used, 0, BUF_LEN - _buf_used); + cb_push_back( &_cbuf, _buf ); + _buf_used = 0; + + // Add some more silence so the end doesn't get cut off. + memset(_buf, 0, BUF_LEN); + for (i = 0; i < 5; i++) { + while ( ! cb_has_room(&_cbuf) ) + _buf_cond.wait( lock ); + + cb_push_back( &_cbuf, _buf ); + } + + _stopping = true; + + while (hackrf_is_streaming(_dev.get()) == HACKRF_TRUE) + _buf_cond.wait( lock ); + } + + hackrf_common::stop(); + int ret = hackrf_stop_tx( _dev.get() ); if ( ret != HACKRF_SUCCESS ) { std::cerr << "Failed to stop TX streaming (" << ret << ")" << std::endl; return false; } -#endif return true; } @@ -424,7 +346,7 @@ int hackrf_sink_c::work( int noutput_items, const gr_complex *in = (const gr_complex *) input_items[0]; { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); while ( ! cb_has_room(&_cbuf) ) _buf_cond.wait( lock ); @@ -454,7 +376,7 @@ int hackrf_sink_c::work( int noutput_items, if((unsigned int)noutput_items >= remaining) { { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); if ( ! cb_push_back( &_cbuf, _buf ) ) { _buf_used = prev_buf_used; @@ -477,78 +399,7 @@ int hackrf_sink_c::work( int noutput_items, std::vector<std::string> hackrf_sink_c::get_devices() { - std::vector<std::string> devices; - std::string label; - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - if ( _usage == 0 ) - hackrf_init(); /* call only once before the first open */ - - _usage++; - } - -#ifdef LIBHACKRF_HAVE_DEVICE_LIST - hackrf_device_list_t *list = hackrf_device_list(); - - for (int i = 0; i < list->devicecount; i++) { - label = "HackRF "; - label += hackrf_usb_board_id_name( list->usb_board_ids[i] ); - - std::string args; - if (list->serial_numbers[i]) { - std::string serial = boost::lexical_cast< std::string >( list->serial_numbers[i] ); - if (serial.length() > 6) - serial = serial.substr(serial.length() - 6, 6); - args = "hackrf=" + serial; - label += " " + serial; - } else - args = "hackrf"; /* will pick the first one, serial number is required for choosing a specific one */ - - boost::algorithm::trim(label); - - args += ",label='" + label + "'"; - devices.push_back( args ); - } - - hackrf_device_list_free(list); -#else - - int ret; - hackrf_device *dev = NULL; - ret = hackrf_open(&dev); - if ( HACKRF_SUCCESS == ret ) - { - std::string args = "hackrf=0"; - - label = "HackRF"; - - uint8_t board_id; - ret = hackrf_board_id_read( dev, &board_id ); - if ( HACKRF_SUCCESS == ret ) - { - label += std::string(" ") + hackrf_board_id_name(hackrf_board_id(board_id)); - } - - args += ",label='" + label + "'"; - devices.push_back( args ); - - ret = hackrf_close(dev); - } - -#endif - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - _usage--; - - if ( _usage == 0 ) - hackrf_exit(); /* call only once after last close */ - } - - return devices; + return hackrf_common::get_devices(); } size_t hackrf_sink_c::get_num_channels() @@ -558,88 +409,42 @@ size_t hackrf_sink_c::get_num_channels() osmosdr::meta_range_t hackrf_sink_c::get_sample_rates() { - osmosdr::meta_range_t range; - - /* we only add integer rates here because of better phase noise performance. - * the user is allowed to request arbitrary (fractional) rates within these - * boundaries. */ - - range += osmosdr::range_t( 8e6 ); - range += osmosdr::range_t( 10e6 ); - range += osmosdr::range_t( 12.5e6 ); - range += osmosdr::range_t( 16e6 ); - range += osmosdr::range_t( 20e6 ); /* confirmed to work on fast machines */ - - return range; + return hackrf_common::get_sample_rates(); } double hackrf_sink_c::set_sample_rate( double rate ) { - int ret; - - if (_dev) { - ret = hackrf_set_sample_rate( _dev, rate ); - if ( HACKRF_SUCCESS == ret ) { - _sample_rate = rate; - //set_bandwidth( 0.0 ); /* bandwidth of 0 means automatic filter selection */ - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_sample_rate", rate ) ) - } - } - - return get_sample_rate(); + return hackrf_common::set_sample_rate(rate); } double hackrf_sink_c::get_sample_rate() { - return _sample_rate; + return hackrf_common::get_sample_rate(); } osmosdr::freq_range_t hackrf_sink_c::get_freq_range( size_t chan ) { - osmosdr::freq_range_t range; - - range += osmosdr::range_t( _sample_rate / 2, 7250e6 - _sample_rate / 2 ); - - return range; + return hackrf_common::get_freq_range(chan); } double hackrf_sink_c::set_center_freq( double freq, size_t chan ) { - int ret; - - #define APPLY_PPM_CORR(val, ppm) ((val) * (1.0 + (ppm) * 0.000001)) - - if (_dev) { - double corr_freq = APPLY_PPM_CORR( freq, _freq_corr ); - ret = hackrf_set_freq( _dev, uint64_t(corr_freq) ); - if ( HACKRF_SUCCESS == ret ) { - _center_freq = freq; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_freq", corr_freq ) ) - } - } - - return get_center_freq( chan ); + return hackrf_common::set_center_freq(freq, chan); } double hackrf_sink_c::get_center_freq( size_t chan ) { - return _center_freq; + return hackrf_common::get_center_freq(chan); } double hackrf_sink_c::set_freq_corr( double ppm, size_t chan ) { - _freq_corr = ppm; - - set_center_freq( _center_freq ); - - return get_freq_corr( chan ); + return hackrf_common::set_freq_corr(ppm, chan); } double hackrf_sink_c::get_freq_corr( size_t chan ) { - return _freq_corr; + return hackrf_common::get_freq_corr(chan); } std::vector<std::string> hackrf_sink_c::get_gain_names( size_t chan ) @@ -672,34 +477,17 @@ osmosdr::gain_range_t hackrf_sink_c::get_gain_range( const std::string & name, s bool hackrf_sink_c::set_gain_mode( bool automatic, size_t chan ) { - _auto_gain = automatic; - - return get_gain_mode(chan); + return hackrf_common::set_gain_mode(automatic, chan); } bool hackrf_sink_c::get_gain_mode( size_t chan ) { - return _auto_gain; + return hackrf_common::get_gain_mode(chan); } double hackrf_sink_c::set_gain( double gain, size_t chan ) { - int ret; - osmosdr::gain_range_t rf_gains = get_gain_range( "RF", chan ); - - if (_dev) { - double clip_gain = rf_gains.clip( gain, true ); - uint8_t value = clip_gain == 14.0f ? 1 : 0; - - ret = hackrf_set_amp_enable( _dev, value ); - if ( HACKRF_SUCCESS == ret ) { - _amp_gain = clip_gain; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_amp_enable", value ) ) - } - } - - return _amp_gain; + return hackrf_common::set_gain(gain, chan); } double hackrf_sink_c::set_gain( double gain, const std::string & name, size_t chan) @@ -717,7 +505,7 @@ double hackrf_sink_c::set_gain( double gain, const std::string & name, size_t ch double hackrf_sink_c::get_gain( size_t chan ) { - return _amp_gain; + return hackrf_common::get_gain(chan); } double hackrf_sink_c::get_gain( const std::string & name, size_t chan ) @@ -738,10 +526,10 @@ double hackrf_sink_c::set_if_gain( double gain, size_t chan ) int ret; osmosdr::gain_range_t if_gains = get_gain_range( "IF", chan ); - if (_dev) { + if (_dev.get()) { double clip_gain = if_gains.clip( gain, true ); - ret = hackrf_set_txvga_gain( _dev, uint32_t(clip_gain) ); + ret = hackrf_set_txvga_gain( _dev.get(), uint32_t(clip_gain) ); if ( HACKRF_SUCCESS == ret ) { _vga_gain = clip_gain; } else { @@ -759,72 +547,30 @@ double hackrf_sink_c::set_bb_gain( double gain, size_t chan ) std::vector< std::string > hackrf_sink_c::get_antennas( size_t chan ) { - std::vector< std::string > antennas; - - antennas += get_antenna( chan ); - - return antennas; + return hackrf_common::get_antennas(chan); } std::string hackrf_sink_c::set_antenna( const std::string & antenna, size_t chan ) { - return get_antenna( chan ); + return hackrf_common::set_antenna(antenna, chan); } std::string hackrf_sink_c::get_antenna( size_t chan ) { - return "TX/RX"; + return hackrf_common::get_antenna(chan); } double hackrf_sink_c::set_bandwidth( double bandwidth, size_t chan ) { - int ret; -// osmosdr::freq_range_t bandwidths = get_bandwidth_range( chan ); - - if ( bandwidth == 0.0 ) /* bandwidth of 0 means automatic filter selection */ - bandwidth = _sample_rate * 0.75; /* select narrower filters to prevent aliasing */ - - if ( _dev ) { - /* compute best default value depending on sample rate (auto filter) */ - uint32_t bw = hackrf_compute_baseband_filter_bw( uint32_t(bandwidth) ); - ret = hackrf_set_baseband_filter_bandwidth( _dev, bw ); - if ( HACKRF_SUCCESS == ret ) { - _bandwidth = bw; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_baseband_filter_bandwidth", bw ) ) - } - } - - return _bandwidth; + return hackrf_common::set_bandwidth(bandwidth, chan); } double hackrf_sink_c::get_bandwidth( size_t chan ) { - return _bandwidth; + return hackrf_common::get_bandwidth(chan); } osmosdr::freq_range_t hackrf_sink_c::get_bandwidth_range( size_t chan ) { - osmosdr::freq_range_t bandwidths; - - // TODO: read out from libhackrf when an API is available - - bandwidths += osmosdr::range_t( 1750000 ); - bandwidths += osmosdr::range_t( 2500000 ); - bandwidths += osmosdr::range_t( 3500000 ); - bandwidths += osmosdr::range_t( 5000000 ); - bandwidths += osmosdr::range_t( 5500000 ); - bandwidths += osmosdr::range_t( 6000000 ); - bandwidths += osmosdr::range_t( 7000000 ); - bandwidths += osmosdr::range_t( 8000000 ); - bandwidths += osmosdr::range_t( 9000000 ); - bandwidths += osmosdr::range_t( 10000000 ); - bandwidths += osmosdr::range_t( 12000000 ); - bandwidths += osmosdr::range_t( 14000000 ); - bandwidths += osmosdr::range_t( 15000000 ); - bandwidths += osmosdr::range_t( 20000000 ); - bandwidths += osmosdr::range_t( 24000000 ); - bandwidths += osmosdr::range_t( 28000000 ); - - return bandwidths; + return hackrf_common::get_bandwidth_range(chan); } diff --git a/lib/hackrf/hackrf_sink_c.h b/lib/hackrf/hackrf_sink_c.h index a7e7ab86f5..08ff2ca8b3 100644 --- a/lib/hackrf/hackrf_sink_c.h +++ b/lib/hackrf/hackrf_sink_c.h @@ -1,34 +1,35 @@ /* -*- c++ -*- */ /* * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> * - * GNU Radio is free software; you can redistribute it and/or modify + * gr-osmosdr is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * gr-osmosdr is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to + * along with gr-osmosdr; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ #ifndef INCLUDED_HACKRF_SINK_C_H #define INCLUDED_HACKRF_SINK_C_H -#include <gnuradio/thread/thread.h> #include <gnuradio/sync_block.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> +#include <condition_variable> +#include <mutex> #include <libhackrf/hackrf.h> #include "sink_iface.h" +#include "hackrf_common.h" class hackrf_sink_c; @@ -67,7 +68,8 @@ hackrf_sink_c_sptr make_hackrf_sink_c (const std::string & args = ""); class hackrf_sink_c : public gr::sync_block, - public sink_iface + public sink_iface, + protected hackrf_common { private: // The friend declaration allows hackrf_make_sink_c to @@ -124,29 +126,16 @@ public: private: static int _hackrf_tx_callback(hackrf_transfer* transfer); int hackrf_tx_callback(unsigned char *buffer, uint32_t length); - static void _hackrf_wait(hackrf_sink_c *obj); - void hackrf_wait(); - - static int _usage; - static boost::mutex _usage_mutex; - - hackrf_device *_dev; -// gr::thread::thread _thread; circular_buffer_t _cbuf; int8_t *_buf; unsigned int _buf_num; unsigned int _buf_used; - boost::mutex _buf_mutex; - boost::condition_variable _buf_cond; - - double _sample_rate; - double _center_freq; - double _freq_corr; - bool _auto_gain; - double _amp_gain; + bool _stopping; + std::mutex _buf_mutex; + std::condition_variable _buf_cond; + double _vga_gain; - double _bandwidth; }; #endif /* INCLUDED_HACKRF_SINK_C_H */ diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc index 30b63c780b..51a6580eca 100644 --- a/lib/hackrf/hackrf_source_c.cc +++ b/lib/hackrf/hackrf_source_c.cc @@ -1,19 +1,20 @@ /* -*- c++ -*- */ /* * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> * - * GNU Radio is free software; you can redistribute it and/or modify + * gr-osmosdr is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * gr-osmosdr is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to + * along with gr-osmosdr; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ @@ -31,10 +32,7 @@ #include <iostream> #include <boost/assign.hpp> -#include <boost/format.hpp> #include <boost/detail/endian.hpp> -#include <boost/algorithm/string.hpp> -#include <boost/thread/thread.hpp> #include <gnuradio/io_signature.h> @@ -44,27 +42,6 @@ using namespace boost::assign; -#define BUF_LEN (16 * 32 * 512) /* must be multiple of 512 */ -#define BUF_NUM 15 - -#define BYTES_PER_SAMPLE 2 /* HackRF device produces 8 bit unsigned IQ data */ - -#define HACKRF_FORMAT_ERROR(ret, msg) \ - boost::str( boost::format(msg " (%1%) %2%") \ - % ret % hackrf_error_name((enum hackrf_error)ret) ) - -#define HACKRF_THROW_ON_ERROR(ret, msg) \ - if ( ret != HACKRF_SUCCESS ) \ - { \ - throw std::runtime_error( HACKRF_FORMAT_ERROR(ret, msg) ); \ - } - -#define HACKRF_FUNC_STR(func, arg) \ - boost::str(boost::format(func "(%1%)") % arg) + " has failed" - -int hackrf_source_c::_usage = 0; -boost::mutex hackrf_source_c::_usage_mutex; - hackrf_source_c_sptr make_hackrf_source_c (const std::string & args) { return gnuradio::get_initial_sptr(new hackrf_source_c (args)); @@ -91,29 +68,20 @@ hackrf_source_c::hackrf_source_c (const std::string &args) : gr::sync_block ("hackrf_source_c", gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), - _dev(NULL), + hackrf_common::hackrf_common(args), _buf(NULL), - _sample_rate(0), - _center_freq(0), - _freq_corr(0), - _auto_gain(false), - _amp_gain(0), _lna_gain(0), - _vga_gain(0), - _bandwidth(0) + _vga_gain(0) { - int ret; - std::string hackrf_serial; - dict_t dict = params_to_dict(args); _buf_num = _buf_len = _buf_head = _buf_used = _buf_offset = 0; if (dict.count("buffers")) - _buf_num = boost::lexical_cast< unsigned int >( dict["buffers"] ); + _buf_num = std::stoi(dict["buffers"]); // if (dict.count("buflen")) -// _buf_len = boost::lexical_cast< unsigned int >( dict["buflen"] ); +// _buf_len = std::stoi(dict["buflen"]); if (0 == _buf_num) _buf_num = BUF_NUM; @@ -134,66 +102,6 @@ hackrf_source_c::hackrf_source_c (const std::string &args) #endif } - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - if ( _usage == 0 ) - hackrf_init(); /* call only once before the first open */ - - _usage++; - } - - _dev = NULL; - -#ifdef LIBHACKRF_HAVE_DEVICE_LIST - if (dict.count("hackrf") && dict["hackrf"].length() > 0) { - hackrf_serial = dict["hackrf"]; - - if (hackrf_serial.length() > 1) { - ret = hackrf_open_by_serial( hackrf_serial.c_str(), &_dev ); - } else { - int dev_index = 0; - try { - dev_index = boost::lexical_cast< int >( hackrf_serial ); - } catch ( std::exception &ex ) { - throw std::runtime_error( - "Failed to use '" + hackrf_serial + "' as HackRF device index number: " + ex.what()); - } - - hackrf_device_list_t *list = hackrf_device_list(); - if (dev_index < list->devicecount) { - ret = hackrf_device_list_open(list, dev_index, &_dev); - } else { - hackrf_device_list_free(list); - throw std::runtime_error( - "Failed to use '" + hackrf_serial + "' as HackRF device index: not enough devices"); - } - hackrf_device_list_free(list); - } - } else -#endif - ret = hackrf_open( &_dev ); - - HACKRF_THROW_ON_ERROR(ret, "Failed to open HackRF device") - - uint8_t board_id; - ret = hackrf_board_id_read( _dev, &board_id ); - HACKRF_THROW_ON_ERROR(ret, "Failed to get HackRF board id") - - char version[40]; - memset(version, 0, sizeof(version)); - ret = hackrf_version_string_read( _dev, version, sizeof(version)); - HACKRF_THROW_ON_ERROR(ret, "Failed to read version string") - -#if 0 - read_partid_serialno_t serial_number; - ret = hackrf_board_partid_serialno_read( _dev, &serial_number ); - HACKRF_THROW_ON_ERROR(ret, "Failed to read serial number") -#endif - std::cerr << "Using " << hackrf_board_id_name(hackrf_board_id(board_id)) << " " - << "with firmware " << version << " " - << std::endl; - if ( BUF_NUM != _buf_num || BUF_LEN != _buf_len ) { std::cerr << "Using " << _buf_num << " buffers of size " << _buf_len << "." << std::endl; @@ -211,16 +119,7 @@ hackrf_source_c::hackrf_source_c (const std::string &args) // Check device args to find out if bias/phantom power is desired. if ( dict.count("bias") ) { - bool bias = boost::lexical_cast<bool>( dict["bias"] ); - ret = hackrf_set_antenna_enable(_dev, static_cast<uint8_t>(bias)); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << "Failed to apply antenna bias voltage state: " << bias << HACKRF_FORMAT_ERROR(ret, "") << std::endl; - } - else - { - std::cerr << (bias ? "Enabled" : "Disabled") << " antenna bias voltage" << std::endl; - } + hackrf_common::set_bias(dict["bias"] == "1"); } _buf = (unsigned short **) malloc(_buf_num * sizeof(unsigned short *)); @@ -229,11 +128,6 @@ hackrf_source_c::hackrf_source_c (const std::string &args) for(unsigned int i = 0; i < _buf_num; ++i) _buf[i] = (unsigned short *) malloc(_buf_len); } - -// _thread = gr::thread::thread(_hackrf_wait, this); - - ret = hackrf_start_rx( _dev, _hackrf_rx_callback, (void *)this ); - HACKRF_THROW_ON_ERROR(ret, "Failed to start RX streaming") } /* @@ -241,30 +135,6 @@ hackrf_source_c::hackrf_source_c (const std::string &args) */ hackrf_source_c::~hackrf_source_c () { - if (_dev) { -// _thread.join(); - int ret = hackrf_stop_rx( _dev ); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << HACKRF_FORMAT_ERROR(ret, "Failed to stop RX streaming") << std::endl; - } - ret = hackrf_close( _dev ); - if ( ret != HACKRF_SUCCESS ) - { - std::cerr << HACKRF_FORMAT_ERROR(ret, "Failed to close HackRF") << std::endl; - } - _dev = NULL; - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - _usage--; - - if ( _usage == 0 ) - hackrf_exit(); /* call only once after last close */ - } - } - if (_buf) { for(unsigned int i = 0; i < _buf_num; ++i) { free(_buf[i]); @@ -284,7 +154,7 @@ int hackrf_source_c::_hackrf_rx_callback(hackrf_transfer *transfer) int hackrf_source_c::hackrf_rx_callback(unsigned char *buf, uint32_t len) { { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); int buf_tail = (_buf_head + _buf_used) % _buf_num; memcpy(_buf[buf_tail], buf, len); @@ -302,40 +172,31 @@ int hackrf_source_c::hackrf_rx_callback(unsigned char *buf, uint32_t len) return 0; // TODO: return -1 on error/stop } -void hackrf_source_c::_hackrf_wait(hackrf_source_c *obj) -{ - obj->hackrf_wait(); -} - -void hackrf_source_c::hackrf_wait() -{ -} - bool hackrf_source_c::start() { - if ( ! _dev ) + if ( ! _dev.get() ) return false; -#if 0 - int ret = hackrf_start_rx( _dev, _hackrf_rx_callback, (void *)this ); + + hackrf_common::start(); + int ret = hackrf_start_rx( _dev.get(), _hackrf_rx_callback, (void *)this ); if ( ret != HACKRF_SUCCESS ) { std::cerr << "Failed to start RX streaming (" << ret << ")" << std::endl; return false; } -#endif return true; } bool hackrf_source_c::stop() { - if ( ! _dev ) + if ( ! _dev.get() ) return false; -#if 0 - int ret = hackrf_stop_rx( _dev ); + + hackrf_common::stop(); + int ret = hackrf_stop_rx( _dev.get() ); if ( ret != HACKRF_SUCCESS ) { std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; return false; } -#endif return true; } @@ -347,11 +208,11 @@ int hackrf_source_c::work( int noutput_items, bool running = false; - if ( _dev ) - running = (hackrf_is_streaming( _dev ) == HACKRF_TRUE); + if ( _dev.get() ) + running = (hackrf_is_streaming( _dev.get() ) == HACKRF_TRUE); { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); while (_buf_used < 3 && running) // collect at least 3 buffers _buf_cond.wait( lock ); @@ -373,7 +234,7 @@ int hackrf_source_c::work( int noutput_items, *out++ = _lut[ *(buf + i) ]; { - boost::mutex::scoped_lock lock( _buf_mutex ); + std::unique_lock<std::mutex> lock(_buf_mutex); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; @@ -395,78 +256,7 @@ int hackrf_source_c::work( int noutput_items, std::vector<std::string> hackrf_source_c::get_devices() { - std::vector<std::string> devices; - std::string label; - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - if ( _usage == 0 ) - hackrf_init(); /* call only once before the first open */ - - _usage++; - } - -#ifdef LIBHACKRF_HAVE_DEVICE_LIST - hackrf_device_list_t *list = hackrf_device_list(); - - for (int i = 0; i < list->devicecount; i++) { - label = "HackRF "; - label += hackrf_usb_board_id_name( list->usb_board_ids[i] ); - - std::string args; - if (list->serial_numbers[i]) { - std::string serial = boost::lexical_cast< std::string >( list->serial_numbers[i] ); - if (serial.length() > 6) - serial = serial.substr(serial.length() - 6, 6); - args = "hackrf=" + serial; - label += " " + serial; - } else - args = "hackrf"; /* will pick the first one, serial number is required for choosing a specific one */ - - boost::algorithm::trim(label); - - args += ",label='" + label + "'"; - devices.push_back( args ); - } - - hackrf_device_list_free(list); -#else - - int ret; - hackrf_device *dev = NULL; - ret = hackrf_open(&dev); - if ( HACKRF_SUCCESS == ret ) - { - std::string args = "hackrf=0"; - - label = "HackRF"; - - uint8_t board_id; - ret = hackrf_board_id_read( dev, &board_id ); - if ( HACKRF_SUCCESS == ret ) - { - label += std::string(" ") + hackrf_board_id_name(hackrf_board_id(board_id)); - } - - args += ",label='" + label + "'"; - devices.push_back( args ); - - ret = hackrf_close(dev); - } - -#endif - - { - boost::mutex::scoped_lock lock( _usage_mutex ); - - _usage--; - - if ( _usage == 0 ) - hackrf_exit(); /* call only once after last close */ - } - - return devices; + return hackrf_common::get_devices(); } size_t hackrf_source_c::get_num_channels() @@ -476,88 +266,42 @@ size_t hackrf_source_c::get_num_channels() osmosdr::meta_range_t hackrf_source_c::get_sample_rates() { - osmosdr::meta_range_t range; - - /* we only add integer rates here because of better phase noise performance. - * the user is allowed to request arbitrary (fractional) rates within these - * boundaries. */ - - range += osmosdr::range_t( 8e6 ); - range += osmosdr::range_t( 10e6 ); - range += osmosdr::range_t( 12.5e6 ); - range += osmosdr::range_t( 16e6 ); - range += osmosdr::range_t( 20e6 ); /* confirmed to work on fast machines */ - - return range; + return hackrf_common::get_sample_rates(); } double hackrf_source_c::set_sample_rate( double rate ) { - int ret; - - if (_dev) { - ret = hackrf_set_sample_rate( _dev, rate ); - if ( HACKRF_SUCCESS == ret ) { - _sample_rate = rate; - //set_bandwidth( 0.0 ); /* bandwidth of 0 means automatic filter selection */ - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_sample_rate", rate ) ) - } - } - - return get_sample_rate(); + return hackrf_common::set_sample_rate(rate); } double hackrf_source_c::get_sample_rate() { - return _sample_rate; + return hackrf_common::get_sample_rate(); } osmosdr::freq_range_t hackrf_source_c::get_freq_range( size_t chan ) { - osmosdr::freq_range_t range; - - range += osmosdr::range_t( _sample_rate / 2, 7250e6 - _sample_rate / 2 ); - - return range; + return hackrf_common::get_freq_range(chan); } double hackrf_source_c::set_center_freq( double freq, size_t chan ) { - int ret; - - #define APPLY_PPM_CORR(val, ppm) ((val) * (1.0 + (ppm) * 0.000001)) - - if (_dev) { - double corr_freq = APPLY_PPM_CORR( freq, _freq_corr ); - ret = hackrf_set_freq( _dev, uint64_t(corr_freq) ); - if ( HACKRF_SUCCESS == ret ) { - _center_freq = freq; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_freq", corr_freq ) ) - } - } - - return get_center_freq( chan ); + return hackrf_common::set_center_freq(freq, chan); } double hackrf_source_c::get_center_freq( size_t chan ) { - return _center_freq; + return hackrf_common::get_center_freq(chan); } double hackrf_source_c::set_freq_corr( double ppm, size_t chan ) { - _freq_corr = ppm; - - set_center_freq( _center_freq ); - - return get_freq_corr( chan ); + return hackrf_common::set_freq_corr(ppm, chan); } double hackrf_source_c::get_freq_corr( size_t chan ) { - return _freq_corr; + return hackrf_common::get_freq_corr(chan); } std::vector<std::string> hackrf_source_c::get_gain_names( size_t chan ) @@ -595,34 +339,17 @@ osmosdr::gain_range_t hackrf_source_c::get_gain_range( const std::string & name, bool hackrf_source_c::set_gain_mode( bool automatic, size_t chan ) { - _auto_gain = automatic; - - return get_gain_mode(chan); + return hackrf_common::set_gain_mode(automatic, chan); } bool hackrf_source_c::get_gain_mode( size_t chan ) { - return _auto_gain; + return hackrf_common::get_gain_mode(chan); } double hackrf_source_c::set_gain( double gain, size_t chan ) { - int ret; - osmosdr::gain_range_t rf_gains = get_gain_range( "RF", chan ); - - if (_dev) { - double clip_gain = rf_gains.clip( gain, true ); - uint8_t value = clip_gain == 14.0f ? 1 : 0; - - ret = hackrf_set_amp_enable( _dev, value ); - if ( HACKRF_SUCCESS == ret ) { - _amp_gain = clip_gain; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_amp_enable", value ) ) - } - } - - return _amp_gain; + return hackrf_common::set_gain(gain, chan); } double hackrf_source_c::set_gain( double gain, const std::string & name, size_t chan) @@ -644,7 +371,7 @@ double hackrf_source_c::set_gain( double gain, const std::string & name, size_t double hackrf_source_c::get_gain( size_t chan ) { - return _amp_gain; + return hackrf_common::get_gain(chan); } double hackrf_source_c::get_gain( const std::string & name, size_t chan ) @@ -669,10 +396,10 @@ double hackrf_source_c::set_if_gain(double gain, size_t chan) int ret; osmosdr::gain_range_t rf_gains = get_gain_range( "IF", chan ); - if (_dev) { + if (_dev.get()) { double clip_gain = rf_gains.clip( gain, true ); - ret = hackrf_set_lna_gain( _dev, uint32_t(clip_gain) ); + ret = hackrf_set_lna_gain( _dev.get(), uint32_t(clip_gain) ); if ( HACKRF_SUCCESS == ret ) { _lna_gain = clip_gain; } else { @@ -688,10 +415,10 @@ double hackrf_source_c::set_bb_gain( double gain, size_t chan ) int ret; osmosdr::gain_range_t if_gains = get_gain_range( "BB", chan ); - if (_dev) { + if (_dev.get()) { double clip_gain = if_gains.clip( gain, true ); - ret = hackrf_set_vga_gain( _dev, uint32_t(clip_gain) ); + ret = hackrf_set_vga_gain( _dev.get(), uint32_t(clip_gain) ); if ( HACKRF_SUCCESS == ret ) { _vga_gain = clip_gain; } else { @@ -704,72 +431,30 @@ double hackrf_source_c::set_bb_gain( double gain, size_t chan ) std::vector< std::string > hackrf_source_c::get_antennas( size_t chan ) { - std::vector< std::string > antennas; - - antennas += get_antenna( chan ); - - return antennas; + return hackrf_common::get_antennas(chan); } std::string hackrf_source_c::set_antenna( const std::string & antenna, size_t chan ) { - return get_antenna( chan ); + return hackrf_common::set_antenna(antenna, chan); } std::string hackrf_source_c::get_antenna( size_t chan ) { - return "TX/RX"; + return hackrf_common::get_antenna(chan); } double hackrf_source_c::set_bandwidth( double bandwidth, size_t chan ) { - int ret; -// osmosdr::freq_range_t bandwidths = get_bandwidth_range( chan ); - - if ( bandwidth == 0.0 ) /* bandwidth of 0 means automatic filter selection */ - bandwidth = _sample_rate * 0.75; /* select narrower filters to prevent aliasing */ - - if ( _dev ) { - /* compute best default value depending on sample rate (auto filter) */ - uint32_t bw = hackrf_compute_baseband_filter_bw( uint32_t(bandwidth) ); - ret = hackrf_set_baseband_filter_bandwidth( _dev, bw ); - if ( HACKRF_SUCCESS == ret ) { - _bandwidth = bw; - } else { - HACKRF_THROW_ON_ERROR( ret, HACKRF_FUNC_STR( "hackrf_set_baseband_filter_bandwidth", bw ) ) - } - } - - return _bandwidth; + return hackrf_common::set_bandwidth(bandwidth, chan); } double hackrf_source_c::get_bandwidth( size_t chan ) { - return _bandwidth; + return hackrf_common::get_bandwidth(chan); } osmosdr::freq_range_t hackrf_source_c::get_bandwidth_range( size_t chan ) { - osmosdr::freq_range_t bandwidths; - - // TODO: read out from libhackrf when an API is available - - bandwidths += osmosdr::range_t( 1750000 ); - bandwidths += osmosdr::range_t( 2500000 ); - bandwidths += osmosdr::range_t( 3500000 ); - bandwidths += osmosdr::range_t( 5000000 ); - bandwidths += osmosdr::range_t( 5500000 ); - bandwidths += osmosdr::range_t( 6000000 ); - bandwidths += osmosdr::range_t( 7000000 ); - bandwidths += osmosdr::range_t( 8000000 ); - bandwidths += osmosdr::range_t( 9000000 ); - bandwidths += osmosdr::range_t( 10000000 ); - bandwidths += osmosdr::range_t( 12000000 ); - bandwidths += osmosdr::range_t( 14000000 ); - bandwidths += osmosdr::range_t( 15000000 ); - bandwidths += osmosdr::range_t( 20000000 ); - bandwidths += osmosdr::range_t( 24000000 ); - bandwidths += osmosdr::range_t( 28000000 ); - - return bandwidths; + return hackrf_common::get_bandwidth_range(chan); } diff --git a/lib/hackrf/hackrf_source_c.h b/lib/hackrf/hackrf_source_c.h index 6ae81d2511..e9aacb95b3 100644 --- a/lib/hackrf/hackrf_source_c.h +++ b/lib/hackrf/hackrf_source_c.h @@ -1,36 +1,35 @@ /* -*- c++ -*- */ /* * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * Copyright 2020 Clayton Smith <argilo(a)gmail.com> * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify + * gr-osmosdr is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. * - * GNU Radio is distributed in the hope that it will be useful, + * gr-osmosdr is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to + * along with gr-osmosdr; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ #ifndef INCLUDED_HACKRF_SOURCE_C_H #define INCLUDED_HACKRF_SOURCE_C_H -#include <gnuradio/thread/thread.h> #include <gnuradio/sync_block.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> +#include <condition_variable> +#include <mutex> #include <libhackrf/hackrf.h> #include "source_iface.h" +#include "hackrf_common.h" class hackrf_source_c; @@ -62,12 +61,12 @@ hackrf_source_c_sptr make_hackrf_source_c (const std::string & args = ""); */ class hackrf_source_c : public gr::sync_block, - public source_iface + public source_iface, + protected hackrf_common { private: // The friend declaration allows make_hackrf_source_c to // access the private constructor. - friend hackrf_source_c_sptr make_hackrf_source_c (const std::string & args); /*! @@ -123,35 +122,22 @@ public: private: static int _hackrf_rx_callback(hackrf_transfer* transfer); int hackrf_rx_callback(unsigned char *buf, uint32_t len); - static void _hackrf_wait(hackrf_source_c *obj); - void hackrf_wait(); - - static int _usage; - static boost::mutex _usage_mutex; std::vector<gr_complex> _lut; - hackrf_device *_dev; - gr::thread::thread _thread; unsigned short **_buf; unsigned int _buf_num; unsigned int _buf_len; unsigned int _buf_head; unsigned int _buf_used; - boost::mutex _buf_mutex; - boost::condition_variable _buf_cond; + std::mutex _buf_mutex; + std::condition_variable _buf_cond; unsigned int _buf_offset; int _samp_avail; - double _sample_rate; - double _center_freq; - double _freq_corr; - bool _auto_gain; - double _amp_gain; double _lna_gain; double _vga_gain; - double _bandwidth; }; #endif /* INCLUDED_HACKRF_SOURCE_C_H */ -- 2.17.1

4 years, 3 months

2
1
0 0

libusb issue when opening device

by Carl-Fredrik Enell

Dear all, I just subscribed to this list since I encountered an issue after pulling the latest git commits. > lib: use interface 0 altsetting 1 instead of interface 1 ... > This makes osmo-fl2k work again with Linux 5.5.0-rc6 or later, On my system (Debian stable, kernel 4.19) this change results in "Error enabling IF 0 altsetting 1". Reverting to the previous version (with Interface 1) solved the problem for me. I will investigate a bit more whether it is related to kernel or libusb versions. Or have I missed some other required configuration? Best regards, Carl-Fredrik SM2YHP -- ------------------ Carl-Fredrik Enell Föraregatan 26B SE-98139 Kiruna +46705508256 -----------------

4 years, 3 months

2
3
0 0

GR 3.8 Build issues

by tom＠tswartz.net

Hi all: I'm trying to build the latest gr-osmosdr package from the gr3.8 branch, but I'm seeing some unusual errors, and I'm not quite sure what the deal is. I'll note the following: - I had errors related to existing python2 packages, so I tried building with Python3. I'd be less than surprised if someone says that this is the cause of the issues, but personally, I'd like to roll with the Py3 products from now on, what with Py2 being EOL… - OS is Arch. My cmake command was: ``` cmake \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_EXECUTABLE=$(which python3) \ -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python3*) \ -DPYTHON_LIBRARY=$(echo /usr/lib/libpython3.*.so) \ -DENABLE_DOXYGEN=1 \ -DCMAKE_INSTALL_PREFIX=/usr ../ ``` Output from cmake: ``` -- ###################################################### -- # Gnuradio enabled components -- ###################################################### -- * Python support -- * sysmocom OsmoSDR -- * IQ File Source & Sink -- * Osmocom RTLSDR -- * RTLSDR TCP Client -- * Ettus USRP Devices -- * Osmocom MiriSDR -- * HackRF & rad1o Badge -- * nuand bladeRF -- * RFSPACE Receivers -- * AIRSPY Receiver -- * SoapySDR support -- * Red Pitaya SDR -- -- ###################################################### -- # Gnuradio disabled components -- ###################################################### -- * Osmocom IQ Imbalance Correction -- * AIRSPY HF+ Receiver -- * FreeSRP support -- -- Building for version: 0.2.0.0 / 0.2.0 -- Using install prefix: /usr -- Configuring done CMake Error at lib/CMakeLists.txt:43 (add_library): Target "gnuradio-osmosdr" links to target "gnuradio::filter" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? CMake Error at /usr/lib64/cmake/gnuradio/UseSWIG.cmake:573 (add_library): Target "osmosdr_swig" links to target "gnuradio::filter" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? Call Stack (most recent call first): /usr/lib64/cmake/gnuradio/GrSwig.cmake:133 (swig_add_library) swig/CMakeLists.txt:42 (GR_SWIG_MAKE) CMake Error at lib/CMakeLists.txt:43 (add_library): Target "gnuradio-osmosdr" links to target "gnuradio::filter" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? -- Generating done CMake Generate step failed. Build files cannot be regenerated correctly. ``` Any feedback would be appreciated. Thanks, -- Tom Swartz

4 years, 3 months

2
3
0 0

[PATCH] airspy: fix cmake target_link_libraries

by argilo＠gmail.com

From: Clayton Smith <argilo(a)gmail.com> --- lib/airspy/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/airspy/CMakeLists.txt b/lib/airspy/CMakeLists.txt index 75770866db..4a601382c9 100644 --- a/lib/airspy/CMakeLists.txt +++ b/lib/airspy/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(gnuradio-osmosdr PRIVATE ) target_link_libraries(gnuradio-osmosdr - gnuradio::filter + gnuradio::gnuradio-filter ${Gnuradio-blocks_LIBRARIES} ${LIBAIRSPY_LIBRARIES} ) -- 2.17.1

4 years, 3 months

1
0
0 0

i can't builld the gr-osmosdr

by barry allen

I can not compile the block gr-osmosdr, obtained block of errors ,if you can help me solve the problem ,please.Sincerely thebugslayers The following are the errors -- The CXX compiler identification is GNU 7.4.0 -- The C compiler identification is GNU 7.4.0 -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- Check for working C compiler: /usr/bin/cc -- Check for working C compiler: /usr/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Build type not specified: defaulting to release. -- Found Git: /usr/bin/git (found version "2.17.1") -- Extracting version information from git describe... -- Configuring Boost C++ Libraries... -- Looking for pthread.h -- Looking for pthread.h - found -- Looking for pthread_create -- Looking for pthread_create - not found -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - found -- Found Threads: TRUE -- Boost version: 1.65.1 -- Found the following Boost libraries: -- thread -- system -- chrono -- date_time -- atomic -- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.1") -- Checking for module 'gruel' -- No package 'gruel' found -- Could NOT find GRUEL (missing: GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) -- Checking for module 'gnuradio-core' -- No package 'gnuradio-core' found -- Could NOT find GNURADIO_CORE (missing: GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) -- Checking for module 'gnuradio-iqbalance' -- Found gnuradio-iqbalance, version 0 -- Could NOT find GNURADIO_IQBALANCE (missing: GNURADIO_IQBALANCE_INCLUDE_DIRS) -- Checking for module 'uhd' -- No package 'uhd' found -- Could NOT find UHD (missing: UHD_LIBRARIES UHD_INCLUDE_DIRS) -- Checking for module 'gnuradio-uhd' -- Found gnuradio-uhd, version 3.9.0 -- gnuradio-uhd not found. -- Could NOT find GNURADIO_UHD (missing: GNURADIO_UHD_INCLUDE_DIRS) -- Checking for module 'gnuradio-fcd' -- No package 'gnuradio-fcd' found -- gnuradio-fcd not found. -- Could NOT find GNURADIO_FCD (missing: GNURADIO_FCD_LIBRARIES GNURADIO_FCD_INCLUDE_DIRS) -- Checking for module 'gnuradio-fcdproplus' -- Found gnuradio-fcdproplus, version 3.7.11 -- Found gnuradio-fcdproplus: /usr/include, /usr/lib/x86_64-linux-gnu/libgnuradio-fcdproplus.so -- Found GNURADIO_FCDPP: /usr/lib/x86_64-linux-gnu/libgnuradio-fcdproplus.so -- Checking for module 'libosmosdr' -- No package 'libosmosdr' found -- libosmosdr not found. -- Checking for module 'librtlsdr' -- No package 'librtlsdr' found -- librtlsdr not found. -- Checking for module 'libmirisdr' -- No package 'libmirisdr' found -- libmirisdr not found. -- Checking for module 'libhackrf' -- Found libhackrf, version 0.5 -- Found LIBHACKRF: /usr/local/lib/libhackrf.so -- Checking for module 'libairspy' -- No package 'libairspy' found -- Could NOT find LIBAIRSPY (missing: LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) -- Checking for module 'libbladeRF' -- No package 'libbladeRF' found -- libbladeRF not found. -- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) CMake Error at CMakeLists.txt:166 (message): Gruel required to build gr-osmosdr -- Configuring incomplete, errors occurred! See also "/home/shan/gr-osmosdr/build/CMakeFiles/CMakeOutput.log". See also "/home/shan/gr-osmosdr/build/CMakeFiles/CMakeError.log". Thanks:)

4 years, 3 months

2
2
0 0

FL2k error Buffer

by Abhishek sharma

Hello Team, This is Abhishek Sharma a infosec researcher from India. It was stange that I was getting an error constantly i.e. "no free transfer, skipping input buffer" even though I setup the sample rate to minimum but still getting the same error. IT WOULD BE GREAT IF YOU CAN HELP IN RESOLVING THIS ISSUE Waiting for your response Below is the screen grab for reference: [image: image.png] -- Thanks Regards Abhishek Sharma Mobile: (+91) 9458406845

4 years, 3 months

2
1
0 0

I'm unable to add osmocom sink to my gnuradio

by barry allen

*while building the gr-osmosdr i received a bulk of errors* *I'm using Ubuntu 18.4 and gnuradio v3.9.* *The following are the errors* -- The CXX compiler identification is GNU 7.4.0 -- The C compiler identification is GNU 7.4.0 -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- Check for working C compiler: /usr/bin/cc -- Check for working C compiler: /usr/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Build type not specified: defaulting to release. -- Found Git: /usr/bin/git (found version "2.17.1") -- Extracting version information from git describe... -- Configuring Boost C++ Libraries... -- Looking for pthread.h -- Looking for pthread.h - found -- Looking for pthread_create -- Looking for pthread_create - not found -- Looking for pthread_create in pthreads -- Looking for pthread_create in pthreads - not found -- Looking for pthread_create in pthread -- Looking for pthread_create in pthread - found -- Found Threads: TRUE -- Boost version: 1.65.1 -- Found the following Boost libraries: -- thread -- system -- chrono -- date_time -- atomic -- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.1") -- Checking for module 'gruel' -- No package 'gruel' found -- Could NOT find GRUEL (missing: GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) -- Checking for module 'gnuradio-core' -- No package 'gnuradio-core' found -- Could NOT find GNURADIO_CORE (missing: GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) -- Checking for module 'gnuradio-iqbalance' -- Found gnuradio-iqbalance, version 0 -- Could NOT find GNURADIO_IQBALANCE (missing: GNURADIO_IQBALANCE_INCLUDE_DIRS) -- Checking for module 'uhd' -- No package 'uhd' found -- Could NOT find UHD (missing: UHD_LIBRARIES UHD_INCLUDE_DIRS) -- Checking for module 'gnuradio-uhd' -- Found gnuradio-uhd, version 3.9.0 -- gnuradio-uhd not found. -- Could NOT find GNURADIO_UHD (missing: GNURADIO_UHD_INCLUDE_DIRS) -- Checking for module 'gnuradio-fcd' -- No package 'gnuradio-fcd' found -- gnuradio-fcd not found. -- Could NOT find GNURADIO_FCD (missing: GNURADIO_FCD_LIBRARIES GNURADIO_FCD_INCLUDE_DIRS) -- Checking for module 'gnuradio-fcdproplus' -- Found gnuradio-fcdproplus, version 3.7.11 -- Found gnuradio-fcdproplus: /usr/include, /usr/lib/x86_64-linux-gnu/libgnuradio-fcdproplus.so -- Found GNURADIO_FCDPP: /usr/lib/x86_64-linux-gnu/libgnuradio-fcdproplus.so -- Checking for module 'libosmosdr' -- No package 'libosmosdr' found -- libosmosdr not found. -- Checking for module 'librtlsdr' -- No package 'librtlsdr' found -- librtlsdr not found. -- Checking for module 'libmirisdr' -- No package 'libmirisdr' found -- libmirisdr not found. -- Checking for module 'libhackrf' -- Found libhackrf, version 0.5 -- Found LIBHACKRF: /usr/local/lib/libhackrf.so -- Checking for module 'libairspy' -- No package 'libairspy' found -- Could NOT find LIBAIRSPY (missing: LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) -- Checking for module 'libbladeRF' -- No package 'libbladeRF' found -- libbladeRF not found. -- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) CMake Error at CMakeLists.txt:166 (message): Gruel required to build gr-osmosdr -- Configuring incomplete, errors occurred! See also "/home/shan/gr-osmosdr/build/CMakeFiles/CMakeOutput.log". See also "/home/shan/gr-osmosdr/build/CMakeFiles/CMakeError.log". *Thanks:)*

4 years, 3 months

3
3
0 0

fl2k tools: libusb: error [submit_bulk_transfer] submiturb failed error -1 errno=2

by L29Ah

I've put my flk2 away for half a year, and now i can't make it working: ‰ fl2k_test -s 162e6 Allocating 6 zero-copy buffers libusb: error [submit_bulk_transfer] submiturb failed error -1 errno=2 Failed to submit transfer 0 Please increase your allowed usbfs buffer size with the following command: echo 0 > /sys/module/usbcore/parameters/usbfs_memory_mb /sys/module/usbcore/parameters/usbfs_memory_mb is zero ofc. strace tells me: [pid 9711] openat(AT_FDCWD, "/dev/bus/usb/001/007", O_RDWR|O_CLOEXEC) = 9 ... [pid 9711] ioctl(9, USBDEVFS_SUBMITURB, 0x558af7769f80) = 0 ... [pid 9711] write(2, "Allocating 6 zero-copy buffers\n", 31Allocating 6 zero-copy buffers ) = 31 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f7faa000 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f7bea000 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f782a000 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f746a000 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f70aa000 [pid 9711] mmap(NULL, 3932160, PROT_READ|PROT_WRITE, MAP_SHARED, 9, 0) = 0x7ff5f6cea000 [pid 9711] ioctl(9, USBDEVFS_SUBMITURB, 0x558af776a5a0) = -1 ENOENT (No such file or directory) Linux 5.5.0-rc6 and osmo-fl2k master here. What am i doing wrong? -- () ascii ribbon campaign - against html mail /\ http://arc.pasp.de/ - against proprietary attachments

4 years, 3 months

3
2
0 0

Fwd: gr3.7-qt5 --> CL Error: Unable to queue clear of spectrum buffer

by Sipos Csaba

Hi Sylvain, Resent it to the list as requested. I tried to use the 'gr3.7-qt5' branch today, and after successful compilation, I am getting this error message on the terminal: [+] Available device: 0:0 <NVIDIA Corporation> NVS 4200M [+] Selected device: NVS 4200M [!] CL Error (-59, /root/gr-fosphor/gr-fosphor/lib/fosphor/cl.c:438): Unable to queue clear of spectrum buffer I attached the complete output of the event, if you want to take a look. I also attached the screen how it looks during the run. OpenCL works fine otherwise, and I used gr-fosphor successfully on this same machine before. I am on Ubuntu 18.04.03 LTS with the proprietary Nvidia driver (v390). The gnuradio is 3.7.13.5 (comes with the ubuntu repo, not compiled from source). If you have any idea, or you need more info, debug log etc. please let me know. Regards, Csaba

4 years, 4 months

2
5
0 0

OsmoDevCon 2020 registration

by Harald Welte

Dear fellow Osmocom developers, I would like to invite all developers and contributors to Osmocom [sub]projects to register for OsmoDevCon 2020 (held on April 24th-27th, 2020 in Berlin). For details known so far, please check http://osmocom.org/projects/osmo-dev-con/wiki/OsmoDevCon2020 Please enter your name at https://osmocom.org/projects/osmo-dev-con/wiki/OsmoDevCon2020#Requested in case you would like to attend. Registering early allows proper planning. Thanks! Looking forward to meeting old and new Osmocom developers in April 2020. Regards, Harald -- - Harald Welte <laforge(a)osmocom.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

4 years, 5 months

1
0
0 0

gr-fosphor install troubles:" Unable to share spectrum VBO into OpenCL context" openCL/GL sharing

by Aaron Giles

>Yeah, the nVidia driver is annoying ... it used to work and they broke >it a few years ago and they don't care enough to fix it. >And since I got a new laptop a few years back, I don't have a nvidia >card to debug or work around it. I compared fosphor to the nVidia OpenCL Simple OpenGL Interop example [1] and noticed that fosphor calls glMapBuffer/glUnmapBuffer to clear the spectrum vbo between the calls to glBufferData and clCreateFromGLBuffer. If I eliminate the map/memset/unmap here by removing the call to gl_vbo_clear in gl_deferred_init [2], then clCreateFromGLBuffer returns CL_SUCCESS and fosphor appears to work with CL/GL sharing. It is not clear to me if clearing the vbo_spectrum is necessary here, since cl_queue_clear_buffers later initializes the mem_spectrum buffer to the noise floor. I'm using an nvidia GTX 1650 with version 430.50 of the nvidia drivers under Linux Mint 18. A friend of mine tested the GTX 1060 and also had success with this workaround. Aaron [1] http://developer.download.nvidia.com/compute/DevZone/OpenCL/Projects/oclSim… [2] https://git.osmocom.org/gr-fosphor/tree/lib/fosphor/gl.c#n235

4 years, 5 months

2
2
0 0

Re: FOSDEM 2020: Free Software Radio Devroom CfP

by Nicolas Cuervo Benavides

Dear friends and fans of software-defined radio, the SDR track at next year's FOSDEM still has some slots left! We already have some submissions and we are in the process of ranking those, but we will gladly add YOUR presentation to the list! If you have anything related to the field of free software radio, please head to: https://penta.fosdem.org/submission/FOSDEM20 and submit your short abstract! We're looking very much forward to your submission. For the committee, Nicolas Cuervo On Wed, Oct 16, 2019 at 8:19 PM Nicolas Cuervo Benavides < cuervonicolas(a)gmail.com> wrote: > Dear friends and fans of software-defined radio and free/open-source radio > topics in general, > > FOSDEM 2020 (the free and open-source developer's meeting in Brussels, > Europe) will, once again, feature a track on Software Defined Radio, and > any other radio-related topics in the (now known as) *Free Software Radio* devroom. > Therefore, we invite developers and users from the free software radio > community to join us for this track and present your talks or demos. > > > Software Radio has become an important tool to allow anyone to access the > EM spectrum. Using free software radio libraries and applications and cheap > hardware, anyone can now start hacking on wireless communications, remote > sensing, radar, fun hacks of all sorts, or other applications. At FOSDEM, > we hope to network all these projects and improve collaboration, bring new > ideas forward and get more people involved. > > > The track's web site resides at the link below. The final schedule will be > available through Pentabarf and the official FOSDEM website. > > https://fosdem.org/2020/schedule/track/free_software_radio/ > > > Additional Information will be also available at: > https://wiki.gnuradio.org/index.php/FOSDEM_2020 > > > ** Submit your presentations > > To suggest a talk, go to https://penta.fosdem.org/submission/FOSDEM20 and > follow the instructions (you need an account, but can use your account from > last year if you have one). You need to create an 'Event'; make sure it's > in the Free Software Radio track! Lengths aren't fixed, but give a > realistic estimate and please don't exceed 30 minutes unless you have > something special planned (in that case, contact one of us). Also, don't > forget to include time for Q&A. > We will typically go for 30-minute slots -- shorter talks, unless they're > really short, usually tend to screw up the schedule too much. > > You aren't limited to slide presentations, of course. Be creative. > However, FOSDEM is an open-source conference, therefore we ask you to stay > clear of marketing presentations and present something relevant to > free/open software. We like nitty-gritty technical stuff. > > Topics discussed in this devroom include: > > * SDR Frameworks + Tools > * Cellular/telecoms software > * Free/Open SDR hardware > * Wireless security > * Random fun wireless hacks > * SDR in education > * Satellite/spacecraft communication > * Ham radio related topics > > > ** Important Dates > > FOSDEM is February 1st and 2nd, 2020. The Free Software Radio devroom is > happening on Sunday, the 2nd of February. > > The submission deadline is Friday, December 6th. A complete schedule for > the presentations in the devroom will be available on the 15th of December. > > > In the last years we were always full to the brim with presentations, so > if you want to present, please make sure to submit your abstracts soon! > > ** Steering Committee > The track committee consists of: > > * Phil Balister - "Crofton" > * Sylvain Munaut -"tnt" > * Derek Kozel - "dkozel" > * Nicolas Cuervo - "primercuervo" > * Martin Braun - "mbr0wn" (Emeritus) > > > Hope to hear from you soon! And please forward this announcement. >

4 years, 5 months

1
0
0 0

about gr-osmocom

by César fumfum

Hi, Im an engineering student and would love to see gr-osmosdr working again. Is there anyone working on gr-osmosdr at present? I'm thinking that it will be a great feature to work on, and i can try to help to maintiain the feature if you solve my doubts and my newbie errors. I don't think that this is a newbie to gnu dev task but i really would love to see gr-osmocom working again. César.

4 years, 5 months

1
0
0 0

gr-osmosdr

by César fumfum

Hi, Im an engineering student and would love to see gr-osmosdr working again. Is there anyone working on gr-osmosdr at present? I'm thinking that it will be a great feature to work on, and i can try to help to maintiain the feature if you solve my doubts and my newbie errors. I don't think that this is a newbie to gnu dev task but i really would love to see gr-osmocom working again. César.

4 years, 5 months

1
0
0 0

Migrating gr-iqbal to Gnuradio 3.8

by Brian Waters

I just got an email from someone at RedHat; they seem to think that I am one of the gr-iqbal maintainers since I have the most recent commit ;). Apparently they have their own patch for Python 3 and Gnuradio 3.8, but wanted to know if upstream would be supporting the migration. Since I am not really upstream, I thought I'd forward the patch along. https://src.fedoraproject.org/rpms/gr-iqbal/blob/master/f/gr-iqbal-0.37.2-g… -- Brian M. Waters brian(a)brianmwaters.net

4 years, 5 months

2
1
0 0

[PATCH] apps/osmocom_fft: fix compatibility with Python 3: print needs parentheses

by Vadim Yanitskiy

--- apps/osmocom_fft | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apps/osmocom_fft b/apps/osmocom_fft index da38861..0110d19 100755 --- a/apps/osmocom_fft +++ b/apps/osmocom_fft @@ -117,7 +117,7 @@ class app_top_block(stdgui2.std_top_block, pubsub): try: self.src.get_sample_rates().start() except RuntimeError: - print "Source has no sample rates (wrong device arguments?)." + print("Source has no sample rates (wrong device arguments?).") sys.exit(1) # Set the antenna @@ -150,18 +150,18 @@ class app_top_block(stdgui2.std_top_block, pubsub): gain_names = self.src.get_gain_names() for name in gain_names: range = self.src.get_gain_range(name) - print "%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step()) + print("%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step())) if options.gains: for tuple in options.gains.split(","): name, gain = tuple.split(":") gain = int(gain) - print "Setting gain %s to %d." % (name, gain) + print("Setting gain %s to %d." % (name, gain)) self.src.set_gain(gain, name) if self._verbose: rates = self.src.get_sample_rates() - print 'Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step()) + print('Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step())) if options.center_freq is None: freq = self.src.get_center_freq() @@ -221,7 +221,7 @@ class app_top_block(stdgui2.std_top_block, pubsub): #force update on pubsub keys #for key in (SAMP_RATE_KEY, BWIDTH_KEY, CENTER_FREQ_KEY, FREQ_CORR_KEY): - #print key, "=", self[key] + #print(key, "=", self[key]) #self[key] = self[key] if options.fosphor: @@ -422,7 +422,7 @@ class app_top_block(stdgui2.std_top_block, pubsub): try: bw_range = self[BWIDTH_RANGE_KEY] - #print bw_range.to_pp_string() + #print(bw_range.to_pp_string()) if bw_range.start() < bw_range.stop(): bwidth_vbox = forms.static_box_sizer(parent=self.panel, label="Bandwidth", @@ -537,14 +537,14 @@ class app_top_block(stdgui2.std_top_block, pubsub): self.rec_file_name = self.record_to_filename() - print "Recording samples to ", self.rec_file_name + print("Recording samples to ", self.rec_file_name) self.file_sink.open(self.rec_file_name); else: self.sample_rate_text.Enable() self.record_text.Enable() self.file_sink.close() - print "Finished recording to", self.rec_file_name + print("Finished recording to", self.rec_file_name) forms.toggle_button( sizer=rec_hbox, @@ -732,9 +732,9 @@ class app_top_block(stdgui2.std_top_block, pubsub): self.src.set_dc_offset( correction ) if self._verbose: - print "Set DC offset to", correction + print("Set DC offset to", correction) except RuntimeError as ex: - print ex + print(ex) def set_iq_balance_mode(self, iq_balance_mode): if iq_balance_mode == 1: @@ -761,16 +761,16 @@ class app_top_block(stdgui2.std_top_block, pubsub): self.src.set_iq_balance( correction ) if self._verbose: - print "Set IQ balance to", correction + print("Set IQ balance to", correction) except RuntimeError as ex: - print ex + print(ex) def set_sample_rate(self, samp_rate): samp_rate = self.src.set_sample_rate(samp_rate) if hasattr(self.scope, 'set_sample_rate'): self.scope.set_sample_rate(samp_rate) if self._verbose: - print "Set sample rate to:", samp_rate + print("Set sample rate to:", samp_rate) try: self[BWIDTH_KEY] = self.set_bandwidth(samp_rate) @@ -787,13 +787,13 @@ class app_top_block(stdgui2.std_top_block, pubsub): g = self[GAIN_RANGE_KEY(name)] gain = float(g.start()+g.stop())/2 if self._verbose: - print "Using auto-calculated mid-point gain" + print("Using auto-calculated mid-point gain") self[GAIN_KEY(name)] = gain return gain = self.src.set_gain(gain, name) if self._verbose: - print "Set " + name + " gain to:", gain + print("Set " + name + " gain to:", gain) def set_bandwidth(self, bw): clipped_bw = self[BWIDTH_RANGE_KEY].clip(bw) @@ -801,7 +801,7 @@ class app_top_block(stdgui2.std_top_block, pubsub): bw = self.src.set_bandwidth(clipped_bw) if self._verbose: - print "Set bandwidth to:", bw + print("Set bandwidth to:", bw) return bw @@ -814,7 +814,7 @@ class app_top_block(stdgui2.std_top_block, pubsub): f = self[FREQ_RANGE_KEY] freq = float(f.start()+f.stop())/2.0 if self._verbose: - print "Using auto-calculated mid-point frequency" + print("Using auto-calculated mid-point frequency") self[CENTER_FREQ_KEY] = freq return @@ -825,22 +825,22 @@ class app_top_block(stdgui2.std_top_block, pubsub): if freq is not None: if self._verbose: - print "Set center frequency to", freq + print("Set center frequency to", freq) elif self._verbose: - print "Failed to set freq." + print("Failed to set freq.") return freq def set_freq_corr(self, ppm): if ppm is None: ppm = 0.0 if self._verbose: - print "Using frequency corrrection of", ppm + print("Using frequency corrrection of", ppm) self[FREQ_CORR_KEY] = ppm return ppm = self.src.set_freq_corr(ppm) if self._verbose: - print "Set frequency correction to:", ppm + print("Set frequency correction to:", ppm) def main (): app = stdgui2.stdapp(app_top_block, "osmocom Spectrum Browser", nstatus=1) -- 2.24.0

4 years, 5 months

1
0
0 0

[PATCH] build gr-iqbal w/ clang

by Brian Waters

Clang doesn't automatically define the "complex" keyword like old versions of GCC apparently used to. Appending this little check enabled compiling gr-iqbal w/ Clang, which is now the default compiler on OpenBSD and I think FreeBSD too. diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc index 2cad998..6c8b706 100644 --- a/lib/optimize_c.cc +++ b/lib/optimize_c.cc @@ -31,7 +31,7 @@ __GNUC_PATCHLEVEL__ \ ) -#if GCC_VERSION >= 40800 +#if GCC_VERSION >= 40800 || defined(__clang__) # define complex _Complex # undef _GLIBCXX_HAVE_COMPLEX_H #endif -- Brian M. Waters brian(a)brianmwaters.net

4 years, 5 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr