osmocom-sdr

osmocom-sdr@lists.osmocom.org

906 discussions

rtl_fm tuning
by JACOB EDWARDS WIESE 15 Jul '20

15 Jul '20

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

1 0

[PATCH] librtlsdr: Allow device specification with an USB path
by Alexander Motzkau 20 Jun '20

20 Jun '20

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

1 0

[PATCH] Replace some Boost classes with C++11
by argilo＠gmail.com 31 May '20

31 May '20

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

1 0

[PATCH] fcd: restore support for FUNcube Dongle and Pro+
by argilo＠gmail.com 31 May '20

31 May '20

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

1 0

fl2k on rpi4: no more USB error
by Carl-Fredrik Enell 22 May '20

22 May '20

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 -----------------

1 0

[PATCH] Loop in soapy_source_c::work() when readStream() returns SOAPY_SDR_OVERFLOW
by Anton Blanchard 21 May '20

21 May '20

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 4

[PATCH] librtlsdr: cmake: add options to enable/disable static or shared target in build
by Gwenhael Goavec-Merou 15 May '20

15 May '20

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

1 0

PS Name and PI code modification
by Marco Domenico Cimato 02 May '20

02 May '20

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

2 2

Bug in rtl_sdr
by John Tiller 14 Apr '20

14 Apr '20

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

1 0

OSMOCOM TRX_BTS_BSC Connection Issue
by Aalto Koskinen 11 Apr '20

11 Apr '20

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'

2 1

← Newer
1
...
10
11
12
13
14
15
16
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr