From: Clayton Smith &lt;argilo(a)gmail.com&gt; 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 &lt;horiz0n(a)gmx.net&gt; - * Copyright 2012 Steve Markgraf &lt;steve(a)steve-m.de&gt; - * - * 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 &lt;horiz0n(a)gmx.net&gt; - * - * 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 &lt;horiz0n(a)gmx.net&gt; - * - * 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 &lt;horiz0n(a)gmx.net&gt; - * - * 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