- osmocom-sdr - lists.osmocom.org

Re: [Discuss-gnuradio] [GREP] Remove log4cpp

by Müller, Marcus (IEH)

Hi Martin, hi Community, first of all: thanks for all the fish err GREPs! We need to kick off this discussion. So, this PR is very dear to my heart, because I consider log4cpp to be an especially problematic dependency. And I consider our logging to be subpar considering the size of the code base, user base and the fact that people are using GNU Radio in infrastructure for rather expensive things. So, I took the opportunity (being at 35c3, just to pose around a little bit) and talked to a couple Osmocom folks. Osmocom people, please correct me if I make any mistakes. What they have in osmocore is essentiall logging in both quantized severity and in categories, and logging routing. For them, that's very important, as they use that to supply resilient infrastructure. I hope I'm representing the idea kinda correctly here: They might want to log system events ("SUPERVISOR: INFO system load surpassing 75%") somewhere, and development info ("gr-6G: TRACE found a preamble") on-screen, and critical messages ("gr-digital: FATAL run out of developer coffee") everywhere. I want that too. I want this to be easily integratable into software that uses GNU Radio as library. And if I'm already making wishes here, I want loggers that interface to modern logging systems, be it journald, graylog or SNMP. Something. So, I think that's pretty similar to what UHD does (correct me please, Martin). I think that UHD is a bit more flexible on the logging "categories" than I'd like to be, but that really just means we need to set a convention. So, I'm stuck wondering whether we adopt the self-implemented system that UHD uses, or the self-implemented system that osmocore uses, or implement our own. Familiarity suggests UHD, maturity osmocore. Best regards, Marcus On Thu, 2018-12-27 at 13:49 -0800, Martin Braun wrote: > This GREP was recently submitted here: > > https://github.com/gnuradio/greps/blob/master/grep-0013-remove-log4cpp.md > > We may or may not go through with this. However, we like to kill > dependencies (hey there node.js developers :D ), and log4cpp has some > issues of its own that we're currently inheriting. > > Personally, I use GR logging only for debugging purposes. But I know > that others use it for other reasons, and this thread is a good place > to discuss: > - Alternatives to log4cpp (I've listed Boost.Log and hand-spun as > options) > - What people need it for > - Is the current logging in a good shape as it is > - Who wants to own this task? > - etc. > > Cheers, > Martin > _______________________________________________ > Discuss-gnuradio mailing list > Discuss-gnuradio(a)gnu.org > https://lists.gnu.org/mailman/listinfo/discuss-gnuradio

5 years, 4 months

1
0
0 0

Android SDR server

by Семашко Максим

Hello! I made SDR server on my android TV BOX. WOrks great! (by ethernet!). I am connecting to RTL SDR v3 dongle via network from my windows pc running sdr sharp! Could you say, how can i automate server starting? Because every time i disconnect sdr sharp (on my pc), i should turn connect display to android box and click START STREAM button. It would be great if it possible to make sdr server independent with no need to start ir every time. Youre server and driver are great! -- Sincerely, Max Semashko

5 years, 4 months

1
0
0 0

RFSpace SDR-IQ Question on Gain settings GNU Radio osmocom Source

by Greg

Hello, I hope this is the correct list to ask this question. I have an SDR-IQ connected via USB to Ubuntu 18.04 and version 3.7.13.4 GNU Radio. I am getting data from the source at correct center frequency and sampling rate, however ... I am having trouble find 3 of 4 gain controls. I believe these to be the settings affecting the device gain: 1. RF Gain: -20, -10, 0, 10 dB. These I can successfully change via the RF Gain setting in the Osmocom source. It's good! 2. IF Gain: 24, 18, 12, 6, and 0 dB. This is a "digital gain" and changes a coefficient of the "6620 Digital Downconverter", which apparently is hardware in the SDR-IQ which does filtering and decimation. 3. Preamp Gain, via a "GN Code" of range 0-127, which goes from Off, and then a range of -8.08 to 34 dB. 4. A step attenuator with 0 and 10 dB settings. I got the above by examining the "SpectraVue" Windows application for the SDR-IQ provided by RFSpace. #1 is no problem, it works. What about 2, 3, and 4? So is there any hope of controlling these settings with the osmocom source? Regards, Greg R

5 years, 4 months

1
0
0 0

ld error when building latest git version. undefined reference to log4cpp::Appender ...

by Doron Behar

So I wanted to compile gr-osmosdr from source. I created a build directory and I ran `cmake ..` and then `make`. These are the errors I got: ``` [ 57%] Linking CXX shared library libgnuradio-osmosdr-0.1.5git.so /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/source_impl.cc.o: in function `_GLOBAL__sub_I_source_impl.cc': source_impl.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: source_impl.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/sink_impl.cc.o: in function `_GLOBAL__sub_I_sink_impl.cc': sink_impl.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: sink_impl.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/device.cc.o: in function `_GLOBAL__sub_I_device.cc': device.cc:(.text.startup+0x60): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: device.cc:(.text.startup+0x67): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/osmosdr/osmosdr_src_c.cc.o: in function `_GLOBAL__sub_I_osmosdr_src_c.cc': osmosdr_src_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: osmosdr_src_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/file/file_source_c.cc.o: in function `_GLOBAL__sub_I_file_source_c.cc': file_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: file_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/file/file_sink_c.cc.o: in function `_GLOBAL__sub_I_file_sink_c.cc': file_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: file_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/rtl/rtl_source_c.cc.o: in function `_GLOBAL__sub_I_rtl_source_c.cc': rtl_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: rtl_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/rtl_tcp/rtl_tcp_source_c.cc.o: in function `_GLOBAL__sub_I_rtl_tcp_source_c.cc': rtl_tcp_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: rtl_tcp_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/uhd/uhd_sink_c.cc.o: in function `_GLOBAL__sub_I_uhd_sink_c.cc': uhd_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: uhd_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/uhd/uhd_source_c.cc.o: in function `_GLOBAL__sub_I_uhd_source_c.cc': uhd_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: uhd_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/miri/miri_source_c.cc.o: in function `_GLOBAL__sub_I_miri_source_c.cc': miri_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: miri_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/hackrf/hackrf_source_c.cc.o: in function `_GLOBAL__sub_I_hackrf_source_c.cc': hackrf_source_c.cc:(.text.startup+0x58): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: hackrf_source_c.cc:(.text.startup+0x5f): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/hackrf/hackrf_sink_c.cc.o: in function `_GLOBAL__sub_I_hackrf_sink_c.cc': hackrf_sink_c.cc:(.text.startup+0x58): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: hackrf_sink_c.cc:(.text.startup+0x5f): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/bladerf/bladerf_source_c.cc.o: in function `_GLOBAL__sub_I_bladerf_source_c.cc': bladerf_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: bladerf_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/bladerf/bladerf_sink_c.cc.o: in function `_GLOBAL__sub_I_bladerf_sink_c.cc': bladerf_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: bladerf_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/rfspace/rfspace_source_c.cc.o: in function `_GLOBAL__sub_I_rfspace_source_c.cc': rfspace_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: rfspace_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/airspy/airspy_source_c.cc.o: in function `_GLOBAL__sub_I_airspy_source_c.cc': airspy_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: airspy_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/soapy/soapy_source_c.cc.o: in function `_GLOBAL__sub_I_soapy_source_c.cc': soapy_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: soapy_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/soapy/soapy_sink_c.cc.o: in function `_GLOBAL__sub_I_soapy_sink_c.cc': soapy_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: soapy_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_source_c.cc.o: in function `_GLOBAL__sub_I_redpitaya_source_c.cc': redpitaya_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: redpitaya_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/redpitaya/redpitaya_sink_c.cc.o: in function `_GLOBAL__sub_I_redpitaya_sink_c.cc': redpitaya_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: redpitaya_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/freesrp/freesrp_source_c.cc.o: in function `_GLOBAL__sub_I_freesrp_source_c.cc': freesrp_source_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: freesrp_source_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' /usr/bin/ld: CMakeFiles/gnuradio-osmosdr.dir/freesrp/freesrp_sink_c.cc.o: in function `_GLOBAL__sub_I_freesrp_sink_c.cc': freesrp_sink_c.cc:(.text.startup+0x54): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::AppenderMapStorageInitializer()' /usr/bin/ld: freesrp_sink_c.cc:(.text.startup+0x6b): undefined reference to `log4cpp::Appender::AppenderMapStorageInitializer::~AppenderMapStorageInitializer()' collect2: error: ld returned 1 exit status make[2]: *** [lib/CMakeFiles/gnuradio-osmosdr.dir/build.make:555: lib/libgnuradio-osmosdr-0.1.5git.so.0.0.0] Error 1 make[1]: *** [CMakeFiles/Makefile2:141: lib/CMakeFiles/gnuradio-osmosdr.dir/all] Error 2 make: *** [Makefile:141: all] Error 2 ``` As you can see, all error messages refer to the same reference to a log4cpp appender function. I have log4cpp version 1.1.3 installed by my package manager on Arch Linux. It is installed in /usr/lib. It seems like a missing library in CMakeLists.txt . Am I correct? Thanks for creating this software.

5 years, 5 months

2
2
0 0

[PATCH] import time library, fixes NameError Exception

by Tony Do

Error Message in osmocom_spectrum_sense command line tool: tune: Exception: global name 'time' is not defined Undefined command: "tune", Try "help" Simple fix for the osmocom_spectrum_sense utility, the message queue is really good at clearing itself, but for low tune/dwell delays the threads need to sleep while it clears. --- apps/osmocom_spectrum_sense | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/osmocom_spectrum_sense b/apps/osmocom_spectrum_sense index ea365bb..0d280bd 100755 --- a/apps/osmocom_spectrum_sense +++ b/apps/osmocom_spectrum_sense @@ -30,6 +30,7 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser import sys import math +import time import struct import threading from datetime import datetime -- 2.19.1

5 years, 6 months

1
0
0 0

fl2k_test sample rate speeds up on Windows

by Francesco Gugliuzza

Hi, I encountered this strange behavior when running fl2k_test on Windows 7: basically after a while the sample rate drifts and speeds up considerably. Sometimes it even starts up directly like that. In the command prompt I get: C:\Users\Francesco Gugliuzza\Downloads\Sviluppo\FL2000fl2k_win_2018-08-09>fl2k_test.exe -s 138e6 Reporting PPM error measurement every 10 seconds... Press ^C after a few minutes. real sample rate: 146656386 current PPM: 62727 cumulative PPM: 62727 real sample rate: 150803676 current PPM: 92780 cumulative PPM: 77858 real sample rate: 149716182 current PPM: 84900 cumulative PPM: 80218 real sample rate: 150107883 current PPM: 87738 cumulative PPM: 82104 real sample rate: 150526750 current PPM: 90774 cumulative PPM: 83843 The same thing happens if I compile the latest osmo-fl2k myself using Cygwin. I'm running everything on a laptop with an i7 4710HQ CPU and 8 GB of ram, and I'm using a RayCue HDMI+VGA box. Do you have an idea why the real sample rate drifts so much? Thanks! -- Francesco Gugliuzza

5 years, 6 months

2
3
0 0

(no subject)

by Tom Nash

Request sibscription

5 years, 6 months

1
0
0 0

RTL_SDR dongle not being working with gnuradio

by MB

I have a rtl_sdr.com RTL2832U R820T2 dongle. It works with HDSDR and SDRSHARP programs. Using win10 64 BIT 10.0.17134.345 and GNURadio 3.7.13.4/V1.5Windows reports VID_0BDA, PID_2838 When I run GNUradio, I get [R82XX] PLL not locked! When I open the GNUradio command prompt and run rtl_test -t, I get this: setting gnuradio environmentMicrosoft Windows [Version 10.0.17134.345] (c) 2018 Microsoft Corporation. All rights reserved. C:\Program Files\GNURadio-3.7\bin>rtl_test -t Found 1 device(s): 0: Realtek, RTL2838UHIDIR, SN: 00000001 Using device 0: Generic RTL2832U OEM Found Rafael Micro R820T tuner Supported gain values (29): 0.0 0.9 1.4 2.7 3.7 7.7 8.7 12.5 14.4 15.7 16.6 19.7 20.7 22.9 25.4 28.0 29.7 32.8 33.8 36.4 37.2 38.6 40.2 42.1 43.4 43.9 44.5 48.0 49.6 Sampling at 2048000 S/s. No E4000 tuner found, aborting. C:\Program Files\GNURadio-3.7\bin> At this page, https://osmocom.org/projects/rtl-sdr/wiki/Rtl-sdr shows this table : VID PID tuner device name 0x0bda 0x2832 all of them Generic RTL2832U (e.g. hama nano) 0x0bda 0x2838 E4000 ezcap USB 2.0 DVB-T/DAB/FM dongle Is it possible RTL_TEST is looking for a E4000 because of it's dongle's screwy PID, even though it sees a R820T. If not, why is it not working?thanks. | | Virus-free. www.avast.com |

5 years, 6 months

3
2
0 0

Disable internal AGC in AirSpy HF+

by Richard Hedlund

Hello, For my purposes in GNU Radio using the osmocom source block i would like to disable the internal AGC in my AirSpy HF+. I see that i can choose the "Gain Mode" setting, however i am not sure that will disable (when set to manual) the AGC on the AirSpy HF+. Do you know of any good way to achieve this? I have installed the following library for the AirSpy HF+, where there is an API which enables you to disable the AGC, however i am not sure how to achieve this in GNU Radio: https://github.com/airspy/airspyhf *$airspyhf_info* AirSpy HF library version: 1.4.2 S/N: "removed" Part ID: 0x00000001 Firmware Version: R1.7.2 Available sample rate: 768 kS/s *$uname -a* Linux hedric-dev 4.15.0-36-generic #39-Ubuntu SMP Mon Sep 24 16:19:09 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux Hopefully this is enough information for you, otherwise let me know. Kind regards, Richard

5 years, 6 months

1
0
0 0

OSMOCOM-fft

by Babak Mafakheri

Dear all, I am confused about some parameters of osmocom fft spectrum analyzer. I am wonder what exactly the vertical axis shows? It is written Power(dB); if so, what is the reference power? Is it 1dBW? Moreover, by changing the PGA Gain, I will have different values of power (dB). What is the relation between PGA gain and the received power in dBm? In general, does anyone know how should I find the received power in dBm, having the PGA gain(dB) and the value on vertical axis. (Picture in attach) Looking forward to your reply. Bests, -- -- Le informazioni contenute nella presente comunicazione sono di natura privata e come tali sono da considerarsi riservate ed indirizzate esclusivamente ai destinatari indicati e per le finalità strettamente legate al relativo contenuto. Se avete ricevuto questo messaggio per errore, vi preghiamo di eliminarlo e di inviare una comunicazione all’indirizzo e-mail del mittente. -- The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. If you received this in error, please contact the sender and delete the material.

5 years, 6 months

2
1
0 0

Librtlsdr zerocopy buffers not working on Tinkerboard Armbian

by Carl Laufer

I've been trying to get some RTL-SDRs to function properly on my Tinkerboard, running Armbian Bionic, Kernel 4.14y. I noticed that with the Osmocom drivers rtl_test would result in huge sample drops (millions of samples dropped each time). However, Keenerds branch did not drop any samples, nor did the presumably older Osmocom drivers from apt-get. I did a diff against Keenerds and discovered the new zerocopy buffer code in the Osmocom drivers. After commenting that out, the Osmocom drivers work fine on the Tinkerboard with Armbian and there is no sample loss. Strangely, on TinkerOS and Ubuntu OS for Tinkerboard, all of which run Kernel 4.4, I do not get sample loss with the Osmocom drivers and the zerocopy code enabled. I'm also running the Osmocom drivers on an Odroid XU4 with Ubuntu which is also running Kernel 4.14, and on Raspbian, and on those there is no sample loss. So it seems to be something specific to the Tinkerboard and Armbian with Kernel 4.14y. Not sure if the zerocopy code is just not getting activated on those other OSes or what. How do I check if the installed libusb API version is >= 0x01000105? Any ideas what could cause the zero copy code to result in the lost samples? Regards, Carl Laufer

5 years, 6 months

4
7
0 0

by Greg Troxel

Michael Auß <michael.auss(a)gmail.com> writes: > I did encounter problems with syntax errors when compiling with clang, see > OS#3663 for details. (Relating to rtl_tcp) > > I did not add something to the README. I can certainly believe you had errors. But, changing the compiler requirement is significant -- particularly on platforms that don't have last week's compiler -- and if it isn't the plan to require C++14, then it seems like a workaround to enable that. My point really is that there should be a decision about the language, that should be in the README, and the build system should set --std for that chosen language, and then whatever needs to be fixed should be fixed.

5 years, 6 months

2
3
0 0

branches, releases

by Greg Troxel

(I am one of several who look after ham/gnuradio stuff in pkgsrc.) In gr-osmosdr, it seems 0.1.4 is the most recently release, long ago. The v0.1.4 tarball seems to build aginst gnuradio 3.7. There is a gr3.6 branch that has both many commits more than and less than the v3.6 tag. master has 127 commits beyond v0.1.4 but is not missing any. This seems odd, as I would expect gr3.6 to be based on some intermediate commit along the path from 0.1.4 to master. So I am not following what is going on and why. Now that gnuradio 3.7 seems normal, it seems there should be a release based on master, and there is no real reason for anyone to use the 3.6 branch (unless they are on a system that is intentionally using old gnuradio). Can somebody explain? With any luck I'm confused. Greg

5 years, 7 months

1
0
0 0

by Michael Auß

CC to mailing list ------- Weitergeleitete Nachricht ------ Von: Michael Auß <michael.auss(a)gmail.com> Datum: Fr. 19. Okt. 2018 um 22:26 Betreff: Re: [PATCH] Related: OS#3663 Fix failed compilation on macOS Mojave with clang in CMakeLists.txt An: Greg Troxel <gdt(a)lexort.com> I did encounter problems with syntax errors when compiling with clang, see OS#3663 for details. (Relating to rtl_tcp) I did not add something to the README. KR Michael Greg Troxel <gdt(a)lexort.com> schrieb am Fr. 19. Okt. 2018 um 21:44: > Michael Auß <michael.auss(a)gmail.com> writes: > > > Fix regarding the issue https://osmocom.org/issues/3663macOS Mojave > > comes with clang but the binary matches by the name c++ instead of > > clang.Additionally the compiler flag std=c++14 had to be added. > > I am surprised about c++14. Is it new that c++14 is required? Is it > in the README? > > gr-osmosdr is at 0.1.4 in pkgsrc, which appears to be the latest > official release on github. It's marked as needing "c++" which means > 03, not 11, and not 14. >

5 years, 7 months

1
0
0 0

by Michael Auß

Fix regarding the issue https://osmocom.org/issues/3663 <https://osmocom.org/issues/3663> macOS Mojave comes with clang but the binary matches by the name c++ instead of clang. Additionally the compiler flag std=c++14 had to be added.

5 years, 7 months

2
1
0 0

Save the Date: OsmoCon 2018 on October 18-19, 2018

by Harald Welte

== OsmoCon 2018 == OsmoCon (Osmocom Conference) 2018 is the technical conference for Osmocom users, operators and developers! We are happy to announce the date of OsmoCon 2018. It has been scheduled on October 18 + 19, 2018 and will happen in Berlin, Germany. For the second time, the Osmocom Conference brings together users, operators and developers of the Osmocom Open Source cellular infrastructure projects, such as OsmoBTS, OsmoBSC, OsmoSGSN, OpenGGSN and others. Join us for two days of presentations and discussions with the main developers behind Open Source Mobile Communications, as well as commercial and non-profit users of the Osmocom cellular infrastructure software. You can find some initial information in our wiki at http://osmocom.org/projects/osmo-dev-con/wiki/OsmoCon2018 which will be updated as more information becomes available. == Call for Participation == We're also at the same time announcing the Call for Participation and call on everyone with experiences to share around the Osmocom member projects to submit talks, workshops, discussions or other proposals. You can find the CfP at https://pretalx.sysmocom.de/osmocon2018/cfp We are particularly looking for contributions about: * updates on features/functionality/status of individual Osmocom projects * success stories on how Osmocom projects are deployed in practice * migration from OsmoNITB to the post-NITB architecture * tutorials / workshops on how to setup / analyze Osmocom projects * statistics, reporting, operations aspects of Osmocom projects * third-party open source utilities to be used with Osmocom projects Looking forward to meeting many existing and new Osmocom users at OsmCon this October! Regards, Harald Welte -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

5 years, 7 months

2
1
0 0

fl2k_test sample rate speeds up on Windows

by Francesco Gugliuzza

Hi, I encountered this strange behavior when running fl2k_test on Windows 7: basically after a while the sample rate drifts and speeds up considerably. Sometimes it even starts up directly like that. In the command prompt I get: C:\Users\Francesco Gugliuzza\Downloads\Sviluppo\FL2000fl2k_win_2018-08-09>fl2k_test.exe -s 138e6 Reporting PPM error measurement every 10 seconds... Press ^C after a few minutes. real sample rate: 146656386 current PPM: 62727 cumulative PPM: 62727 real sample rate: 150803676 current PPM: 92780 cumulative PPM: 77858 real sample rate: 149716182 current PPM: 84900 cumulative PPM: 80218 real sample rate: 150107883 current PPM: 87738 cumulative PPM: 82104 real sample rate: 150526750 current PPM: 90774 cumulative PPM: 83843 The same thing happens if I compile the latest osmo-fl2k myself using Cygwin. I'm running everything on a laptop with an i7 4710HQ CPU and 8 GB of ram, and I'm using a RayCue HDMI+VGA box. Do you have an idea why the real sample rate drifts so much? Thanks! Francesco -- Francesco Gugliuzza M.Sc. in Computer Engineering Ph.D. Student at DIID, Università degli Studi di Palermo Qualified to practice as a Professional Engineer E-mail: fgugliuzza.mail(a)gmail.com PEC: francesco.gugliuzza(a)pec.it

5 years, 7 months

1
0
0 0

librtlsdr segfault from race

by Karl Semich

Reproducible segfault apparently from race condition on my system in librtlsdr. --- $ uname -r 4.14.67-1.pvops.qubes.x86_64 rtl-sdr and libusb are both current git master. --- 1. run librtlsdr under gdb $ gdb --args rtl_sdr -f 43M -n 1000 /dev/null 2. place a breakpoint when the cancellation condition is hit, currently line 1915 1914 if (RTLSDR_CANCELING == dev->async_status) { 1915 next_status = RTLSDR_INACTIVE; 1916 (gdb) break ./src/librtlsdr.c:1915 3. run and continue; segfault after second breakpoint (gdb) run (gdb) cont (gdb) cont Thread 1 "rtl_sdr" received signal SIGSEGV, Segmentation fault. 0x00007ffff7d76a15 in add_to_flying_list (transfer=0x426590) at ../../libusb/io.c:1396 1396 if (!timerisset(cur_tv) || (cur_tv->tv_sec > timeout->tv_sec) || -- The crash appears to be because the transfers are deallocated while they are still in flight, and then later referenced by libusb. I think this happens because the pause gives the transfer time to complete before it is canceled. The cancel then fails because the transfer was completed, and the current code assumes this means it is not in flight, when it actually hasn't been handled yet and will be resubmitted. The documentation for libusb_transfer::status at http://libusb.sourceforge.net/api-1.0/structlibusb__transfer.html#a64b2e70e… states that it is only correct to read the field from within the callback handler, and the documentation for libusb_cancel_transfer at http://libusb.sourceforge.net/api-1.0/group__asyncio.html#ga685eb7731f9a059… states that the transfer cancellation is only complete when the callback handler is called with such status. Although I imagine there are simpler solutions, I think the correct solution would be to move cancellation of the transfers into the callback handler entirely, to eliminate race conditions like this and respect the libusb documentation. I would enjoy crafting a patch to make such a change, if that would be helpful. Karl Semich

5 years, 7 months

1
0
0 0

[PATCH] gr-osmosdr/rtl: two concurrency bugfixes

by Karl Semich

1. _running is guarded with a lock in the rtl event loop epilogue. this prevents a possible hang that could arise from _buf_cond being notified prior to work() waiting on _buf_cond, but after work() checks _running. 2. _buf_used is guarded with a lock in the work function to prevent it from spuriously reading zero if it is nonatomically written from the rtl event callback. --- lib/rtl/rtl_source_c.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..bbd0140 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -323,7 +323,11 @@ void rtl_source_c::rtlsdr_wait() { int ret = rtlsdr_read_async( _dev, _rtlsdr_callback, (void *)this, _buf_num, _buf_len ); - _running = false; + { + boost::mutex::scoped_lock lock( _buf_mutex ); + + _running = false; + } if ( ret != 0 ) std::cerr << "rtlsdr_read_async returned with " << ret << std::endl; @@ -347,7 +351,7 @@ int rtl_source_c::work( int noutput_items, if (!_running) return WORK_DONE; - while (noutput_items && _buf_used) { + while (noutput_items) { const int nout = std::min(noutput_items, _samp_avail); const unsigned char *buf = _buf[_buf_head] + _buf_offset * 2; @@ -363,6 +367,9 @@ int rtl_source_c::work( int noutput_items, _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; + + if (_buf_used == 0) + break; } _samp_avail = _buf_len / BYTES_PER_SAMPLE; _buf_offset = 0; -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] gr-osmosdr/rtl: small fix to send final samples

by Karl Semich

Small change to work function to finish draining buffers before closing when device disappears. Provides a little more data when device is unexpectedly lost. --- lib/rtl/rtl_source_c.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..c0ba0b3 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -340,13 +340,18 @@ int rtl_source_c::work( int noutput_items, { boost::mutex::scoped_lock lock( _buf_mutex ); - while (_buf_used < 3 && _running) // collect at least 3 buffers + while (_buf_used < 3) // collect at least 3 buffers + { + if (!_running) { + // finish when remaining samples are drained + if (!_buf_used) + return WORK_DONE; + break; + } _buf_cond.wait( lock ); + } } - if (!_running) - return WORK_DONE; - while (noutput_items && _buf_used) { const int nout = std::min(noutput_items, _samp_avail); const unsigned char *buf = _buf[_buf_head] + _buf_offset * 2; -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] gr-osmosdr/rtl: bugfix: respect buffer len in cb

by Karl Semich

Callback now stores and makes use of rtlsdr data length, preventing corruption in the case of short reads. --- lib/rtl/rtl_source_c.cc | 13 +++++++------ lib/rtl/rtl_source_c.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..215500e 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -173,8 +173,6 @@ rtl_source_c::rtl_source_c (const std::string &args) << std::endl; } - _samp_avail = _buf_len / BYTES_PER_SAMPLE; - // create a lookup table for gr_complex values for (unsigned int i = 0; i < 0x100; i++) _lut.push_back((i - 127.4f) / 128.0f); @@ -232,6 +230,7 @@ rtl_source_c::rtl_source_c (const std::string &args) set_if_gain( 24 ); /* preset to a reasonable default (non-GRC use case) */ _buf = (unsigned char **)malloc(_buf_num * sizeof(unsigned char *)); + _samp_avails = (int *)malloc(_buf_num * sizeof(uint32_t)); if (_buf) { for(unsigned int i = 0; i < _buf_num; ++i) @@ -261,6 +260,8 @@ rtl_source_c::~rtl_source_c () free(_buf[i]); } + free(_samp_avails); + _samp_avails = NULL; free(_buf); _buf = NULL; } @@ -302,6 +303,7 @@ void rtl_source_c::rtlsdr_callback(unsigned char *buf, uint32_t len) int buf_tail = (_buf_head + _buf_used) % _buf_num; memcpy(_buf[buf_tail], buf, len); + _samp_avails[buf_tail] = len / BYTES_PER_SAMPLE; if (_buf_used == _buf_num) { std::cerr << "O" << std::flush; @@ -348,23 +350,22 @@ int rtl_source_c::work( int noutput_items, return WORK_DONE; while (noutput_items && _buf_used) { - const int nout = std::min(noutput_items, _samp_avail); + const int nout = std::min(noutput_items, _samp_avails[_buf_head]); const unsigned char *buf = _buf[_buf_head] + _buf_offset * 2; for (int i = 0; i < nout; ++i) *out++ = gr_complex(_lut[buf[i * 2]], _lut[buf[i * 2 + 1]]); noutput_items -= nout; - _samp_avail -= nout; + _samp_avails[_buf_head] -= nout; - if (!_samp_avail) { + if (!_samp_avails[_buf_head]) { { boost::mutex::scoped_lock lock( _buf_mutex ); _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; } - _samp_avail = _buf_len / BYTES_PER_SAMPLE; _buf_offset = 0; } else { _buf_offset += nout; diff --git a/lib/rtl/rtl_source_c.h b/lib/rtl/rtl_source_c.h index 902b386..8e537a5 100644 --- a/lib/rtl/rtl_source_c.h +++ b/lib/rtl/rtl_source_c.h @@ -127,6 +127,7 @@ private: rtlsdr_dev_t *_dev; gr::thread::thread _thread; unsigned char **_buf; + int *_samp_avails; unsigned int _buf_num; unsigned int _buf_len; unsigned int _buf_head; @@ -136,7 +137,6 @@ private: bool _running; unsigned int _buf_offset; - int _samp_avail; bool _no_tuner; bool _auto_gain; -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] gr-osmosdr/rtl: REPOST overflow fixes and draining

by Baffo32

From: Karl Semich <0xloem(a)gmail.com> Previously overflow was handled by outputting "O" on stderr and placing the extra data at the start of the buffer queue. This had a number of issues: - as only 1 buffer advanced on overflow, many overflows could occur in sequence, as only small amounts of data was allowed to drain - if the work function was partway through reading the head of the queue, it would continue reading at the same offset from the new head rather than from the start, causing extra loss of data - buffer processing in work function is not guarded with a lock, so it was possible for overflow to overwrite data while it was being copied, resulting in garbage passed on This patch rewrites overflow handling such that streaming is paused until the work function can catch up. This resolves all 3 issues. --- lib/rtl/rtl_source_c.cc | 32 ++++++++++++++++++++++++++------ lib/rtl/rtl_source_c.h | 2 ++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..0d26831 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -48,6 +48,7 @@ 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 initial garbage +#define BUF_MIN 3 /* minimum buffers to run work function */ #define BYTES_PER_SAMPLE 2 // rtl device delivers 8 bit unsigned IQ data @@ -87,8 +88,7 @@ rtl_source_c::rtl_source_c (const std::string &args) _running(false), _no_tuner(false), _auto_gain(false), - _if_gain(0), - _skipped(0) + _if_gain(0) { int ret; int index; @@ -297,6 +297,9 @@ void rtl_source_c::rtlsdr_callback(unsigned char *buf, uint32_t len) return; } + if (_overflow) + return; + { boost::mutex::scoped_lock lock( _buf_mutex ); @@ -304,8 +307,9 @@ void rtl_source_c::rtlsdr_callback(unsigned char *buf, uint32_t len) memcpy(_buf[buf_tail], buf, len); if (_buf_used == _buf_num) { - std::cerr << "O" << std::flush; - _buf_head = (_buf_head + 1) % _buf_num; + std::cerr << "OVERFLOW: rtl-sdr stream restarting after draining unread buffers" << std::endl; + _overflow = true; + rtlsdr_cancel_async( _dev ); } else { _buf_used++; } @@ -321,7 +325,20 @@ void rtl_source_c::_rtlsdr_wait(rtl_source_c *obj) void rtl_source_c::rtlsdr_wait() { - int ret = rtlsdr_read_async( _dev, _rtlsdr_callback, (void *)this, _buf_num, _buf_len ); + int ret; + + do { + { + boost::mutex::scoped_lock lock( _buf_mutex ); + // let unread buffers from last run drain + while ( _buf_used >= BUF_MIN ) + _work_cond.wait( lock ); + } + + _overflow = false; + _skipped = 0; + ret = rtlsdr_read_async( _dev, _rtlsdr_callback, (void *)this, _buf_num, _buf_len ); + } while ( _overflow ); _running = false; @@ -340,7 +357,7 @@ int rtl_source_c::work( int noutput_items, { boost::mutex::scoped_lock lock( _buf_mutex ); - while (_buf_used < 3 && _running) // collect at least 3 buffers + while (_buf_used < BUF_MIN && _running) // collect at least BUF_MIN buffers _buf_cond.wait( lock ); } @@ -364,6 +381,9 @@ int rtl_source_c::work( int noutput_items, _buf_head = (_buf_head + 1) % _buf_num; _buf_used--; } + + _work_cond.notify_one(); + _samp_avail = _buf_len / BYTES_PER_SAMPLE; _buf_offset = 0; } else { diff --git a/lib/rtl/rtl_source_c.h b/lib/rtl/rtl_source_c.h index 902b386..aafea5f 100644 --- a/lib/rtl/rtl_source_c.h +++ b/lib/rtl/rtl_source_c.h @@ -133,6 +133,8 @@ private: unsigned int _buf_used; boost::mutex _buf_mutex; boost::condition_variable _buf_cond; + boost::condition_variable _work_cond; + bool _overflow; bool _running; unsigned int _buf_offset; -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] gr-osmosdr/lib: REPOST add support for msg cmds

by Baffo32

From: Karl Semich <0xloem(a)gmail.com> Adds support for message commands ala UHD to all devices. Refactored just a little to provide for this. Even if this is too much to review, a comment on the submission of this patch would be a great gift. I'm very interested in this feature and want to do the work to find a way to make it work. --- include/osmosdr/CMakeLists.txt | 1 + include/osmosdr/messages.h | 37 ++ lib/CMakeLists.txt | 1 + lib/common_iface.h | 368 +++++++++++++++++++ lib/dev_manager.cc | 815 +++++++++++++++++++++++++++++++++++++++++ lib/dev_manager.h | 176 +++++++++ lib/sink_iface.h | 336 +---------------- lib/sink_impl.cc | 370 +++---------------- lib/sink_impl.h | 15 +- lib/source_iface.h | 337 +---------------- lib/source_impl.cc | 446 +++------------------- lib/source_impl.h | 20 +- lib/uhd/uhd_sink_c.cc | 5 + lib/uhd/uhd_source_c.cc | 5 + 14 files changed, 1530 insertions(+), 1402 deletions(-) create mode 100644 include/osmosdr/messages.h create mode 100644 lib/common_iface.h create mode 100644 lib/dev_manager.cc create mode 100644 lib/dev_manager.h diff --git a/include/osmosdr/CMakeLists.txt b/include/osmosdr/CMakeLists.txt index d185ee6..6f92eaa 100644 --- a/include/osmosdr/CMakeLists.txt +++ b/include/osmosdr/CMakeLists.txt @@ -26,6 +26,7 @@ install(FILES ranges.h time_spec.h device.h + messages.h source.h sink.h DESTINATION include/osmosdr diff --git a/include/osmosdr/messages.h b/include/osmosdr/messages.h new file mode 100644 index 0000000..b4aacf0 --- /dev/null +++ b/include/osmosdr/messages.h @@ -0,0 +1,37 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Karl Semich <0xloem(a)gmail.com> + * + * 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_MESSAGES_H +#define INCLUDED_OSMOSDR_MESSAGES_H + +#include <pmt/pmt.h> + +namespace osmosdr { + +const pmt::pmt_t CMD_PORT = pmt::mp("command"); +const pmt::pmt_t CMD_CHAN_KEY = pmt::mp("chan"); +const pmt::pmt_t CMD_GAIN_KEY = pmt::mp("gain"); +const pmt::pmt_t CMD_FREQ_KEY = pmt::mp("freq"); +const pmt::pmt_t CMD_RATE_KEY = pmt::mp("rate"); +const pmt::pmt_t CMD_ANTENNA_KEY = pmt::mp("antenna"); +const pmt::pmt_t CMD_BANDWIDTH_KEY = pmt::mp("bandwidth"); + +} /* namespace osmosdr */ + +#endif /* INCLUDED_OSMOSDR_MESSAGES_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index dbb175a..c2816c9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -38,6 +38,7 @@ ENDMACRO(GR_OSMOSDR_APPEND_LIBS) GR_OSMOSDR_APPEND_SRCS( source_impl.cc sink_impl.cc + dev_manager.cc ranges.cc device.cc time_spec.cc diff --git a/lib/common_iface.h b/lib/common_iface.h new file mode 100644 index 0000000..b3c6b03 --- /dev/null +++ b/lib/common_iface.h @@ -0,0 +1,368 @@ +/* -*- c++ -*- */ +/* + * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef OSMOSDR_COMMON_IFACE_H +#define OSMOSDR_COMMON_IFACE_H + +#include <osmosdr/ranges.h> +#include <osmosdr/time_spec.h> + +/*! + * TODO: document + * + */ +class common_iface +{ +public: + /*! + * Get the number of channels the underlying radio hardware offers. + * \return the number of available channels + */ + virtual size_t get_num_channels( void ) = 0; + + /*! + * Get the possible sample rates for the underlying radio hardware. + * \return a range of rates in Sps + */ + virtual osmosdr::meta_range_t get_sample_rates( void ) = 0; + + /*! + * Set the sample rate for the underlying radio hardware. + * This also will select the appropriate IF bandpass, if applicable. + * \param rate a new rate in Sps + */ + virtual double set_sample_rate( double rate ) = 0; + + /*! + * Get the sample rate for the underlying radio hardware. + * This is the actual sample rate and may differ from the rate set. + * \return the actual rate in Sps + */ + virtual double get_sample_rate( void ) = 0; + + /*! + * Get the tunable frequency range for the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return the frequency range in Hz + */ + virtual osmosdr::freq_range_t get_freq_range( size_t chan = 0 ) = 0; + + /*! + * Tune the underlying radio hardware to the desired center frequency. + * This also will select the appropriate RF bandpass. + * \param freq the desired frequency in Hz + * \param chan the channel index 0 to N-1 + * \return the actual frequency in Hz + */ + virtual double set_center_freq( double freq, size_t chan = 0 ) = 0; + + /*! + * Get the center frequency the underlying radio hardware is tuned to. + * This is the actual frequency and may differ from the frequency set. + * \param chan the channel index 0 to N-1 + * \return the frequency in Hz + */ + virtual double get_center_freq( size_t chan = 0 ) = 0; + + /*! + * Set the frequency correction value in parts per million. + * \param ppm the desired correction value in parts per million + * \param chan the channel index 0 to N-1 + * \return correction value in parts per million + */ + virtual double set_freq_corr( double ppm, size_t chan = 0 ) = 0; + + /*! + * Get the frequency correction value. + * \param chan the channel index 0 to N-1 + * \return correction value in parts per million + */ + virtual double get_freq_corr( size_t chan = 0 ) = 0; + + /*! + * Get the gain stage names of the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return a vector of strings containing the names of gain stages + */ + virtual std::vector<std::string> get_gain_names( size_t chan = 0 ) = 0; + + /*! + * Get the settable overall gain range for the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return the gain range in dB + */ + virtual osmosdr::gain_range_t get_gain_range( size_t chan = 0 ) = 0; + + /*! + * Get the settable gain range for a specific gain stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the gain range in dB + */ + virtual osmosdr::gain_range_t get_gain_range( const std::string & name, + size_t chan = 0 ) = 0; + + /*! + * Set the gain mode for the underlying radio hardware. + * This might be supported only for certain hardware types. + * \param automatic the gain mode (true means automatic gain mode) + * \param chan the channel index 0 to N-1 + * \return the actual gain mode + */ + virtual bool set_gain_mode( bool automatic, size_t chan = 0 ) { return false; } + + /*! + * Get the gain mode selected for the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return the actual gain mode (true means automatic gain mode) + */ + virtual bool get_gain_mode( size_t chan = 0 ) { return false; } + + /*! + * Set the gain for the underlying radio hardware. + * This function will automatically distribute the desired gain value over + * available gain stages in an appropriate way and return the actual value. + * \param gain the gain in dB + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double set_gain( double gain, size_t chan = 0 ) = 0; + + /*! + * Set the named gain on the underlying radio hardware. + * \param gain the gain in dB + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double set_gain( double gain, + const std::string & name, + size_t chan = 0 ) = 0; + + /*! + * Get the actual gain setting of the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double get_gain( size_t chan = 0 ) = 0; + + /*! + * Get the actual gain setting of a named stage. + * \param name the name of the gain stage + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double get_gain( const std::string & name, size_t chan = 0 ) = 0; + + /*! + * Set the IF gain for the underlying radio hardware. + * This function will automatically distribute the desired gain value over + * available IF gain stages in an appropriate way and return the actual value. + * \param gain the gain in dB + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double set_if_gain( double gain, size_t chan = 0 ) { return 0; } + + /*! + * Set the BB gain for the underlying radio hardware. + * This function will automatically distribute the desired gain value over + * available BB gain stages in an appropriate way and return the actual value. + * \param gain the gain in dB + * \param chan the channel index 0 to N-1 + * \return the actual gain in dB + */ + virtual double set_bb_gain( double gain, size_t chan = 0 ) { return 0; } + + /*! + * Get the available antennas of the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return a vector of strings containing the names of available antennas + */ + virtual std::vector< std::string > get_antennas( size_t chan = 0 ) = 0; + + /*! + * Select the active antenna of the underlying radio hardware. + * \param chan the channel index 0 to N-1 + * \return the actual antenna's name + */ + virtual std::string set_antenna( const std::string & antenna, + size_t chan = 0 ) = 0; + + /*! + * Get the actual underlying radio hardware antenna setting. + * \param chan the channel index 0 to N-1 + * \return the actual antenna's name + */ + virtual std::string get_antenna( size_t chan = 0 ) = 0; + + /*! + * Set the frontend DC offset value. + * The value is complex to control both I and Q. + * For RX, only set this when automatic correction is disabled. + * + * \param offset the dc offset (1.0 is full-scale) + * \param chan the channel index 0 to N-1 + */ + virtual void set_dc_offset( const std::complex<double> &offset, size_t chan = 0 ) { } + + /*! + * Set the frontend IQ balance correction. + * Use this to adjust the magnitude and phase of I and Q. + * + * \param balance the complex correction value + * \param chan the channel index 0 to N-1 + */ + virtual void set_iq_balance( const std::complex<double> &balance, size_t chan = 0 ) { } + + /*! + * Set the bandpass filter on the radio frontend. + * \param bandwidth the filter bandwidth in Hz, set to 0 for automatic selection + * \param chan the channel index 0 to N-1 + * \return the actual filter bandwidth in Hz + */ + virtual double set_bandwidth( double bandwidth, size_t chan = 0 ) { return 0; } + + /*! + * Get the actual bandpass filter setting on the radio frontend. + * \param chan the channel index 0 to N-1 + * \return the actual filter bandwidth in Hz + */ + virtual double get_bandwidth( size_t chan = 0 ) { return 0; } + + /*! + * Get the possible bandpass filter settings on the radio frontend. + * \param chan the channel index 0 to N-1 + * \return a range of bandwidths in Hz + */ + virtual osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ) + { return osmosdr::freq_range_t(); } + + /*! + * Set the time source for the device. + * This sets the method of time synchronization, + * typically a pulse per second or an encoded time. + * Typical options for source: external, MIMO. + * \param source a string representing the time source + * \param mboard which motherboard to set the config + */ + virtual void set_time_source(const std::string &source, + const size_t mboard = 0) { } + + /*! + * Get the currently set time source. + * \param mboard which motherboard to get the config + * \return the string representing the time source + */ + virtual std::string get_time_source(const size_t mboard) { return ""; } + + /*! + * Get a list of possible time sources. + * \param mboard which motherboard to get the list + * \return a vector of strings for possible settings + */ + virtual std::vector<std::string> get_time_sources(const size_t mboard) + { + return std::vector<std::string>(); + } + + /*! + * Set the clock source for the device. + * This sets the source for a 10 Mhz reference clock. + * Typical options for source: internal, external, MIMO. + * \param source a string representing the clock source + * \param mboard which motherboard to set the config + */ + virtual void set_clock_source(const std::string &source, + const size_t mboard = 0) { } + + /*! + * Get the currently set clock source. + * \param mboard which motherboard to get the config + * \return the string representing the clock source + */ + virtual std::string get_clock_source(const size_t mboard) { return ""; } + + /*! + * Get a list of possible clock sources. + * \param mboard which motherboard to get the list + * \return a vector of strings for possible settings + */ + virtual std::vector<std::string> get_clock_sources(const size_t mboard) + { + return std::vector<std::string>(); + } + + /*! + * Get the master clock rate. + * \param mboard the motherboard index 0 to M-1 + * \return the clock rate in Hz + */ + virtual double get_clock_rate(size_t mboard = 0) { return 0; } + + /*! + * Set the master clock rate. + * \param rate the new rate in Hz + * \param mboard the motherboard index 0 to M-1 + */ + virtual void set_clock_rate(double rate, size_t mboard = 0) { } + + /*! + * Get the current time registers. + * \param mboard the motherboard index 0 to M-1 + * \return the current device time + */ + virtual ::osmosdr::time_spec_t get_time_now(size_t mboard = 0) + { + return ::osmosdr::time_spec_t::get_system_time(); + } + + /*! + * Get the time when the last pps pulse occured. + * \param mboard the motherboard index 0 to M-1 + * \return the current device time + */ + virtual ::osmosdr::time_spec_t get_time_last_pps(size_t mboard = 0) + { + return ::osmosdr::time_spec_t::get_system_time(); + } + + /*! + * Sets the time registers immediately. + * \param time_spec the new time + * \param mboard the motherboard index 0 to M-1 + */ + virtual void set_time_now(const ::osmosdr::time_spec_t &time_spec, + size_t mboard = 0) { } + + /*! + * Set the time registers at the next pps. + * \param time_spec the new time + */ + virtual void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec) { } + + /*! + * Sync the time registers with an unknown pps edge. + * \param time_spec the new time + */ + virtual void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec) { } +}; + +#endif // OSMOSDR_COMMON_IFACE_H diff --git a/lib/dev_manager.cc b/lib/dev_manager.cc new file mode 100644 index 0000000..e2d0319 --- /dev/null +++ b/lib/dev_manager.cc @@ -0,0 +1,815 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Karl Semich <0xloem(a)gmail.com> + * + * 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 "dev_manager.h" + +#include <gnuradio/io_signature.h> + +#include "source_iface.h" + +/* + * Create a new instance of dev_manager and return + * a boost shared_ptr. This is effectively the public constructor. + */ +dev_manager_sptr +make_dev_manager ( gr::hier_block2_sptr outer ) +{ + return gnuradio::get_initial_sptr( new dev_manager ( outer ) ); +} + +/* + * The private constructor + */ +dev_manager::dev_manager ( gr::hier_block2_sptr outer ) + : gr::block ( "dev_manager", + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(0, 0, 0) ), + _outer(outer), + _channels(0), + _sample_rate(NAN) +{ + message_port_register_in( osmosdr::CMD_PORT ); + set_msg_handler( osmosdr::CMD_PORT, boost::bind(&dev_manager::msg_handler_command, this, _1) ); +} + +int dev_manager::general_work( int noutput_items, + gr_vector_int &ninput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) +{ + return 0; +} + +void dev_manager::add_device( gr::basic_block_sptr block, common_iface *iface ) +{ + if ( iface == nullptr || block.get() == nullptr ) { + if ( iface != nullptr || block.get() != nullptr ) + throw std::runtime_error("Either iface or block are NULL."); + return; + } + + size_t mboard = get_num_mboards(); + _devs.push_back( { iface, block, _channels } ); + + if ( is_sink( mboard ) ) { + // sink block + for (size_t i = 0; i < iface->get_num_channels(); i++) { + _outer->connect( _outer->self(), _channels, block, i ); + _chandevs.push_back( mboard ); + _channels++; + } + } else { + // source block + for (size_t i = 0; i < iface->get_num_channels(); i++) { +#ifdef HAVE_IQBALANCE + // add iqbalance blocks if enabled + gr::iqbalance::optimize_c::sptr iq_opt = gr::iqbalance::optimize_c::make( 0 ); + gr::iqbalance::fix_cc::sptr iq_fix = gr::iqbalance::fix_cc::make(); + + connect( block, i, iq_fix, 0 ); + connect( block, i, iq_opt, 0 ); + msg_connect( iq_opt, "iqbal_corr", iq_fix, "iqbal_corr" ); + + _iq_opt.push_back( iq_opt.get() ); + _iq_fix.push_back( iq_fix.get() ); + + _outer->connect( iq_fix, 0, _outer->self(), _channels ); + #else + _outer->connect( block, i, _outer->self(), _channels ); + #endif + _chandevs.push_back( mboard ); + _channels++; + } + } +} + +size_t dev_manager::get_num_mboards() const +{ + return _devs.size(); +} + +size_t dev_manager::get_mboard_for_channel( size_t chan ) const +{ + return _chandevs.at(chan); +} + +bool dev_manager::is_sink( size_t mboard ) const +{ + return get_block(mboard)->input_signature()->max_streams() > 0; +} + +gr::basic_block_sptr dev_manager::get_block( size_t mboard ) const +{ + return _devs.at(mboard).block; +} + +common_iface * dev_manager::get_iface( size_t mboard ) const +{ + return _devs.at(mboard).dev; +} + +size_t dev_manager::get_mboard_channel( size_t mboard ) const +{ + return _devs.at(mboard).chan; +} + +void dev_manager::msg_handler_command( pmt::pmt_t msg ) +{ + if ( !pmt::is_dict(msg) ) { + GR_LOG_ERROR( d_logger, boost::format("Command message is neither dict nor pair: %s") % msg ); + return; + } + + // if pair, this throws and converts to dict + try { + pmt::pmt_t keys = pmt::dict_keys(msg); + } catch ( const pmt::wrong_type & ) { + GR_LOG_DEBUG( d_debug_logger, boost::format("Converting pair to dict: %s") % msg ); + msg = pmt::dict_add( pmt::make_dict(), pmt::car(msg), pmt::cdr(msg) ); + } + + // read chan. defaults to -1, all chans at once + int chan; + try { + chan = int(pmt::to_long( + pmt::dict_ref( + msg, osmosdr::CMD_CHAN_KEY, + pmt::from_long(-1) + ) + )); + } catch ( const pmt::wrong_type & ) { + GR_LOG_ALERT( d_logger, boost::format("Invalid channel number %s") % pmt::dict_ref( msg, osmosdr::CMD_CHAN_KEY ) ); + return; + } + + // rate applies to all channels + pmt::pmt_t rate = pmt::dict_ref( msg, osmosdr::CMD_RATE_KEY, pmt::PMT_NIL ); + if ( rate != pmt::PMT_NIL ) { + if ( !pmt::is_real(rate) && !pmt::is_integer(rate) ) { + GR_LOG_ALERT( d_logger, boost::format("Invalid type for sample rate %s") % rate ); + return; + } + set_sample_rate( pmt::to_double(rate) ); + msg = pmt::dict_delete( msg, osmosdr::CMD_RATE_KEY ); + } + + // extract commands + pmt::pmt_t msg_items = pmt::dict_items(msg); + + // check every device + for (size_t mboard = 0; mboard < get_num_mboards(); mboard++) { + int cur_chan = get_mboard_channel( mboard ); + int next_chan = cur_chan + get_iface( mboard )->get_num_channels(); + if ( chan != -1 && chan >= next_chan ) + continue; + + // if device accepts command messages, just pass it along + gr::basic_block_sptr block = get_block( mboard ); + if ( block->has_msg_port(osmosdr::CMD_PORT) ) { + if ( chan != -1 ) + block->_post( osmosdr::CMD_PORT, pmt::dict_add(msg, osmosdr::CMD_CHAN_KEY, pmt::from_long(chan - cur_chan)) ); + else + block->_post( osmosdr::CMD_PORT, msg ); + continue; + } + + int start_chan, end_chan; + if ( chan == -1 ) { + start_chan = cur_chan; + end_chan = next_chan; + } else { + start_chan = chan; + end_chan = chan + 1; + } + + for (int it_chan = start_chan; it_chan < end_chan; ++ it_chan){ + // execute every command + + for (size_t i = 0; i < pmt::length(msg_items); ++ i){ + pmt::pmt_t const & item = pmt::nth(i, msg_items); + try { + exec_msg_cmd( pmt::car(item), pmt::cdr(item), it_chan ); + } catch (const pmt::wrong_type &) { + try { + GR_LOG_ALERT( d_logger, boost::format("Invalid command value for key %s: %s") % pmt::car(item) % pmt::cdr(item) ); + } catch (const pmt::wrong_type &) { + GR_LOG_ALERT( d_logger, boost::format("Command is not a pair: %s") % item ); + } + return; + } + } + } + } +} + +void dev_manager::exec_msg_cmd( const pmt::pmt_t & cmd, const pmt::pmt_t & val, size_t chan ) +{ + if ( cmd == osmosdr::CMD_FREQ_KEY ) { + set_center_freq( pmt::to_double(val), chan ); + } else if ( cmd == osmosdr::CMD_GAIN_KEY ) { + set_gain( pmt::to_double(val), chan ); + } else if ( cmd == osmosdr::CMD_RATE_KEY ) { + // already set in msg_handler_command + ; + } else if ( cmd == osmosdr::CMD_ANTENNA_KEY ) { + set_antenna( pmt::symbol_to_string(val), chan ); + } else if ( cmd == osmosdr::CMD_BANDWIDTH_KEY ) { + set_bandwidth( pmt::to_double(val), chan ); + } + // unfamiliar commands are ignored +} + +size_t dev_manager::get_num_channels() +{ + return _channels; +} + +bool dev_manager::seek( long seek_point, int whence, size_t chan ) +{ + if ( chan > get_num_channels() ) + return false; + + size_t mboard = get_mboard_for_channel( chan ); + if ( is_sink( mboard ) ) + return false; + + size_t dev_chan = chan - get_mboard_channel( mboard ); + source_iface * dev = static_cast< source_iface * >( get_iface( mboard ) ); + + return dev->seek( seek_point, whence, dev_chan ); +} + +#define NO_DEVICES_MSG "FATAL: No device(s) available to work with." + +osmosdr::meta_range_t dev_manager::get_sample_rates() +{ + if ( get_num_mboards() ) + return get_iface(0)->get_sample_rates(); // assume same devices used in the group +#if 0 + else + throw std::runtime_error(NO_DEVICES_MSG); +#endif + return osmosdr::meta_range_t(); +} + +double dev_manager::set_sample_rate( double rate ) +{ + double sample_rate = 0; + + if (_sample_rate != rate) { +#if 0 + if (!get_num_mboards()) + throw std::runtime_error(NO_DEVICES_MSG); +#endif + for (size_t mboard = 0; mboard < get_num_mboards(); mboard++) { + common_iface *dev = get_iface( mboard ); + sample_rate = dev->set_sample_rate(rate); + if ( !is_sink( mboard ) ) { +#ifdef HAVE_IQBALANCE + // source block, update iqbalance if enabled + size_t channel = get_mboard_channel( mboard ); + size_t end = channel + dev->get_num_channels(); + for (; channel < end; channel++) { + if ( channel < _iq_opt.size() ) { + gr::iqbalance::optimize_c *opt = _iq_opt[channel]; + + if ( opt->period() > 0 ) { /* optimize is enabled */ + opt->set_period( dev->get_sample_rate() / 5 ); + opt_reset(); + } + } + } +#endif + } + } + + _sample_rate = sample_rate; + } + + return sample_rate; +} + +double dev_manager::get_sample_rate() +{ + double sample_rate = 0; + + if (get_num_mboards()) + sample_rate = get_iface(0)->get_sample_rate(); // assume same devices used in the group +#if 0 + else + throw std::runtime_error(NO_DEVICES_MSG); +#endif + return sample_rate; +} + +osmosdr::freq_range_t dev_manager::get_freq_range( size_t chan ) +{ + if ( chan > get_num_channels() ) + return osmosdr::freq_range_t(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_freq_range( dev_chan ); +} + +double dev_manager::set_center_freq( double freq, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _center_freq[ chan ] != freq ) { + _center_freq[ chan ] = freq; + return dev->set_center_freq( freq, dev_chan ); + } else { return _center_freq[ chan ]; } +} + +double dev_manager::get_center_freq( size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_center_freq( dev_chan ); +} + +double dev_manager::set_freq_corr( double ppm, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _freq_corr[ chan ] != ppm ) { + _freq_corr[ chan ] = ppm; + return dev->set_freq_corr( ppm, dev_chan ); + } else { return _freq_corr[ chan ]; } +} + +double dev_manager::get_freq_corr( size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_freq_corr( dev_chan ); +} + +std::vector<std::string> dev_manager::get_gain_names( size_t chan ) +{ + if ( chan > get_num_channels() ) + return std::vector< std::string >(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain_names( dev_chan ); +} + +osmosdr::gain_range_t dev_manager::get_gain_range( size_t chan ) +{ + if ( chan > get_num_channels() ) + return osmosdr::gain_range_t(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain_range( dev_chan ); +} + +osmosdr::gain_range_t dev_manager::get_gain_range( const std::string & name, size_t chan ) +{ + if ( chan > get_num_channels() ) + return osmosdr::gain_range_t(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain_range( name, dev_chan ); +} + +bool dev_manager::set_gain_mode( bool automatic, size_t chan ) +{ + if ( chan > get_num_channels() ) + return false; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _gain_mode[ chan ] != automatic ) { + _gain_mode[ chan ] = automatic; + bool mode = dev->set_gain_mode( automatic, dev_chan ); + if (!automatic) // reapply gain value when switched to manual mode + dev->set_gain( _gain[ chan ], dev_chan ); + return mode; + } else { return _gain_mode[ chan ]; } +} + +bool dev_manager::get_gain_mode( size_t chan ) +{ + if ( chan > get_num_channels() ) + return false; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain_mode( dev_chan ); +} + +double dev_manager::set_gain( double gain, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _gain[ chan ] != gain ) { + _gain[ chan ] = gain; + return dev->set_gain( gain, dev_chan ); + } else { return _gain[ chan ]; } +} + +double dev_manager::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->set_gain( gain, name, dev_chan ); +} + +double dev_manager::get_gain( size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain( dev_chan ); +} + +double dev_manager::get_gain( const std::string & name, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_gain( name, dev_chan ); +} + +double dev_manager::set_if_gain( double gain, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _if_gain[ chan ] != gain ) { + _if_gain[ chan ] = gain; + return dev->set_if_gain( gain, dev_chan ); + } else { return _if_gain[ chan ]; } +} + +double dev_manager::set_bb_gain( double gain, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _bb_gain[ chan ] != gain ) { + _bb_gain[ chan ] = gain; + return dev->set_bb_gain( gain, dev_chan ); + } else { return _bb_gain[ chan ]; } +} + +std::vector< std::string > dev_manager::get_antennas( size_t chan ) +{ + if ( chan > get_num_channels() ) + return std::vector< std::string >(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_antennas( dev_chan ); +} + +std::string dev_manager::set_antenna( const std::string & antenna, size_t chan ) +{ + if ( chan > get_num_channels() ) + return ""; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _antenna[ chan ] != antenna ) { + _antenna[ chan ] = antenna; + return dev->set_antenna( antenna, dev_chan ); + } else { return _antenna[ chan ]; } +} + +std::string dev_manager::get_antenna( size_t chan ) +{ + if ( chan > get_num_channels() ) + return ""; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_antenna( dev_chan ); +} + +void dev_manager::set_dc_offset_mode( int mode, size_t chan ) +{ + if ( chan > get_num_channels() ) + return; + + size_t mboard = get_mboard_for_channel( chan ); + if ( is_sink( mboard ) ) + return; + + size_t dev_chan = chan - get_mboard_channel( mboard ); + source_iface * dev = static_cast< source_iface * >( get_iface( mboard ) ); + + dev->set_dc_offset_mode( mode, dev_chan ); +} + +void dev_manager::set_dc_offset( const std::complex<double> &offset, size_t chan ) +{ + if ( chan > get_num_channels() ) + return; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + dev->set_dc_offset( offset, dev_chan ); +} + +void dev_manager::set_iq_balance_mode( int mode, size_t chan ) +{ + if ( chan > get_num_channels() ) + return; + + size_t mboard = get_mboard_for_channel( chan ); + if ( is_sink( mboard ) ) + return; + + size_t dev_chan = chan - get_mboard_channel( mboard ); + source_iface * dev = static_cast< source_iface * >( get_iface( mboard ) ); + +#ifdef HAVE_IQBALANCE + if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { + gr::iqbalance::optimize_c *opt = _iq_opt[chan]; + gr::iqbalance::fix_cc *fix = _iq_fix[chan]; + + if ( IQBalanceOff == mode ) { + opt->set_period( 0 ); + /* store current values in order to be able to restore them later */ + _vals[ chan ] = std::pair< float, float >( fix->mag(), fix->phase() ); + fix->set_mag( 0.0f ); + fix->set_phase( 0.0f ); + } else if ( IQBalanceManual == mode ) { + if ( opt->period() == 0 ) { /* transition from Off to Manual */ + /* restore previous values */ + std::pair< float, float > val = _vals[ chan ]; + fix->set_mag( val.first ); + fix->set_phase( val.second ); + } + opt->set_period( 0 ); + } else if ( IQBalanceAutomatic == mode ) { + opt->set_period( dev->get_sample_rate() / 5 ); + opt->reset(); + } + } +#else + return dev->set_iq_balance_mode( mode, dev_chan ); +#endif + +} + +void dev_manager::set_iq_balance( const std::complex<double> &balance, size_t chan ) +{ + if ( chan > get_num_channels() ) + return; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + +#ifdef HAVE_IQBALANCE + if ( ! is_sink( mboard ) ) { + // source block, update iqbalance if enabled + if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { + gr::iqbalance::optimize_c *opt = _iq_opt[chan]; + gr::iqbalance::fix_cc *fix = _iq_fix[chan]; + + if ( opt->period() == 0 ) { /* automatic optimization desabled */ + fix->set_mag( balance.real() ); + fix->set_phase( balance.imag() ); + } + } + } else { + dev->set_iq_balance( balance, dev_chan ); + } +#else + dev->set_iq_balance( balance, dev_chan ); +#endif +} + +double dev_manager::set_bandwidth( double bandwidth, size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + if ( _bandwidth[ chan ] != bandwidth || 0.0f == bandwidth ) { + _bandwidth[ chan ] = bandwidth; + return dev->set_bandwidth( bandwidth, dev_chan ); + } else { return _bandwidth[ chan ]; } +} + +double dev_manager::get_bandwidth( size_t chan ) +{ + if ( chan > get_num_channels() ) + return 0; + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_bandwidth( dev_chan ); +} + +osmosdr::freq_range_t dev_manager::get_bandwidth_range( size_t chan ) +{ + if ( chan > get_num_channels() ) + return osmosdr::freq_range_t(); + + size_t mboard = get_mboard_for_channel( chan ); + common_iface *dev = get_iface( mboard ); + size_t dev_chan = chan - get_mboard_channel( mboard ); + + return dev->get_bandwidth_range( dev_chan ); +} + +void dev_manager::set_time_source( const std::string &source, const size_t mboard ) +{ + if ( mboard != osmosdr::ALL_MBOARDS ) { + get_iface( mboard )->set_time_source( source ); + return; + } + + for (size_t m = 0; m < get_num_mboards(); m++) { /* propagate ALL_MBOARDS */ + get_iface(m)->set_time_source( source, osmosdr::ALL_MBOARDS ); + } +} + +std::string dev_manager::get_time_source( const size_t mboard ) +{ + return get_iface( mboard )->get_time_source( mboard ); +} + +std::vector<std::string> dev_manager::get_time_sources( const size_t mboard ) +{ + return get_iface( mboard )->get_time_sources( mboard ); +} + +void dev_manager::set_clock_source( const std::string &source, const size_t mboard ) +{ + if (mboard != osmosdr::ALL_MBOARDS){ + get_iface( mboard )->set_clock_source( source ); + return; + } + + for (size_t m = 0; m < get_num_mboards(); m++){ /* propagate ALL_MBOARDS */ + get_iface(m)->set_clock_source( source, osmosdr::ALL_MBOARDS ); + } +} + +std::string dev_manager::get_clock_source( const size_t mboard ) +{ + return get_iface( mboard )->get_clock_source( mboard ); +} + +std::vector<std::string> dev_manager::get_clock_sources( const size_t mboard ) +{ + return get_iface( mboard )->get_clock_sources( mboard ); +} + +double dev_manager::get_clock_rate( size_t mboard ) +{ + return get_iface( mboard )->get_clock_rate( mboard ); +} + +void dev_manager::set_clock_rate( double rate, size_t mboard ) +{ + if ( mboard != osmosdr::ALL_MBOARDS ) { + get_iface( mboard )->set_clock_rate( rate ); + return; + } + + for (size_t m = 0; m < get_num_mboards(); m++) { /* propagate ALL_MBOARDS */ + get_iface(m)->set_clock_rate( rate, osmosdr::ALL_MBOARDS ); + } +} + +osmosdr::time_spec_t dev_manager::get_time_now( size_t mboard ) +{ + return get_iface( mboard )->get_time_now( mboard ); +} + +osmosdr::time_spec_t dev_manager::get_time_last_pps( size_t mboard ) +{ + return get_iface( mboard )->get_time_last_pps( mboard ); +} + +void dev_manager::set_time_now( const osmosdr::time_spec_t &time_spec, size_t mboard ) +{ + if ( mboard != osmosdr::ALL_MBOARDS ) { + get_iface( mboard )->set_time_now( time_spec ); + return; + } + + for (size_t m = 0; m < get_num_mboards(); m++) { /* propagate ALL_MBOARDS */ + get_iface(m)->set_time_now( time_spec, osmosdr::ALL_MBOARDS ); + } +} + +void dev_manager::set_time_next_pps( const osmosdr::time_spec_t &time_spec ) +{ + for (size_t i = 0; i < get_num_mboards(); i++) { + get_iface(i)->set_time_next_pps( time_spec ); + } +} + +void dev_manager::set_time_unknown_pps( const osmosdr::time_spec_t &time_spec ) +{ + for (size_t i = 0; i < get_num_mboards(); i++) { + get_iface(i)->set_time_unknown_pps( time_spec ); + } +} diff --git a/lib/dev_manager.h b/lib/dev_manager.h new file mode 100644 index 0000000..416573f --- /dev/null +++ b/lib/dev_manager.h @@ -0,0 +1,176 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Karl Semich <0xloem(a)gmail.com> + * + * This file is part of GNU Radio + * + * 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_DEV_CONTROL_H +#define INCLUDED_DEV_CONTROL_H + +#include <gnuradio/hier_block2.h> +#include <gnuradio/block.h> + +#include <osmosdr/messages.h> + +#include "common_iface.h" + +class dev_manager; + +/* + * 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<dev_manager> dev_manager_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of dev_manager. + * + * To avoid accidental use of raw pointers, dev_manager's + * constructor is private. make_dev_manager is the public + * interface for creating new instances. + */ +dev_manager_sptr make_dev_manager ( gr::hier_block2_sptr outer ); + +/*! + * \brief Manages a set of osmosdr devices. + * \ingroup block + * + */ +class dev_manager : public gr::block +{ +private: + // The friend declaration allows make_dev_manager to + // access the private constructor. + + friend dev_manager_sptr make_dev_manager ( gr::hier_block2_sptr outer ); + + /*! + * \brief Manages a set of osmosdr devices. + */ + dev_manager ( gr::hier_block2_sptr outer ); // private constructor + +public: + int general_work( int noutput_items, + gr_vector_int &ninput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ); + + void add_device( gr::basic_block_sptr block, common_iface *iface ); // add a device driver block to be managed + size_t get_num_mboards() const; + size_t get_mboard_for_channel( size_t chan ) const; + bool is_sink( size_t mboard = 0 ) const; + gr::basic_block_sptr get_block( size_t mboard ) const; + common_iface * get_iface( size_t mboard ) const; + size_t get_mboard_channel( size_t mboard ) const; + + size_t get_num_channels(); + + bool seek( long seek_point, int whence, size_t chan); + + 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 ); + double set_center_freq( double freq, size_t chan ); + double get_center_freq( size_t chan ); + double set_freq_corr( double ppm, size_t chan ); + double get_freq_corr( size_t chan ); + + std::vector<std::string> get_gain_names( size_t chan ); + osmosdr::gain_range_t get_gain_range( size_t chan ); + osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan ); + bool set_gain_mode( bool automatic, size_t chan ); + bool get_gain_mode( size_t chan ); + double set_gain( double gain, size_t chan ); + double set_gain( double gain, const std::string & name, size_t chan ); + double get_gain( size_t chan ); + double get_gain( const std::string & name, size_t chan ); + + double set_if_gain( double gain, size_t chan ); + double set_bb_gain( double gain, size_t chan ); + + std::vector< std::string > get_antennas( size_t chan ); + std::string set_antenna( const std::string & antenna, size_t chan ); + std::string get_antenna( size_t chan ); + + void set_dc_offset_mode( int mode, size_t chan ); + void set_dc_offset( const std::complex<double> &offset, size_t chan ); + + void set_iq_balance_mode( int mode, size_t chan ); + void set_iq_balance( const std::complex<double> &balance, size_t chan ); + + double set_bandwidth( double bandwidth, size_t chan ); + double get_bandwidth( size_t chan ); + osmosdr::freq_range_t get_bandwidth_range( size_t chan ); + + void set_time_source(const std::string &source, const size_t mboard = 0); + std::string get_time_source(const size_t mboard); + std::vector<std::string> get_time_sources(const size_t mboard); + void set_clock_source(const std::string &source, const size_t mboard = 0); + std::string get_clock_source(const size_t mboard); + std::vector<std::string> get_clock_sources(const size_t mboard); + double get_clock_rate(size_t mboard = 0); + void set_clock_rate(double rate, size_t mboard = 0); + ::osmosdr::time_spec_t get_time_now(size_t mboard = 0); + ::osmosdr::time_spec_t get_time_last_pps(size_t mboard = 0); + void set_time_now(const ::osmosdr::time_spec_t &time_spec, size_t mboard = 0); + void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec); + void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec); + +private: + void msg_handler_command(pmt::pmt_t msg); + void exec_msg_cmd(const pmt::pmt_t &cmd, const pmt::pmt_t &val, size_t chan); + + struct dev_t { + common_iface * dev; + gr::basic_block_sptr block; + size_t chan; + }; + + std::vector< dev_t > _devs; + std::vector< size_t > _chandevs; + gr::hier_block2_sptr _outer; + size_t _channels; + + /* cache to prevent multiple device calls with the same value coming from grc */ + double _sample_rate; + std::map< size_t, double > _center_freq; + std::map< size_t, double > _freq_corr; + std::map< size_t, bool > _gain_mode; + std::map< size_t, double > _gain; + std::map< size_t, double > _if_gain; + std::map< size_t, double > _bb_gain; + std::map< size_t, std::string > _antenna; +#ifdef HAVE_IQBALANCE + std::vector< gr::iqbalance::fix_cc * > _iq_fix; + std::vector< gr::iqbalance::optimize_c * > _iq_opt; + std::map< size_t, std::pair<float, float> > _vals; +#endif + std::map< size_t, double > _bandwidth; +}; + +#endif /* INCLUDED_DEV_CONTROL_H */ diff --git a/lib/sink_iface.h b/lib/sink_iface.h index 39aabc7..f28e88b 100644 --- a/lib/sink_iface.h +++ b/lib/sink_iface.h @@ -25,344 +25,14 @@ #include <osmosdr/time_spec.h> #include <gnuradio/basic_block.h> +#include "common_iface.h" + /*! * TODO: document * */ -class sink_iface +class sink_iface : public common_iface { -public: - /*! - * Get the number of channels the underlying radio hardware offers. - * \return the number of available channels - */ - virtual size_t get_num_channels( void ) = 0; - - /*! - * Get the possible sample rates for the underlying radio hardware. - * \return a range of rates in Sps - */ - virtual osmosdr::meta_range_t get_sample_rates( void ) = 0; - - /*! - * Set the sample rate for the underlying radio hardware. - * This also will select the appropriate IF bandpass, if applicable. - * \param rate a new rate in Sps - */ - virtual double set_sample_rate( double rate ) = 0; - - /*! - * Get the sample rate for the underlying radio hardware. - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_sample_rate( void ) = 0; - - /*! - * Get the tunable frequency range for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the frequency range in Hz - */ - virtual osmosdr::freq_range_t get_freq_range( size_t chan = 0 ) = 0; - - /*! - * Tune the underlying radio hardware to the desired center frequency. - * This also will select the appropriate RF bandpass. - * \param freq the desired frequency in Hz - * \param chan the channel index 0 to N-1 - * \return the actual frequency in Hz - */ - virtual double set_center_freq( double freq, size_t chan = 0 ) = 0; - - /*! - * Get the center frequency the underlying radio hardware is tuned to. - * This is the actual frequency and may differ from the frequency set. - * \param chan the channel index 0 to N-1 - * \return the frequency in Hz - */ - virtual double get_center_freq( size_t chan = 0 ) = 0; - - /*! - * Set the frequency correction value in parts per million. - * \param ppm the desired correction value in parts per million - * \param chan the channel index 0 to N-1 - * \return correction value in parts per million - */ - virtual double set_freq_corr( double ppm, size_t chan = 0 ) = 0; - - /*! - * Get the frequency correction value. - * \param chan the channel index 0 to N-1 - * \return correction value in parts per million - */ - virtual double get_freq_corr( size_t chan = 0 ) = 0; - - /*! - * Get the gain stage names of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return a vector of strings containing the names of gain stages - */ - virtual std::vector<std::string> get_gain_names( size_t chan = 0 ) = 0; - - /*! - * Get the settable overall gain range for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the gain range in dB - */ - virtual osmosdr::gain_range_t get_gain_range( size_t chan = 0 ) = 0; - - /*! - * Get the settable gain range for a specific gain stage. - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the gain range in dB - */ - virtual osmosdr::gain_range_t get_gain_range( const std::string & name, - size_t chan = 0 ) = 0; - - /*! - * Set the gain mode for the underlying radio hardware. - * This might be supported only for certain hardware types. - * \param automatic the gain mode (true means automatic gain mode) - * \param chan the channel index 0 to N-1 - * \return the actual gain mode - */ - virtual bool set_gain_mode( bool automatic, size_t chan = 0 ) { return false; } - - /*! - * Get the gain mode selected for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual gain mode (true means automatic gain mode) - */ - virtual bool get_gain_mode( size_t chan = 0 ) { return false; } - - /*! - * Set the gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_gain( double gain, size_t chan = 0 ) = 0; - - /*! - * Set the named gain on the underlying radio hardware. - * \param gain the gain in dB - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_gain( double gain, - const std::string & name, - size_t chan = 0 ) = 0; - - /*! - * Get the actual gain setting of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double get_gain( size_t chan = 0 ) = 0; - - /*! - * Get the actual gain setting of a named stage. - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double get_gain( const std::string & name, size_t chan = 0 ) = 0; - - /*! - * Set the IF gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available IF gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_if_gain( double gain, size_t chan = 0 ) { return 0; } - - /*! - * Set the BB gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available BB gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_bb_gain( double gain, size_t chan = 0 ) { return 0; } - - /*! - * Get the available antennas of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return a vector of strings containing the names of available antennas - */ - virtual std::vector< std::string > get_antennas( size_t chan = 0 ) = 0; - - /*! - * Select the active antenna of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual antenna's name - */ - virtual std::string set_antenna( const std::string & antenna, - size_t chan = 0 ) = 0; - - /*! - * Get the actual underlying radio hardware antenna setting. - * \param chan the channel index 0 to N-1 - * \return the actual antenna's name - */ - virtual std::string get_antenna( size_t chan = 0 ) = 0; - - /*! - * Set the TX frontend DC offset value. - * The value is complex to control both I and Q. - * - * \param offset the dc offset (1.0 is full-scale) - * \param chan the channel index 0 to N-1 - */ - virtual void set_dc_offset( const std::complex<double> &offset, size_t chan = 0 ) { } - - /*! - * Set the TX frontend IQ balance correction. - * Use this to adjust the magnitude and phase of I and Q. - * - * \param balance the complex correction value - * \param chan the channel index 0 to N-1 - */ - virtual void set_iq_balance( const std::complex<double> &balance, size_t chan = 0 ) { } - - /*! - * Set the bandpass filter on the radio frontend. - * \param bandwidth the filter bandwidth in Hz, set to 0 for automatic selection - * \param chan the channel index 0 to N-1 - * \return the actual filter bandwidth in Hz - */ - virtual double set_bandwidth( double bandwidth, size_t chan = 0 ) { return 0; } - - /*! - * Get the actual bandpass filter setting on the radio frontend. - * \param chan the channel index 0 to N-1 - * \return the actual filter bandwidth in Hz - */ - virtual double get_bandwidth( size_t chan = 0 ) { return 0; } - - /*! - * Get the possible bandpass filter settings on the radio frontend. - * \param chan the channel index 0 to N-1 - * \return a range of bandwidths in Hz - */ - virtual osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ) - { return osmosdr::freq_range_t(); } - - /*! - * Set the time source for the device. - * This sets the method of time synchronization, - * typically a pulse per second or an encoded time. - * Typical options for source: external, MIMO. - * \param source a string representing the time source - * \param mboard which motherboard to set the config - */ - virtual void set_time_source(const std::string &source, - const size_t mboard = 0) { } - - /*! - * Get the currently set time source. - * \param mboard which motherboard to get the config - * \return the string representing the time source - */ - virtual std::string get_time_source(const size_t mboard) { return ""; } - - /*! - * Get a list of possible time sources. - * \param mboard which motherboard to get the list - * \return a vector of strings for possible settings - */ - virtual std::vector<std::string> get_time_sources(const size_t mboard) - { - return std::vector<std::string>(); - } - - /*! - * Set the clock source for the device. - * This sets the source for a 10 Mhz reference clock. - * Typical options for source: internal, external, MIMO. - * \param source a string representing the clock source - * \param mboard which motherboard to set the config - */ - virtual void set_clock_source(const std::string &source, - const size_t mboard = 0) { } - - /*! - * Get the currently set clock source. - * \param mboard which motherboard to get the config - * \return the string representing the clock source - */ - virtual std::string get_clock_source(const size_t mboard) { return ""; } - - /*! - * Get a list of possible clock sources. - * \param mboard which motherboard to get the list - * \return a vector of strings for possible settings - */ - virtual std::vector<std::string> get_clock_sources(const size_t mboard) - { - return std::vector<std::string>(); - } - - /*! - * Get the master clock rate. - * \param mboard the motherboard index 0 to M-1 - * \return the clock rate in Hz - */ - virtual double get_clock_rate(size_t mboard = 0) { return 0; } - - /*! - * Set the master clock rate. - * \param rate the new rate in Hz - * \param mboard the motherboard index 0 to M-1 - */ - virtual void set_clock_rate(double rate, size_t mboard = 0) { } - - /*! - * Get the current time registers. - * \param mboard the motherboard index 0 to M-1 - * \return the current device time - */ - virtual ::osmosdr::time_spec_t get_time_now(size_t mboard = 0) - { - return ::osmosdr::time_spec_t::get_system_time(); - } - - /*! - * Get the time when the last pps pulse occured. - * \param mboard the motherboard index 0 to M-1 - * \return the current device time - */ - virtual ::osmosdr::time_spec_t get_time_last_pps(size_t mboard = 0) - { - return ::osmosdr::time_spec_t::get_system_time(); - } - - /*! - * Sets the time registers immediately. - * \param time_spec the new time - * \param mboard the motherboard index 0 to M-1 - */ - virtual void set_time_now(const ::osmosdr::time_spec_t &time_spec, - size_t mboard = 0) { } - - /*! - * Set the time registers at the next pps. - * \param time_spec the new time - */ - virtual void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec) { } - - /*! - * Sync the time registers with an unknown pps edge. - * \param time_spec the new time - */ - virtual void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec) { } }; #endif // OSMOSDR_SINK_IFACE_H diff --git a/lib/sink_impl.cc b/lib/sink_impl.cc index 877b31f..1218425 100644 --- a/lib/sink_impl.cc +++ b/lib/sink_impl.cc @@ -72,11 +72,14 @@ sink_impl::sink_impl( const std::string &args ) : gr::hier_block2 ("sink_impl", args_to_io_signature(args), gr::io_signature::make(0, 0, 0)), - _sample_rate(NAN) + _manager(make_dev_manager(to_hier_block2())) { size_t channel = 0; bool device_specified = false; + message_port_register_hier_in( osmosdr::CMD_PORT ); + msg_connect( self(), osmosdr::CMD_PORT, _manager, osmosdr::CMD_PORT ); + std::vector< std::string > arg_list = args_to_vector(args); std::vector< std::string > dev_types; @@ -216,465 +219,214 @@ sink_impl::sink_impl( const std::string &args ) } #endif - if ( iface != NULL && long(block.get()) != 0 ) { - _devs.push_back( iface ); - - for (size_t i = 0; i < iface->get_num_channels(); i++) { - connect(self(), channel++, block, i); - } - } else if ( (iface != NULL) || (long(block.get()) != 0) ) - throw std::runtime_error("Either iface or block are NULL."); - + _manager->add_device( block, iface ); } - if (!_devs.size()) + if (!_manager->get_num_mboards()) throw std::runtime_error("No devices specified via device arguments."); } size_t sink_impl::get_num_channels() { - size_t channels = 0; - - BOOST_FOREACH( sink_iface *dev, _devs ) - channels += dev->get_num_channels(); - - return channels; + return _manager->get_num_channels(); } -#define NO_DEVICES_MSG "FATAL: No device(s) available to work with." - osmosdr::meta_range_t sink_impl::get_sample_rates() { - if ( ! _devs.empty() ) - return _devs[0]->get_sample_rates(); // assume same devices used in the group -#if 0 - else - throw std::runtime_error(NO_DEVICES_MSG); -#endif - return osmosdr::meta_range_t(); + return _manager->get_sample_rates(); } -double sink_impl::set_sample_rate(double rate) +double sink_impl::set_sample_rate( double rate ) { - double sample_rate = 0; - - if (_sample_rate != rate) { -#if 0 - if (_devs.empty()) - throw std::runtime_error(NO_DEVICES_MSG); -#endif - BOOST_FOREACH( sink_iface *dev, _devs ) - sample_rate = dev->set_sample_rate(rate); - - _sample_rate = sample_rate; - } - - return sample_rate; + return _manager->set_sample_rate( rate ); } double sink_impl::get_sample_rate() { - double sample_rate = 0; - - if (!_devs.empty()) - sample_rate = _devs[0]->get_sample_rate(); // assume same devices used in the group -#if 0 - else - throw std::runtime_error(NO_DEVICES_MSG); -#endif - return sample_rate; + return _manager->get_sample_rate(); } osmosdr::freq_range_t sink_impl::get_freq_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_freq_range( dev_chan ); - - return osmosdr::freq_range_t(); + return _manager->get_freq_range( chan ); } double sink_impl::set_center_freq( double freq, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _center_freq[ chan ] != freq ) { - _center_freq[ chan ] = freq; - return dev->set_center_freq( freq, dev_chan ); - } else { return _center_freq[ chan ]; } - } - - return 0; + return _manager->set_center_freq( freq, chan ); } double sink_impl::get_center_freq( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_center_freq( dev_chan ); - - return 0; + return _manager->get_center_freq( chan ); } double sink_impl::set_freq_corr( double ppm, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _freq_corr[ chan ] != ppm ) { - _freq_corr[ chan ] = ppm; - return dev->set_freq_corr( ppm, dev_chan ); - } else { return _freq_corr[ chan ]; } - } - - return 0; + return _manager->set_freq_corr( ppm, chan ); } double sink_impl::get_freq_corr( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_freq_corr( dev_chan ); - - return 0; + return _manager->get_freq_corr( chan ); } std::vector<std::string> sink_impl::get_gain_names( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_names( dev_chan ); - - return std::vector< std::string >(); + return _manager->get_gain_names( chan ); } osmosdr::gain_range_t sink_impl::get_gain_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_range( dev_chan ); - - return osmosdr::gain_range_t(); + return _manager->get_gain_range( chan ); } osmosdr::gain_range_t sink_impl::get_gain_range( const std::string & name, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_range( name, dev_chan ); - - return osmosdr::gain_range_t(); + return _manager->get_gain_range( name, chan ); } bool sink_impl::set_gain_mode( bool automatic, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _gain_mode[ chan ] != automatic ) { - _gain_mode[ chan ] = automatic; - bool mode = dev->set_gain_mode( automatic, dev_chan ); - if (!automatic) // reapply gain value when switched to manual mode - dev->set_gain( _gain[ chan ], dev_chan ); - return mode; - } else { return _gain_mode[ chan ]; } - } - - return false; + return _manager->set_gain_mode( automatic, chan ); } bool sink_impl::get_gain_mode( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_mode( dev_chan ); - - return false; + return _manager->get_gain_mode( chan ); } double sink_impl::set_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _gain[ chan ] != gain ) { - _gain[ chan ] = gain; - return dev->set_gain( gain, dev_chan ); - } else { return _gain[ chan ]; } - } - - return 0; + return _manager->set_gain( gain, chan ); } double sink_impl::set_gain( double gain, const std::string & name, size_t chan) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->set_gain( gain, name, dev_chan ); - - return 0; + return _manager->set_gain( gain, name, chan ); } double sink_impl::get_gain( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain( dev_chan ); - - return 0; + return _manager->get_gain( chan ); } double sink_impl::get_gain( const std::string & name, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain( name, dev_chan ); - - return 0; + return _manager->get_gain( name, chan ); } double sink_impl::set_if_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _if_gain[ chan ] != gain ) { - _if_gain[ chan ] = gain; - return dev->set_if_gain( gain, dev_chan ); - } else { return _if_gain[ chan ]; } - } - - return 0; + return _manager->set_if_gain( gain, chan ); } double sink_impl::set_bb_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _bb_gain[ chan ] != gain ) { - _bb_gain[ chan ] = gain; - return dev->set_bb_gain( gain, dev_chan ); - } else { return _bb_gain[ chan ]; } - } - - return 0; + return _manager->set_bb_gain( gain, chan ); } std::vector< std::string > sink_impl::get_antennas( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_antennas( dev_chan ); - - return std::vector< std::string >(); + return _manager->get_antennas( chan ); } std::string sink_impl::set_antenna( const std::string & antenna, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _antenna[ chan ] != antenna ) { - _antenna[ chan ] = antenna; - return dev->set_antenna( antenna, dev_chan ); - } else { return _antenna[ chan ]; } - } - - return ""; + return _manager->set_antenna( antenna, chan ); } std::string sink_impl::get_antenna( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_antenna( dev_chan ); - - return ""; + return _manager->get_antenna( chan ); } void sink_impl::set_dc_offset( const std::complex<double> &offset, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - dev->set_dc_offset( offset, dev_chan ); + _manager->set_dc_offset( offset, chan ); } void sink_impl::set_iq_balance( const std::complex<double> &balance, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - dev->set_iq_balance( balance, dev_chan ); + _manager->set_iq_balance( balance, chan ); } double sink_impl::set_bandwidth( double bandwidth, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _bandwidth[ chan ] != bandwidth || 0.0f == bandwidth ) { - _bandwidth[ chan ] = bandwidth; - return dev->set_bandwidth( bandwidth, dev_chan ); - } else { return _bandwidth[ chan ]; } - } - - return 0; + return _manager->set_bandwidth( bandwidth, chan ); } double sink_impl::get_bandwidth( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_bandwidth( dev_chan ); - - return 0; + return _manager->get_bandwidth( chan ); } osmosdr::freq_range_t sink_impl::get_bandwidth_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( sink_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_bandwidth_range( dev_chan ); - - return osmosdr::freq_range_t(); + return _manager->get_bandwidth_range( chan ); } -void sink_impl::set_time_source(const std::string &source, const size_t mboard) +void sink_impl::set_time_source( const std::string &source, const size_t mboard ) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_time_source( source ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_time_source( source, osmosdr::ALL_MBOARDS ); - } + return _manager->set_time_source( source, mboard ); } -std::string sink_impl::get_time_source(const size_t mboard) +std::string sink_impl::get_time_source( const size_t mboard ) { - return _devs.at(mboard)->get_time_source( mboard ); + return _manager->get_time_source( mboard ); } -std::vector<std::string> sink_impl::get_time_sources(const size_t mboard) +std::vector<std::string> sink_impl::get_time_sources( const size_t mboard ) { - return _devs.at(mboard)->get_time_sources( mboard ); + return _manager->get_time_sources( mboard ); } -void sink_impl::set_clock_source(const std::string &source, const size_t mboard) +void sink_impl::set_clock_source( const std::string &source, const size_t mboard ) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_clock_source( source ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_clock_source( source, osmosdr::ALL_MBOARDS ); - } + return _manager->set_clock_source( source, mboard ); } -std::string sink_impl::get_clock_source(const size_t mboard) +std::string sink_impl::get_clock_source( const size_t mboard ) { - return _devs.at(mboard)->get_clock_source( mboard ); + return _manager->get_clock_source( mboard ); } -std::vector<std::string> sink_impl::get_clock_sources(const size_t mboard) +std::vector<std::string> sink_impl::get_clock_sources( const size_t mboard ) { - return _devs.at(mboard)->get_clock_sources( mboard ); + return _manager->get_clock_sources( mboard ); } -double sink_impl::get_clock_rate(size_t mboard) +double sink_impl::get_clock_rate( size_t mboard ) { - return _devs.at(mboard)->get_clock_rate( mboard ); + return _manager->get_clock_rate( mboard ); } -void sink_impl::set_clock_rate(double rate, size_t mboard) +void sink_impl::set_clock_rate( double rate, size_t mboard ) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_clock_rate( rate ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_clock_rate( rate, osmosdr::ALL_MBOARDS ); - } + return _manager->set_clock_rate( rate, mboard ); } -osmosdr::time_spec_t sink_impl::get_time_now(size_t mboard) +osmosdr::time_spec_t sink_impl::get_time_now( size_t mboard ) { - return _devs.at(mboard)->get_time_now( mboard ); + return _manager->get_time_now( mboard ); } -osmosdr::time_spec_t sink_impl::get_time_last_pps(size_t mboard) +osmosdr::time_spec_t sink_impl::get_time_last_pps( size_t mboard ) { - return _devs.at(mboard)->get_time_last_pps( mboard ); + return _manager->get_time_last_pps( mboard ); } -void sink_impl::set_time_now(const osmosdr::time_spec_t &time_spec, size_t mboard) +void sink_impl::set_time_now( const osmosdr::time_spec_t &time_spec, size_t mboard ) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_time_now( time_spec ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_time_now( time_spec, osmosdr::ALL_MBOARDS ); - } + return _manager->set_time_now( time_spec, mboard ); } -void sink_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) +void sink_impl::set_time_next_pps( const osmosdr::time_spec_t &time_spec ) { - BOOST_FOREACH( sink_iface *dev, _devs ) - { - dev->set_time_next_pps( time_spec ); - } + return _manager->set_time_next_pps( time_spec ); } -void sink_impl::set_time_unknown_pps(const osmosdr::time_spec_t &time_spec) +void sink_impl::set_time_unknown_pps( const osmosdr::time_spec_t &time_spec ) { - BOOST_FOREACH( sink_iface *dev, _devs ) - { - dev->set_time_unknown_pps( time_spec ); - } + return _manager->set_time_unknown_pps( time_spec ); } diff --git a/lib/sink_impl.h b/lib/sink_impl.h index 1642669..a4589b5 100644 --- a/lib/sink_impl.h +++ b/lib/sink_impl.h @@ -22,7 +22,7 @@ #include "osmosdr/sink.h" -#include "sink_iface.h" +#include "dev_manager.h" #include <map> @@ -83,18 +83,7 @@ public: void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec); private: - std::vector< sink_iface * > _devs; - - /* cache to prevent multiple device calls with the same value coming from grc */ - double _sample_rate; - std::map< size_t, double > _center_freq; - std::map< size_t, double > _freq_corr; - std::map< size_t, bool > _gain_mode; - std::map< size_t, double > _gain; - std::map< size_t, double > _if_gain; - std::map< size_t, double > _bb_gain; - std::map< size_t, std::string > _antenna; - std::map< size_t, double > _bandwidth; + dev_manager_sptr _manager; }; #endif /* INCLUDED_OSMOSDR_SINK_IMPL_H */ diff --git a/lib/source_iface.h b/lib/source_iface.h index abb70eb..ff0149f 100644 --- a/lib/source_iface.h +++ b/lib/source_iface.h @@ -25,20 +25,16 @@ #include <osmosdr/time_spec.h> #include <gnuradio/basic_block.h> +#include "common_iface.h" + /*! * TODO: document * */ -class source_iface +class source_iface : public common_iface { public: /*! - * Get the number of channels the underlying radio hardware offers. - * \return the number of available channels - */ - virtual size_t get_num_channels( void ) = 0; - - /*! * \brief seek file to \p seek_point relative to \p whence * * \param seek_point sample offset in file @@ -48,182 +44,6 @@ public: virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; } /*! - * Get the possible sample rates for the underlying radio hardware. - * \return a range of rates in Sps - */ - virtual osmosdr::meta_range_t get_sample_rates( void ) = 0; - - /*! - * Set the sample rate for the underlying radio hardware. - * This also will select the appropriate IF bandpass, if applicable. - * \param rate a new rate in Sps - */ - virtual double set_sample_rate( double rate ) = 0; - - /*! - * Get the sample rate for the underlying radio hardware. - * This is the actual sample rate and may differ from the rate set. - * \return the actual rate in Sps - */ - virtual double get_sample_rate( void ) = 0; - - /*! - * Get the tunable frequency range for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the frequency range in Hz - */ - virtual osmosdr::freq_range_t get_freq_range( size_t chan = 0 ) = 0; - - /*! - * Tune the underlying radio hardware to the desired center frequency. - * This also will select the appropriate RF bandpass. - * \param freq the desired frequency in Hz - * \param chan the channel index 0 to N-1 - * \return the actual frequency in Hz - */ - virtual double set_center_freq( double freq, size_t chan = 0 ) = 0; - - /*! - * Get the center frequency the underlying radio hardware is tuned to. - * This is the actual frequency and may differ from the frequency set. - * \param chan the channel index 0 to N-1 - * \return the frequency in Hz - */ - virtual double get_center_freq( size_t chan = 0 ) = 0; - - /*! - * Set the frequency correction value in parts per million. - * \param ppm the desired correction value in parts per million - * \param chan the channel index 0 to N-1 - * \return correction value in parts per million - */ - virtual double set_freq_corr( double ppm, size_t chan = 0 ) = 0; - - /*! - * Get the frequency correction value. - * \param chan the channel index 0 to N-1 - * \return correction value in parts per million - */ - virtual double get_freq_corr( size_t chan = 0 ) = 0; - - /*! - * Get the gain stage names of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return a vector of strings containing the names of gain stages - */ - virtual std::vector<std::string> get_gain_names( size_t chan = 0 ) = 0; - - /*! - * Get the settable overall gain range for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the gain range in dB - */ - virtual osmosdr::gain_range_t get_gain_range( size_t chan = 0 ) = 0; - - /*! - * Get the settable gain range for a specific gain stage. - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the gain range in dB - */ - virtual osmosdr::gain_range_t get_gain_range( const std::string & name, - size_t chan = 0 ) = 0; - - /*! - * Set the gain mode for the underlying radio hardware. - * This might be supported only for certain hardware types. - * \param automatic the gain mode (true means automatic gain mode) - * \param chan the channel index 0 to N-1 - * \return the actual gain mode - */ - virtual bool set_gain_mode( bool automatic, size_t chan = 0 ) { return false; } - - /*! - * Get the gain mode selected for the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual gain mode (true means automatic gain mode) - */ - virtual bool get_gain_mode( size_t chan = 0 ) { return false; } - - /*! - * Set the gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_gain( double gain, size_t chan = 0 ) = 0; - - /*! - * Set the named gain on the underlying radio hardware. - * \param gain the gain in dB - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_gain( double gain, - const std::string & name, - size_t chan = 0 ) = 0; - - /*! - * Get the actual gain setting of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double get_gain( size_t chan = 0 ) = 0; - - /*! - * Get the actual gain setting of a named stage. - * \param name the name of the gain stage - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double get_gain( const std::string & name, size_t chan = 0 ) = 0; - - /*! - * Set the IF gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available IF gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_if_gain( double gain, size_t chan = 0 ) { return 0; } - - /*! - * Set the BB gain for the underlying radio hardware. - * This function will automatically distribute the desired gain value over - * available BB gain stages in an appropriate way and return the actual value. - * \param gain the gain in dB - * \param chan the channel index 0 to N-1 - * \return the actual gain in dB - */ - virtual double set_bb_gain( double gain, size_t chan = 0 ) { return 0; } - - /*! - * Get the available antennas of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return a vector of strings containing the names of available antennas - */ - virtual std::vector< std::string > get_antennas( size_t chan = 0 ) = 0; - - /*! - * Select the active antenna of the underlying radio hardware. - * \param chan the channel index 0 to N-1 - * \return the actual antenna's name - */ - virtual std::string set_antenna( const std::string & antenna, - size_t chan = 0 ) = 0; - - /*! - * Get the actual underlying radio hardware antenna setting. - * \param chan the channel index 0 to N-1 - * \return the actual antenna's name - */ - virtual std::string get_antenna( size_t chan = 0 ) = 0; - - /*! * Set the RX frontend DC correction mode. * The automatic correction subtracts out the long-run average. * @@ -238,163 +58,12 @@ public: virtual void set_dc_offset_mode( int mode, size_t chan = 0 ) { } /*! - * Set a constant DC offset value. - * The value is complex to control both I and Q. - * Only set this when automatic correction is disabled. - * - * \param offset the dc offset (1.0 is full-scale) - * \param chan the channel index 0 to N-1 - */ - virtual void set_dc_offset( const std::complex<double> &offset, size_t chan = 0 ) { } - - /*! * Set the RX frontend IQ balance mode. * * \param mode iq balance correction mode: 0 = Off, 1 = Manual, 2 = Automatic * \param chan the channel index 0 to N-1 */ virtual void set_iq_balance_mode( int mode, size_t chan = 0 ) { } - - /*! - * Set the RX frontend IQ balance correction. - * Use this to adjust the magnitude and phase of I and Q. - * - * \param balance the complex correction value - * \param chan the channel index 0 to N-1 - */ - virtual void set_iq_balance( const std::complex<double> &balance, size_t chan = 0 ) { } - - /*! - * Set the bandpass filter on the radio frontend. - * \param bandwidth the filter bandwidth in Hz, set to 0 for automatic selection - * \param chan the channel index 0 to N-1 - * \return the actual filter bandwidth in Hz - */ - virtual double set_bandwidth( double bandwidth, size_t chan = 0 ) { return 0; } - - /*! - * Get the actual bandpass filter setting on the radio frontend. - * \param chan the channel index 0 to N-1 - * \return the actual filter bandwidth in Hz - */ - virtual double get_bandwidth( size_t chan = 0 ) { return 0; } - - /*! - * Get the possible bandpass filter settings on the radio frontend. - * \param chan the channel index 0 to N-1 - * \return a range of bandwidths in Hz - */ - virtual osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ) - { return osmosdr::freq_range_t(); } - - /*! - * Set the time source for the device. - * This sets the method of time synchronization, - * typically a pulse per second or an encoded time. - * Typical options for source: external, MIMO. - * \param source a string representing the time source - * \param mboard which motherboard to set the config - */ - virtual void set_time_source(const std::string &source, - const size_t mboard = 0) { } - - /*! - * Get the currently set time source. - * \param mboard which motherboard to get the config - * \return the string representing the time source - */ - virtual std::string get_time_source(const size_t mboard) { return ""; } - - /*! - * Get a list of possible time sources. - * \param mboard which motherboard to get the list - * \return a vector of strings for possible settings - */ - virtual std::vector<std::string> get_time_sources(const size_t mboard) - { - return std::vector<std::string>(); - } - - /*! - * Set the clock source for the device. - * This sets the source for a 10 Mhz reference clock. - * Typical options for source: internal, external, MIMO. - * \param source a string representing the clock source - * \param mboard which motherboard to set the config - */ - virtual void set_clock_source(const std::string &source, - const size_t mboard = 0) { } - - /*! - * Get the currently set clock source. - * \param mboard which motherboard to get the config - * \return the string representing the clock source - */ - virtual std::string get_clock_source(const size_t mboard) { return ""; } - - /*! - * Get a list of possible clock sources. - * \param mboard which motherboard to get the list - * \return a vector of strings for possible settings - */ - virtual std::vector<std::string> get_clock_sources(const size_t mboard) - { - return std::vector<std::string>(); - } - - /*! - * Get the master clock rate. - * \param mboard the motherboard index 0 to M-1 - * \return the clock rate in Hz - */ - virtual double get_clock_rate(size_t mboard = 0) { return 0; } - - /*! - * Set the master clock rate. - * \param rate the new rate in Hz - * \param mboard the motherboard index 0 to M-1 - */ - virtual void set_clock_rate(double rate, size_t mboard = 0) { } - - /*! - * Get the current time registers. - * \param mboard the motherboard index 0 to M-1 - * \return the current device time - */ - virtual ::osmosdr::time_spec_t get_time_now(size_t mboard = 0) - { - return ::osmosdr::time_spec_t::get_system_time(); - } - - /*! - * Get the time when the last pps pulse occured. - * \param mboard the motherboard index 0 to M-1 - * \return the current device time - */ - virtual ::osmosdr::time_spec_t get_time_last_pps(size_t mboard = 0) - { - return ::osmosdr::time_spec_t::get_system_time(); - } - - /*! - * Sets the time registers immediately. - * \param time_spec the new time - * \param mboard the motherboard index 0 to M-1 - */ - virtual void set_time_now(const ::osmosdr::time_spec_t &time_spec, - size_t mboard = 0) { } - - /*! - * Set the time registers at the next pps. - * \param time_spec the new time - */ - virtual void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec) { } - - /*! - * Sync the time registers with an unknown pps edge. - * \param time_spec the new time - */ - virtual void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec) { } }; #endif // OSMOSDR_SOURCE_IFACE_H diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a8a3cec..f30e773 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -112,11 +112,14 @@ source_impl::source_impl( const std::string &args ) : gr::hier_block2 ("source_impl", gr::io_signature::make(0, 0, 0), args_to_io_signature(args)), - _sample_rate(NAN) + _manager(make_dev_manager(to_hier_block2())) { size_t channel = 0; bool device_specified = false; + message_port_register_hier_in( osmosdr::CMD_PORT ); + msg_connect( self(), osmosdr::CMD_PORT, _manager, osmosdr::CMD_PORT ); + std::vector< std::string > arg_list = args_to_vector(args); std::vector< std::string > dev_types; @@ -376,576 +379,229 @@ source_impl::source_impl( const std::string &args ) } #endif - if ( iface != NULL && long(block.get()) != 0 ) { - _devs.push_back( iface ); - - for (size_t i = 0; i < iface->get_num_channels(); i++) { -#ifdef HAVE_IQBALANCE - gr::iqbalance::optimize_c::sptr iq_opt = gr::iqbalance::optimize_c::make( 0 ); - gr::iqbalance::fix_cc::sptr iq_fix = gr::iqbalance::fix_cc::make(); - - connect(block, i, iq_fix, 0); - connect(iq_fix, 0, self(), channel++); - - connect(block, i, iq_opt, 0); - msg_connect(iq_opt, "iqbal_corr", iq_fix, "iqbal_corr"); - - _iq_opt.push_back( iq_opt.get() ); - _iq_fix.push_back( iq_fix.get() ); -#else - connect(block, i, self(), channel++); -#endif - } - } else if ( (iface != NULL) || (long(block.get()) != 0) ) - throw std::runtime_error("Either iface or block are NULL."); - + _manager->add_device( block, iface ); } - if (!_devs.size()) + if (!_manager->get_num_mboards()) throw std::runtime_error("No devices specified via device arguments."); } size_t source_impl::get_num_channels() { - size_t channels = 0; - - BOOST_FOREACH( source_iface *dev, _devs ) - channels += dev->get_num_channels(); - - return channels; + return _manager->get_num_channels(); } bool source_impl::seek( long seek_point, int whence, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->seek( seek_point, whence, dev_chan ); - - return false; + return _manager->seek( seek_point, whence, chan ); } -#define NO_DEVICES_MSG "FATAL: No device(s) available to work with." - osmosdr::meta_range_t source_impl::get_sample_rates() { - if ( ! _devs.empty() ) - return _devs[0]->get_sample_rates(); // assume same devices used in the group -#if 0 - else - throw std::runtime_error(NO_DEVICES_MSG); -#endif - return osmosdr::meta_range_t();; + return _manager->get_sample_rates(); } -double source_impl::set_sample_rate(double rate) +double source_impl::set_sample_rate( double rate ) { - double sample_rate = 0; - - if (_sample_rate != rate) { -#if 0 - if (_devs.empty()) - throw std::runtime_error(NO_DEVICES_MSG); -#endif - BOOST_FOREACH( source_iface *dev, _devs ) - sample_rate = dev->set_sample_rate(rate); - -#ifdef HAVE_IQBALANCE - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) { - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { - if ( channel < _iq_opt.size() ) { - gr::iqbalance::optimize_c *opt = _iq_opt[channel]; - - if ( opt->period() > 0 ) { /* optimize is enabled */ - opt->set_period( dev->get_sample_rate() / 5 ); - opt->reset(); - } - } - - channel++; - } - } -#endif - - _sample_rate = sample_rate; - } - - return sample_rate; + return _manager->set_sample_rate(rate); } double source_impl::get_sample_rate() { - double sample_rate = 0; - - if (!_devs.empty()) - sample_rate = _devs[0]->get_sample_rate(); // assume same devices used in the group -#if 0 - else - throw std::runtime_error(NO_DEVICES_MSG); -#endif - return sample_rate; + return _manager->get_sample_rate(); } osmosdr::freq_range_t source_impl::get_freq_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_freq_range( dev_chan ); - - return osmosdr::freq_range_t(); + return _manager->get_freq_range( chan ); } double source_impl::set_center_freq( double freq, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _center_freq[ chan ] != freq ) { - _center_freq[ chan ] = freq; - return dev->set_center_freq( freq, dev_chan ); - } else { return _center_freq[ chan ]; } - } - - return 0; + return _manager->set_center_freq( freq, chan ); } double source_impl::get_center_freq( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_center_freq( dev_chan ); - - return 0; + return _manager->get_center_freq( chan ); } double source_impl::set_freq_corr( double ppm, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _freq_corr[ chan ] != ppm ) { - _freq_corr[ chan ] = ppm; - return dev->set_freq_corr( ppm, dev_chan ); - } else { return _freq_corr[ chan ]; } - } - - return 0; + return _manager->set_freq_corr( ppm, chan ); } double source_impl::get_freq_corr( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_freq_corr( dev_chan ); - - return 0; + return _manager->get_freq_corr( chan ); } std::vector<std::string> source_impl::get_gain_names( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_names( dev_chan ); - - return std::vector< std::string >(); + return _manager->get_gain_names( chan ); } osmosdr::gain_range_t source_impl::get_gain_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_range( dev_chan ); - - return osmosdr::gain_range_t(); + return _manager->get_gain_range( chan ); } osmosdr::gain_range_t source_impl::get_gain_range( const std::string & name, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_range( name, dev_chan ); - - return osmosdr::gain_range_t(); + return _manager->get_gain_range( name, chan ); } bool source_impl::set_gain_mode( bool automatic, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _gain_mode[ chan ] != automatic ) { - _gain_mode[ chan ] = automatic; - bool mode = dev->set_gain_mode( automatic, dev_chan ); - if (!automatic) // reapply gain value when switched to manual mode - dev->set_gain( _gain[ chan ], dev_chan ); - return mode; - } else { return _gain_mode[ chan ]; } - } - - return false; + return _manager->set_gain_mode( automatic, chan ); } bool source_impl::get_gain_mode( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain_mode( dev_chan ); - - return false; + return _manager->get_gain_mode( chan ); } double source_impl::set_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _gain[ chan ] != gain ) { - _gain[ chan ] = gain; - return dev->set_gain( gain, dev_chan ); - } else { return _gain[ chan ]; } - } - - return 0; + return _manager->set_gain( gain, chan ); } double source_impl::set_gain( double gain, const std::string & name, size_t chan) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->set_gain( gain, name, dev_chan ); - - return 0; + return _manager->set_gain( gain, name, chan ); } double source_impl::get_gain( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain( dev_chan ); - - return 0; + return _manager->get_gain( chan ); } double source_impl::get_gain( const std::string & name, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_gain( name, dev_chan ); - - return 0; + return _manager->get_gain( name, chan ); } double source_impl::set_if_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _if_gain[ chan ] != gain ) { - _if_gain[ chan ] = gain; - return dev->set_if_gain( gain, dev_chan ); - } else { return _if_gain[ chan ]; } - } - - return 0; + return _manager->set_if_gain( gain, chan ); } double source_impl::set_bb_gain( double gain, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _bb_gain[ chan ] != gain ) { - _bb_gain[ chan ] = gain; - return dev->set_bb_gain( gain, dev_chan ); - } else { return _bb_gain[ chan ]; } - } - - return 0; + return _manager->set_bb_gain( gain, chan ); } std::vector< std::string > source_impl::get_antennas( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_antennas( dev_chan ); - - return std::vector< std::string >(); + return _manager->get_antennas( chan ); } std::string source_impl::set_antenna( const std::string & antenna, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _antenna[ chan ] != antenna ) { - _antenna[ chan ] = antenna; - return dev->set_antenna( antenna, dev_chan ); - } else { return _antenna[ chan ]; } - } - - return ""; + return _manager->set_antenna( antenna, chan ); } std::string source_impl::get_antenna( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_antenna( dev_chan ); - - return ""; + return _manager->get_antenna( chan ); } void source_impl::set_dc_offset_mode( int mode, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - dev->set_dc_offset_mode( mode, dev_chan ); + _manager->set_dc_offset_mode( mode, chan ); } void source_impl::set_dc_offset( const std::complex<double> &offset, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - dev->set_dc_offset( offset, dev_chan ); + _manager->set_dc_offset( offset, chan ); } void source_impl::set_iq_balance_mode( int mode, size_t chan ) { - size_t channel = 0; -#ifdef HAVE_IQBALANCE - BOOST_FOREACH( source_iface *dev, _devs ) { - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { - if ( chan == channel++ ) { - if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { - gr::iqbalance::optimize_c *opt = _iq_opt[chan]; - gr::iqbalance::fix_cc *fix = _iq_fix[chan]; - - if ( IQBalanceOff == mode ) { - opt->set_period( 0 ); - /* store current values in order to be able to restore them later */ - _vals[ chan ] = std::pair< float, float >( fix->mag(), fix->phase() ); - fix->set_mag( 0.0f ); - fix->set_phase( 0.0f ); - } else if ( IQBalanceManual == mode ) { - if ( opt->period() == 0 ) { /* transition from Off to Manual */ - /* restore previous values */ - std::pair< float, float > val = _vals[ chan ]; - fix->set_mag( val.first ); - fix->set_phase( val.second ); - } - opt->set_period( 0 ); - } else if ( IQBalanceAutomatic == mode ) { - opt->set_period( dev->get_sample_rate() / 5 ); - opt->reset(); - } - } - } - } - } -#else - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->set_iq_balance_mode( mode, dev_chan ); -#endif + _manager->set_iq_balance_mode( mode, chan ); } void source_impl::set_iq_balance( const std::complex<double> &balance, size_t chan ) { - size_t channel = 0; -#ifdef HAVE_IQBALANCE - BOOST_FOREACH( source_iface *dev, _devs ) { - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) { - if ( chan == channel++ ) { - if ( chan < _iq_opt.size() && chan < _iq_fix.size() ) { - gr::iqbalance::optimize_c *opt = _iq_opt[chan]; - gr::iqbalance::fix_cc *fix = _iq_fix[chan]; - - if ( opt->period() == 0 ) { /* automatic optimization desabled */ - fix->set_mag( balance.real() ); - fix->set_phase( balance.imag() ); - } - } - } - } - } -#else - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->set_iq_balance( balance, dev_chan ); -#endif + _manager->set_iq_balance( balance, chan ); } double source_impl::set_bandwidth( double bandwidth, size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) { - if ( _bandwidth[ chan ] != bandwidth || 0.0f == bandwidth ) { - _bandwidth[ chan ] = bandwidth; - return dev->set_bandwidth( bandwidth, dev_chan ); - } else { return _bandwidth[ chan ]; } - } - - return 0; + return _manager->set_bandwidth( bandwidth, chan ); } double source_impl::get_bandwidth( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_bandwidth( dev_chan ); - - return 0; + return _manager->get_bandwidth( chan ); } osmosdr::freq_range_t source_impl::get_bandwidth_range( size_t chan ) { - size_t channel = 0; - BOOST_FOREACH( source_iface *dev, _devs ) - for (size_t dev_chan = 0; dev_chan < dev->get_num_channels(); dev_chan++) - if ( chan == channel++ ) - return dev->get_bandwidth_range( dev_chan ); - - return osmosdr::freq_range_t(); + return _manager->get_bandwidth_range( chan ); } void source_impl::set_time_source(const std::string &source, const size_t mboard) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_time_source( source ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_time_source( source, osmosdr::ALL_MBOARDS ); - } + return _manager->set_time_source( source, mboard ); } std::string source_impl::get_time_source(const size_t mboard) { - return _devs.at(mboard)->get_time_source( mboard ); + return _manager->get_time_source( mboard ); } std::vector<std::string> source_impl::get_time_sources(const size_t mboard) { - return _devs.at(mboard)->get_time_sources( mboard ); + return _manager->get_time_sources( mboard ); } void source_impl::set_clock_source(const std::string &source, const size_t mboard) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_clock_source( source ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_clock_source( source, osmosdr::ALL_MBOARDS ); - } + return _manager->set_clock_source( source, mboard ); } std::string source_impl::get_clock_source(const size_t mboard) { - return _devs.at(mboard)->get_clock_source( mboard ); + return _manager->get_clock_source( mboard ); } std::vector<std::string> source_impl::get_clock_sources(const size_t mboard) { - return _devs.at(mboard)->get_clock_sources( mboard ); + return _manager->get_clock_sources( mboard ); } double source_impl::get_clock_rate(size_t mboard) { - return _devs.at(mboard)->get_clock_rate( mboard ); + return _manager->get_clock_rate( mboard ); } void source_impl::set_clock_rate(double rate, size_t mboard) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_clock_rate( rate ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_clock_rate( rate, osmosdr::ALL_MBOARDS ); - } + return _manager->set_clock_rate( rate, mboard ); } osmosdr::time_spec_t source_impl::get_time_now(size_t mboard) { - return _devs.at(mboard)->get_time_now( mboard ); + return _manager->get_time_now( mboard ); } osmosdr::time_spec_t source_impl::get_time_last_pps(size_t mboard) { - return _devs.at(mboard)->get_time_last_pps( mboard ); + return _manager->get_time_last_pps( mboard ); } void source_impl::set_time_now(const osmosdr::time_spec_t &time_spec, size_t mboard) { - if (mboard != osmosdr::ALL_MBOARDS){ - _devs.at(mboard)->set_time_now( time_spec ); - return; - } - - for (size_t m = 0; m < _devs.size(); m++){ /* propagate ALL_MBOARDS */ - _devs.at(m)->set_time_now( time_spec, osmosdr::ALL_MBOARDS ); - } + return _manager->set_time_now( time_spec, mboard ); } void source_impl::set_time_next_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( source_iface *dev, _devs ) - { - dev->set_time_next_pps( time_spec ); - } + return _manager->set_time_next_pps( time_spec ); } void source_impl::set_time_unknown_pps(const osmosdr::time_spec_t &time_spec) { - BOOST_FOREACH( source_iface *dev, _devs ) - { - dev->set_time_unknown_pps( time_spec ); - } + return _manager->set_time_unknown_pps( time_spec ); } diff --git a/lib/source_impl.h b/lib/source_impl.h index 4b65125..238bc6c 100644 --- a/lib/source_impl.h +++ b/lib/source_impl.h @@ -27,7 +27,7 @@ #include <gnuradio/iqbalance/fix_cc.h> #endif -#include <source_iface.h> +#include "dev_manager.h" #include <map> @@ -92,23 +92,7 @@ public: void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec); private: - std::vector< source_iface * > _devs; - - /* cache to prevent multiple device calls with the same value coming from grc */ - double _sample_rate; - std::map< size_t, double > _center_freq; - std::map< size_t, double > _freq_corr; - std::map< size_t, bool > _gain_mode; - std::map< size_t, double > _gain; - std::map< size_t, double > _if_gain; - std::map< size_t, double > _bb_gain; - std::map< size_t, std::string > _antenna; -#ifdef HAVE_IQBALANCE - std::vector< gr::iqbalance::fix_cc * > _iq_fix; - std::vector< gr::iqbalance::optimize_c * > _iq_opt; - std::map< size_t, std::pair<float, float> > _vals; -#endif - std::map< size_t, double > _bandwidth; + dev_manager_sptr _manager; }; #endif /* INCLUDED_OSMOSDR_SOURCE_IMPL_H */ diff --git a/lib/uhd/uhd_sink_c.cc b/lib/uhd/uhd_sink_c.cc index a154556..fdac2a6 100644 --- a/lib/uhd/uhd_sink_c.cc +++ b/lib/uhd/uhd_sink_c.cc @@ -24,6 +24,8 @@ //#include <uhd/property_tree.hpp> +#include <osmosdr/messages.h> + #include "arg_helpers.h" #include "uhd_sink_c.h" @@ -124,6 +126,9 @@ uhd_sink_c::uhd_sink_c(const std::string &args) : #endif for ( size_t i = 0; i < nchan; i++ ) connect( self(), i, _snk, i ); + + message_port_register_hier_in( osmosdr::CMD_PORT ); + msg_connect( self(), osmosdr::CMD_PORT, _snk, osmosdr::CMD_PORT ); } uhd_sink_c::~uhd_sink_c() diff --git a/lib/uhd/uhd_source_c.cc b/lib/uhd/uhd_source_c.cc index fc13017..98fd5f1 100644 --- a/lib/uhd/uhd_source_c.cc +++ b/lib/uhd/uhd_source_c.cc @@ -24,6 +24,8 @@ //#include <uhd/property_tree.hpp> +#include <osmosdr/messages.h> + #include "arg_helpers.h" #include "uhd_source_c.h" @@ -125,6 +127,9 @@ uhd_source_c::uhd_source_c(const std::string &args) : #endif for ( size_t i = 0; i < nchan; i++ ) connect( _src, i, self(), i ); + + message_port_register_hier_in( osmosdr::CMD_PORT ); + msg_connect( self(), osmosdr::CMD_PORT, _src, osmosdr::CMD_PORT ); } uhd_source_c::~uhd_source_c() -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] rtl-sdr/lib: UPDATE Manually releasing async buffers

by Karl Semich

Small API added to allow sample buffers to be used after the lifetime of the callback, and manually returned to librtlsdr. Allows multithreaded apps to track USB buffer buildup without requiring memcpy() be called in the callback. This update includes a fix to handle unsubmitted buffers on cancel. --- include/rtl-sdr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/librtlsdr.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/include/rtl-sdr.h b/include/rtl-sdr.h index 3ed13ae..1ef508d 100644 --- a/include/rtl-sdr.h +++ b/include/rtl-sdr.h @@ -331,6 +331,7 @@ RTLSDR_API int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on); */ RTLSDR_API int rtlsdr_get_offset_tuning(rtlsdr_dev_t *dev); + /* streaming functions */ RTLSDR_API int rtlsdr_reset_buffer(rtlsdr_dev_t *dev); @@ -381,6 +382,55 @@ RTLSDR_API int rtlsdr_read_async(rtlsdr_dev_t *dev, RTLSDR_API int rtlsdr_cancel_async(rtlsdr_dev_t *dev); /*! + * Enable or disable automatic resubmission of async transfer buffers. + * By default this is enabled, but if disabled then buffers will not + * be refilled with data until passed to rtlsdr_release_manual(). + * + * This allows applications to track buildup of streaming buffers + * by returning from the callback quickly, without requiring an + * extra memcpy to take the data out of the callback for processing. + * + * \param dev the device handle given by rtlsdr_open() + * \param on 0 means disabled, 1 enabled + * \return 0 on success + */ +RTLSDR_API int rtlsdr_set_automatic_release(rtlsdr_dev_t *dev, int on); + +/*! +* When automatic releases are disabled, release a long-lived buffer that +* was passed to an async callback. Such buffers will not be reused until +* released. +* +* There must be enough released buffers submitted to libusb at all times +* to accommodate driver and hardware communication latency. The total +* number of buffers filling this role, and the total number of buffers +* unreleased, can be calculated: +* +* buf_num = value passed to rtlsdr_read_async at stream start +* callback_calls = number of times a buf has been passed to callback +* buf_releases = number of successful calls to rtlsdr_release_manual() +* +* bufs_reserved = callback_calls - buf_releases +* bufs_in_flight = buf_num - bufs_reserved +* +* Note that this calculation assumes that all reserved buffers have been +* passed to the callback already. It is only useful if the callback +* returns very quickly every time. If the callback waits, buffers +* may accumulate in the waiting time, and only be found when it returns. +* +* Once bufs_in_flight falls too low, the integrity of the stream is +* compromised as the device rewrites over its full buffer. The cutoff +* for this depends on latency in the operating system and hardware. +* +* Once bufs_in_flight hits zero, streaming will stop completely. +* +* \param dev the device handle given by rtlsdr_open() +* \param buf a pointer to the start of the buffer +* \return 0 on success +*/ +RTLSDR_API int rtlsdr_release_manual(rtlsdr_dev_t *dev, unsigned char *buf); + +/*! * Enable or disable the bias tee on GPIO PIN 0. * * \param dev the device handle given by rtlsdr_open() diff --git a/src/librtlsdr.c b/src/librtlsdr.c index 433ed5b..e093ed7 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -103,6 +103,7 @@ struct rtlsdr_dev { void *cb_ctx; enum rtlsdr_async_status async_status; int async_cancel; + int manual_release; int use_zerocopy; /* rtl demod context */ uint32_t rate; /* Hz */ @@ -1702,7 +1703,8 @@ static void LIBUSB_CALL _libusb_callback(struct libusb_transfer *xfer) if (dev->cb) dev->cb(xfer->buffer, xfer->actual_length, dev->cb_ctx); - libusb_submit_transfer(xfer); /* resubmit transfer */ + if (!dev->manual_release) + libusb_submit_transfer(xfer); /* resubmit transfer */ dev->xfer_errors = 0; } else if (LIBUSB_TRANSFER_CANCELLED != xfer->status) { #ifndef _WIN32 @@ -1753,7 +1755,8 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) dev->use_zerocopy = 1; for (i = 0; i < dev->xfer_buf_num; ++i) { - dev->xfer_buf[i] = libusb_dev_mem_alloc(dev->devh, dev->xfer_buf_len); + dev->xfer_buf[i] = libusb_dev_mem_alloc(dev->devh, dev->xfer_buf_len + + sizeof(struct libusb_transfer *)); if (!dev->xfer_buf[i]) { fprintf(stderr, "Failed to allocate zero-copy " @@ -1780,7 +1783,8 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) /* no zero-copy available, allocate buffers in userspace */ if (!dev->use_zerocopy) { for (i = 0; i < dev->xfer_buf_num; ++i) { - dev->xfer_buf[i] = malloc(dev->xfer_buf_len); + dev->xfer_buf[i] = malloc(dev->xfer_buf_len + + sizeof(struct libusb_transfer *)); if (!dev->xfer_buf[i]) return -ENOMEM; @@ -1873,6 +1877,9 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, (void *)dev, BULK_TIMEOUT); + *(struct libusb_transfer **)(dev->xfer_buf[i] + dev->xfer_buf_len) = + dev->xfer[i]; + r = libusb_submit_transfer(dev->xfer[i]); if (r < 0) { fprintf(stderr, "Failed to submit transfer %i\n" @@ -1909,6 +1916,14 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, if (LIBUSB_TRANSFER_CANCELLED != dev->xfer[i]->status) { r = libusb_cancel_transfer(dev->xfer[i]); + if (r == LIBUSB_ERROR_NOT_FOUND) { + /* transfer was not in flight */ + r = 0; + dev->xfer[i]->status = + LIBUSB_TRANSFER_CANCELLED; + continue; + } + /* handle events after canceling * to allow transfer status to * propagate */ @@ -1961,6 +1976,31 @@ int rtlsdr_cancel_async(rtlsdr_dev_t *dev) return -2; } +int rtlsdr_set_automatic_release(rtlsdr_dev_t *dev, int on) +{ + if (!dev) + return -1; + + if (RTLSDR_INACTIVE != dev->async_status) + return -2; + + dev->manual_release = !on; + + return 0; +} + +int rtlsdr_release_manual(rtlsdr_dev_t *dev, unsigned char *buf) +{ + struct libusb_transfer * xfer; + + if (!dev) + return -1; + + xfer = *(struct libusb_transfer **)(buf + dev->xfer_buf_len); + + return libusb_submit_transfer(xfer); +} + uint32_t rtlsdr_get_tuner_clock(void *dev) { uint32_t tuner_freq; -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] rtl-sdr/lib: normalize error return values

by Karl Semich

All library functions updated to return error codes with consistent value and meaning, selected from nine comprehensive conditions inferred from context. Bitwise combinations of return values changed to conditionals, to preserve meaning. --- include/rtl-sdr.h | 20 ++- include/tuner_fc2580.h | 23 +-- src/librtlsdr.c | 374 +++++++++++++++++++++++++---------------- src/tuner_e4k.c | 65 ++++---- src/tuner_fc0012.c | 24 ++- src/tuner_fc0013.c | 47 ++++-- src/tuner_fc2580.c | 445 ++++++++++++++++++++++++++++++------------------- src/tuner_r82xx.c | 29 ++-- 8 files changed, 626 insertions(+), 401 deletions(-) diff --git a/include/rtl-sdr.h b/include/rtl-sdr.h index 3ed13ae..52d67e6 100644 --- a/include/rtl-sdr.h +++ b/include/rtl-sdr.h @@ -24,6 +24,7 @@ extern "C" { #endif +#include <errno.h> #include <stdint.h> #include <rtl-sdr_export.h> @@ -34,6 +35,23 @@ RTLSDR_API uint32_t rtlsdr_get_device_count(void); RTLSDR_API const char* rtlsdr_get_device_name(uint32_t index); /*! + * Error codes. Most functions return 0 on success or one of these + * codes on failure. + */ +enum rtlsdr_error { + RTLSDR_SUCCESS = 0, /* Success (no error) */ + RTLSDR_ERROR_NULL = -1, /* Passed handle is null pointer */ + RTLSDR_ERROR_INVALID = -EINVAL, /* Invalid argument provided */ + RTLSDR_ERROR_NOTFOUND = -3, /* Device was not found */ + RTLSDR_ERROR_SHORT = -4, /* Less data transferred than requested */ + RTLSDR_ERROR_NOOP = -5, /* No action to take */ + RTLSDR_ERROR_DEVTYPE = -6, /* Function not available for device */ + RTLSDR_ERROR_STATE = -7, /* Device in wrong state for call */ + RTLSDR_ERROR_NOMEM = -8, /* Memory allocation failed */ + RTLSDR_ERROR_USB = -9 /* Error returned by libusb */ +}; + +/*! * Get USB device strings. * * NOTE: The string arguments must provide space for up to 256 bytes. @@ -261,7 +279,7 @@ RTLSDR_API int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int manual); * 225001 - 300000 Hz * 900001 - 3200000 Hz * sample loss is to be expected for rates > 2400000 - * \return 0 on success, -EINVAL on invalid rate + * \return 0 on success, RTLSDR_ERROR_INVALID on invalid rate */ RTLSDR_API int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t rate); diff --git a/include/tuner_fc2580.h b/include/tuner_fc2580.h index 9ebd935..72e9393 100644 --- a/include/tuner_fc2580.h +++ b/include/tuner_fc2580.h @@ -1,6 +1,8 @@ #ifndef __TUNER_FC2580_H #define __TUNER_FC2580_H +#include "rtl-sdr.h" + #define BORDER_FREQ 2600000 //2.6GHz : The border frequency which determines whether Low VCO or High VCO is used #define USE_EXT_CLK 0 //0 : Use internal XTAL Oscillator / 1 : Use External Clock input #define OFS_RSSI 57 @@ -16,21 +18,10 @@ typedef enum { FC2580_NO_BAND } fc2580_band_type; -typedef enum { - FC2580_FCI_FAIL, - FC2580_FCI_SUCCESS -} fc2580_fci_result_type; - -enum FUNCTION_STATUS -{ - FUNCTION_SUCCESS, - FUNCTION_ERROR, -}; - extern void fc2580_wait_msec(void *pTuner, int a); -fc2580_fci_result_type fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val); -fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data); +enum rtlsdr_error fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val); +enum rtlsdr_error fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data); /*============================================================================== fc2580 initial setting @@ -47,7 +38,7 @@ fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned 2 : Voltage Control Mode ==============================================================================*/ -fc2580_fci_result_type fc2580_set_init(void *pTuner, int ifagc_mode, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_init(void *pTuner, int ifagc_mode, unsigned int freq_xtal ); /*============================================================================== fc2580 frequency setting @@ -63,7 +54,7 @@ fc2580_fci_result_type fc2580_set_init(void *pTuner, int ifagc_mode, unsigned in ex) 2.6GHz = 2600000 ==============================================================================*/ -fc2580_fci_result_type fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned int freq_xtal ); /*============================================================================== @@ -83,7 +74,7 @@ fc2580_fci_result_type fc2580_set_freq(void *pTuner, unsigned int f_lo, unsigned ==============================================================================*/ -fc2580_fci_result_type fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ); +enum rtlsdr_error fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ); // The following context is FC2580 tuner API source code // Definitions diff --git a/src/librtlsdr.c b/src/librtlsdr.c index 433ed5b..b83c54d 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -125,6 +125,7 @@ struct rtlsdr_dev { int dev_lost; int driver_active; unsigned int xfer_errors; + int libusb_err; }; void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val); @@ -164,16 +165,16 @@ int e4000_set_gain(void *dev, int gain) { #if 0 int enhgain = (gain - 420); #endif - if(e4k_set_lna_gain(&devt->e4k_s, min(300, gain - mixgain * 10)) == -EINVAL) - return -1; - if(e4k_mixer_gain_set(&devt->e4k_s, mixgain) == -EINVAL) - return -1; + if(e4k_set_lna_gain(&devt->e4k_s, min(300, gain - mixgain * 10)) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; + if(e4k_mixer_gain_set(&devt->e4k_s, mixgain) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; #if 0 /* enhanced mixer gain seems to have no effect */ if(enhgain >= 0) - if(e4k_set_enh_gain(&devt->e4k_s, enhgain) == -EINVAL) - return -1; + if(e4k_set_enh_gain(&devt->e4k_s, enhgain) == RTLSDR_ERROR_INVALID) + return RTLSDR_ERROR_INVALID; #endif - return 0; + return RTLSDR_SUCCESS; } int e4000_set_if_gain(void *dev, int stage, int gain) { rtlsdr_dev_t* devt = (rtlsdr_dev_t*)dev; @@ -416,7 +417,12 @@ int rtlsdr_read_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t * if (r < 0) fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); #endif - return r; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return r; + } } int rtlsdr_write_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t *array, uint8_t len) @@ -429,7 +435,12 @@ int rtlsdr_write_array(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t if (r < 0) fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); #endif - return r; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return r; + } } int rtlsdr_i2c_write_reg(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t reg, uint8_t val) @@ -458,7 +469,7 @@ int rtlsdr_i2c_write(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int l uint16_t addr = i2c_addr; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_write_array(dev, IICB, addr, buffer, len); } @@ -468,12 +479,12 @@ int rtlsdr_i2c_read(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int le uint16_t addr = i2c_addr; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_read_array(dev, IICB, addr, buffer, len); } -uint16_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t len) +int32_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_t len) { int r; unsigned char data[2]; @@ -482,8 +493,11 @@ uint16_t rtlsdr_read_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint8_ r = libusb_control_transfer(dev->devh, CTRL_IN, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { + dev->libusb_err = r; fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + return RTLSDR_ERROR_USB; + } reg = (data[1] << 8) | data[0]; @@ -506,13 +520,16 @@ int rtlsdr_write_reg(rtlsdr_dev_t *dev, uint8_t block, uint16_t addr, uint16_t v r = libusb_control_transfer(dev->devh, CTRL_OUT, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); - - return r; + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } else { + return RTLSDR_SUCCESS; + } } -uint16_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint8_t len) +int32_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint8_t len) { int r; unsigned char data[2]; @@ -523,8 +540,11 @@ uint16_t rtlsdr_demod_read_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, u r = libusb_control_transfer(dev->devh, CTRL_IN, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } reg = (data[1] << 8) | data[0]; @@ -547,12 +567,15 @@ int rtlsdr_demod_write_reg(rtlsdr_dev_t *dev, uint8_t page, uint16_t addr, uint1 r = libusb_control_transfer(dev->devh, CTRL_OUT, 0, addr, index, data, len, CTRL_TIMEOUT); - if (r < 0) + if (r < 0) { fprintf(stderr, "%s failed with %d\n", __FUNCTION__, r); + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } rtlsdr_demod_read_reg(dev, 0x0a, 0x01, 1); - return (r == len) ? 0 : -1; + return (r == len) ? RTLSDR_SUCCESS : RTLSDR_ERROR_SHORT; } void rtlsdr_set_gpio_bit(rtlsdr_dev_t *dev, uint8_t gpio, int val) @@ -590,7 +613,7 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) for (i = 0; i < 8; ++i) { const int val = dev->fir[i]; if (val < -128 || val > 127) { - return -1; + return RTLSDR_ERROR_INVALID; } fir[i] = val; } @@ -599,7 +622,7 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) const int val0 = dev->fir[8+i]; const int val1 = dev->fir[8+i+1]; if (val0 < -2048 || val0 > 2047 || val1 < -2048 || val1 > 2047) { - return -1; + return RTLSDR_ERROR_INVALID; } fir[8+i*3/2] = val0 >> 4; fir[8+i*3/2+1] = (val0 << 4) | ((val1 >> 8) & 0x0f); @@ -607,11 +630,10 @@ int rtlsdr_set_fir(rtlsdr_dev_t *dev) } for (i = 0; i < (int)sizeof(fir); i++) { - if (rtlsdr_demod_write_reg(dev, 1, 0x1c + i, fir[i], 1)) - return -1; + return rtlsdr_demod_write_reg(dev, 1, 0x1c + i, fir[i], 1); } - return 0; + return RTLSDR_SUCCESS; } void rtlsdr_init_baseband(rtlsdr_dev_t *dev) @@ -673,7 +695,7 @@ int rtlsdr_deinit_baseband(rtlsdr_dev_t *dev) int r = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner && dev->tuner->exit) { rtlsdr_set_i2c_repeater(dev, 1); @@ -693,57 +715,67 @@ static int rtlsdr_set_if_freq(rtlsdr_dev_t *dev, uint32_t freq) int32_t if_freq; uint8_t tmp; int r; + int rfin; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* read corrected clock value */ - if (rtlsdr_get_xtal_freq(dev, &rtl_xtal, NULL)) - return -2; + r = rtlsdr_get_xtal_freq(dev, &rtl_xtal, NULL); + if (r < 0) + return r; if_freq = ((freq * TWO_POW(22)) / rtl_xtal) * (-1); tmp = (if_freq >> 16) & 0x3f; - r = rtlsdr_demod_write_reg(dev, 1, 0x19, tmp, 1); + rfin = rtlsdr_demod_write_reg(dev, 1, 0x19, tmp, 1); tmp = (if_freq >> 8) & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x1a, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x1a, tmp, 1); + if (r) rfin = r; tmp = if_freq & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x1b, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x1b, tmp, 1); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_set_sample_freq_correction(rtlsdr_dev_t *dev, int ppm) { - int r = 0; + int r; + int rfin = 0; uint8_t tmp; int16_t offs = ppm * (-1) * TWO_POW(24) / 1000000; tmp = offs & 0xff; - r |= rtlsdr_demod_write_reg(dev, 1, 0x3f, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x3f, tmp, 1); + if (r) rfin = r; tmp = (offs >> 8) & 0x3f; - r |= rtlsdr_demod_write_reg(dev, 1, 0x3e, tmp, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x3e, tmp, 1); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq, uint32_t tuner_freq) { - int r = 0; + int rfin = 0; + int r; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (rtl_freq > 0 && (rtl_freq < MIN_RTL_XTAL_FREQ || rtl_freq > MAX_RTL_XTAL_FREQ)) - return -2; + return RTLSDR_ERROR_INVALID; if (rtl_freq > 0 && dev->rtl_xtal != rtl_freq) { dev->rtl_xtal = rtl_freq; /* update xtal-dependent settings */ - if (dev->rate) + if (dev->rate) { r = rtlsdr_set_sample_rate(dev, dev->rate); + if (r) rfin = r; + } } if (dev->tun_xtal != tuner_freq) { @@ -753,22 +785,26 @@ int rtlsdr_set_xtal_freq(rtlsdr_dev_t *dev, uint32_t rtl_freq, uint32_t tuner_fr dev->tun_xtal = tuner_freq; /* read corrected clock value into e4k and r82xx structure */ - if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) || - rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal)) - return -3; + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc); + if (r == RTLSDR_SUCCESS) + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal); + if (r != RTLSDR_SUCCESS) + return r; /* update xtal-dependent settings */ - if (dev->freq) + if (dev->freq) { r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } } - return r; + return rfin; } int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq, uint32_t *tuner_freq) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; #define APPLY_PPM_CORR(val,ppm) (((val) * (1.0 + (ppm) / 1e6))) @@ -778,7 +814,7 @@ int rtlsdr_get_xtal_freq(rtlsdr_dev_t *dev, uint32_t *rtl_freq, uint32_t *tuner_ if (tuner_freq) *tuner_freq = (uint32_t) APPLY_PPM_CORR(dev->tun_xtal, dev->corr); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, @@ -790,13 +826,15 @@ int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, int r = 0; if (!dev || !dev->devh) - return -1; + return RTLSDR_ERROR_NULL; device = libusb_get_device(dev->devh); r = libusb_get_device_descriptor(device, &dd); - if (r < 0) - return -1; + if (r < 0) { + dev->libusb_err = r; + return RTLSDR_ERROR_USB; + } if (manufact) { memset(manufact, 0, buf_max); @@ -819,7 +857,7 @@ int rtlsdr_get_usb_strings(rtlsdr_dev_t *dev, char *manufact, char *product, buf_max); } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_t len) @@ -829,10 +867,10 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 uint8_t cmd[2]; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((len + offset) > 256) - return -2; + return RTLSDR_ERROR_INVALID; for (i = 0; i < len; i++) { cmd[0] = i + offset; @@ -846,7 +884,7 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 cmd[1] = data[i]; r = rtlsdr_write_array(dev, IICB, EEPROM_ADDR, cmd, 2); if (r != sizeof(cmd)) - return -3; + return r < 0 ? r : RTLSDR_ERROR_SHORT; /* for some EEPROMs (e.g. ATC 240LC02) we need a delay * between write operations, otherwise they will fail */ @@ -857,7 +895,7 @@ int rtlsdr_write_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16 #endif } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_t len) @@ -866,20 +904,20 @@ int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_ int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((len + offset) > 256) - return -2; + return RTLSDR_ERROR_INVALID; r = rtlsdr_write_array(dev, IICB, EEPROM_ADDR, &offset, 1); if (r < 0) - return -3; + return r; for (i = 0; i < len; i++) { r = rtlsdr_read_array(dev, IICB, EEPROM_ADDR, data + i, 1); if (r < 0) - return -3; + return r; } return r; @@ -887,10 +925,10 @@ int rtlsdr_read_eeprom(rtlsdr_dev_t *dev, uint8_t *data, uint8_t offset, uint16_ int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq) { - int r = -1; + int r; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->direct_sampling) { r = rtlsdr_set_if_freq(dev, freq); @@ -898,6 +936,8 @@ int rtlsdr_set_center_freq(rtlsdr_dev_t *dev, uint32_t freq) rtlsdr_set_i2c_repeater(dev, 1); r = dev->tuner->set_freq(dev, freq - dev->offs_freq); rtlsdr_set_i2c_repeater(dev, 0); + } else { + r = RTLSDR_ERROR_DEVTYPE; } if (!r) @@ -918,27 +958,33 @@ uint32_t rtlsdr_get_center_freq(rtlsdr_dev_t *dev) int rtlsdr_set_freq_correction(rtlsdr_dev_t *dev, int ppm) { - int r = 0; + int r; + int rfin; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->corr == ppm) - return -2; + return RTLSDR_ERROR_NOOP; dev->corr = ppm; - r |= rtlsdr_set_sample_freq_correction(dev, ppm); + rfin = rtlsdr_set_sample_freq_correction(dev, ppm); /* read corrected clock value into e4k and r82xx structure */ - if (rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc) || - rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal)) - return -3; + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->e4k_s.vco.fosc); + if (r == RTLSDR_SUCCESS) + r = rtlsdr_get_xtal_freq(dev, NULL, &dev->r82xx_c.xtal); + if (r != RTLSDR_SUCCESS) + return r; - if (dev->freq) /* retune to apply new correction value */ - r |= rtlsdr_set_center_freq(dev, dev->freq); + if (dev->freq) { + /* retune to apply new correction value */ + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } - return r; + return rfin; } int rtlsdr_get_freq_correction(rtlsdr_dev_t *dev) @@ -977,7 +1023,7 @@ int rtlsdr_get_tuner_gains(rtlsdr_dev_t *dev, int *gains) int len = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; switch (dev->tuner_type) { case RTLSDR_TUNER_E4000: @@ -1016,7 +1062,7 @@ int rtlsdr_set_tuner_bandwidth(rtlsdr_dev_t *dev, uint32_t bw) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_bw) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1034,7 +1080,7 @@ int rtlsdr_set_tuner_gain(rtlsdr_dev_t *dev, int gain) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_gain) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1063,7 +1109,7 @@ int rtlsdr_set_tuner_if_gain(rtlsdr_dev_t *dev, int stage, int gain) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_if_gain) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1079,7 +1125,7 @@ int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int mode) int r = 0; if (!dev || !dev->tuner) - return -1; + return RTLSDR_ERROR_NULL; if (dev->tuner->set_gain_mode) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1092,19 +1138,20 @@ int rtlsdr_set_tuner_gain_mode(rtlsdr_dev_t *dev, int mode) int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate) { - int r = 0; + int r; + int rfin = 0; uint16_t tmp; uint32_t rsamp_ratio, real_rsamp_ratio; double real_rate; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* check if the rate is supported by the resampler */ if ((samp_rate <= 225000) || (samp_rate > 3200000) || ((samp_rate > 300000) && (samp_rate <= 900000))) { fprintf(stderr, "Invalid sample rate: %u Hz\n", samp_rate); - return -EINVAL; + return RTLSDR_ERROR_INVALID; } rsamp_ratio = (dev->rtl_xtal * TWO_POW(22)) / samp_rate; @@ -1125,21 +1172,26 @@ int rtlsdr_set_sample_rate(rtlsdr_dev_t *dev, uint32_t samp_rate) } tmp = (rsamp_ratio >> 16); - r |= rtlsdr_demod_write_reg(dev, 1, 0x9f, tmp, 2); + r = rtlsdr_demod_write_reg(dev, 1, 0x9f, tmp, 2); + if (r) rfin = r; tmp = rsamp_ratio & 0xffff; - r |= rtlsdr_demod_write_reg(dev, 1, 0xa1, tmp, 2); + r = rtlsdr_demod_write_reg(dev, 1, 0xa1, tmp, 2); + if (r) rfin = r; - r |= rtlsdr_set_sample_freq_correction(dev, dev->corr); + r = rtlsdr_set_sample_freq_correction(dev, dev->corr); + if (r) rfin = r; /* reset demod (bit 3, soft_rst) */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x01, 0x14, 1); - r |= rtlsdr_demod_write_reg(dev, 1, 0x01, 0x10, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x01, 0x14, 1); + if (r) rfin = r; + r = rtlsdr_demod_write_reg(dev, 1, 0x01, 0x10, 1); + if (r) rfin = r; /* recalculate offset frequency if offset tuning is enabled */ if (dev->offs_freq) rtlsdr_set_offset_tuning(dev, 1); - return r; + return rfin; } uint32_t rtlsdr_get_sample_rate(rtlsdr_dev_t *dev) @@ -1153,7 +1205,7 @@ uint32_t rtlsdr_get_sample_rate(rtlsdr_dev_t *dev) int rtlsdr_set_testmode(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_demod_write_reg(dev, 0, 0x19, on ? 0x03 : 0x05, 1); } @@ -1161,17 +1213,18 @@ int rtlsdr_set_testmode(rtlsdr_dev_t *dev, int on) int rtlsdr_set_agc_mode(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return rtlsdr_demod_write_reg(dev, 0, 0x19, on ? 0x25 : 0x05, 1); } int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on) { - int r = 0; + int r; + int rfin = 0; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (on) { if (dev->tuner && dev->tuner->exit) { @@ -1181,80 +1234,93 @@ int rtlsdr_set_direct_sampling(rtlsdr_dev_t *dev, int on) } /* disable Zero-IF mode */ - r |= rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1a, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1a, 1); + if (r) rfin = r; /* disable spectrum inversion */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x15, 0x00, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x15, 0x00, 1); + if (r) rfin = r; /* only enable In-phase ADC input */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x08, 0x4d, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x08, 0x4d, 1); + if (r) rfin = r; /* swap I and Q ADC, this allows to select between two inputs */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x06, (on > 1) ? 0x90 : 0x80, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x06, (on > 1) ? 0x90 : 0x80, 1); + if (r) rfin = r; fprintf(stderr, "Enabled direct sampling mode, input %i\n", on); dev->direct_sampling = on; } else { if (dev->tuner && dev->tuner->init) { rtlsdr_set_i2c_repeater(dev, 1); - r |= dev->tuner->init(dev); + r = dev->tuner->init(dev); + if (r) rfin = r; rtlsdr_set_i2c_repeater(dev, 0); } if ((dev->tuner_type == RTLSDR_TUNER_R820T) || (dev->tuner_type == RTLSDR_TUNER_R828D)) { - r |= rtlsdr_set_if_freq(dev, R82XX_IF_FREQ); + r = rtlsdr_set_if_freq(dev, R82XX_IF_FREQ); + if (r) rfin = r; /* enable spectrum inversion */ - r |= rtlsdr_demod_write_reg(dev, 1, 0x15, 0x01, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0x15, 0x01, 1); + if (r) rfin = r; } else { - r |= rtlsdr_set_if_freq(dev, 0); + r = rtlsdr_set_if_freq(dev, 0); + if (r) rfin = r; /* enable In-phase + Quadrature ADC input */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x08, 0xcd, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x08, 0xcd, 1); + if (r) rfin = r; /* Enable Zero-IF mode */ - r |= rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1b, 1); + r = rtlsdr_demod_write_reg(dev, 1, 0xb1, 0x1b, 1); + if (r) rfin = r; } /* opt_adc_iq = 0, default ADC_I/ADC_Q datapath */ - r |= rtlsdr_demod_write_reg(dev, 0, 0x06, 0x80, 1); + r = rtlsdr_demod_write_reg(dev, 0, 0x06, 0x80, 1); + if (r) rfin = r; fprintf(stderr, "Disabled direct sampling mode\n"); dev->direct_sampling = 0; } - r |= rtlsdr_set_center_freq(dev, dev->freq); + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; - return r; + return rfin; } int rtlsdr_get_direct_sampling(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return dev->direct_sampling; } int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on) { - int r = 0; + int r; + int rfin = 0; int bw; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if ((dev->tuner_type == RTLSDR_TUNER_R820T) || (dev->tuner_type == RTLSDR_TUNER_R828D)) - return -2; + return RTLSDR_ERROR_DEVTYPE; if (dev->direct_sampling) - return -3; + return RTLSDR_ERROR_STATE; /* based on keenerds 1/f noise measurements */ dev->offs_freq = on ? ((dev->rate / 2) * 170 / 100) : 0; - r |= rtlsdr_set_if_freq(dev, dev->offs_freq); + rfin = rtlsdr_set_if_freq(dev, dev->offs_freq); if (dev->tuner && dev->tuner->set_bw) { rtlsdr_set_i2c_repeater(dev, 1); @@ -1269,16 +1335,18 @@ int rtlsdr_set_offset_tuning(rtlsdr_dev_t *dev, int on) rtlsdr_set_i2c_repeater(dev, 0); } - if (dev->freq > dev->offs_freq) - r |= rtlsdr_set_center_freq(dev, dev->freq); + if (dev->freq > dev->offs_freq) { + r = rtlsdr_set_center_freq(dev, dev->freq); + if (r) rfin = r; + } - return r; + return rfin; } int rtlsdr_get_offset_tuning(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; return (dev->offs_freq) ? 1 : 0; } @@ -1369,7 +1437,7 @@ const char *rtlsdr_get_device_name(uint32_t index) int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact, char *product, char *serial) { - int r = -2; + int r; int i; libusb_context *ctx; libusb_device **list; @@ -1381,7 +1449,7 @@ int rtlsdr_get_device_usb_strings(uint32_t index, char *manufact, r = libusb_init(&ctx); if(r < 0) - return r; + return RTLSDR_ERROR_USB; cnt = libusb_get_device_list(ctx, &list); @@ -1420,12 +1488,12 @@ int rtlsdr_get_index_by_serial(const char *serial) char str[256]; if (!serial) - return -1; + return RTLSDR_ERROR_NULL; cnt = rtlsdr_get_device_count(); if (!cnt) - return -2; + return RTLSDR_ERROR_NOTFOUND; for (i = 0; i < cnt; i++) { r = rtlsdr_get_device_usb_strings(i, NULL, NULL, str); @@ -1433,7 +1501,7 @@ int rtlsdr_get_index_by_serial(const char *serial) return i; } - return -3; + return RTLSDR_ERROR_NOTFOUND; } int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) @@ -1450,7 +1518,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) dev = malloc(sizeof(rtlsdr_dev_t)); if (NULL == dev) - return -ENOMEM; + return RTLSDR_ERROR_NOMEM; memset(dev, 0, sizeof(rtlsdr_dev_t)); memcpy(dev->fir, fir_default, sizeof(fir_default)); @@ -1458,7 +1526,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) r = libusb_init(&dev->ctx); if(r < 0){ free(dev); - return -1; + return RTLSDR_ERROR_USB; } dev->dev_lost = 1; @@ -1481,7 +1549,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) } if (!device) { - r = -1; + r = RTLSDR_ERROR_NOTFOUND; goto err; } @@ -1492,6 +1560,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) if(r == LIBUSB_ERROR_ACCESS) fprintf(stderr, "Please fix the device permissions, e.g. " "by installing the udev rules file rtl-sdr.rules\n"); + r = RTLSDR_ERROR_USB; goto err; } @@ -1505,6 +1574,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) fprintf(stderr, "Detached kernel driver\n"); } else { fprintf(stderr, "Detaching kernel driver failed!"); + r = RTLSDR_ERROR_USB; goto err; } #else @@ -1520,6 +1590,7 @@ int rtlsdr_open(rtlsdr_dev_t **out_dev, uint32_t index) r = libusb_claim_interface(dev->devh, 0); if (r < 0) { fprintf(stderr, "usb_claim_interface error %d\n", r); + r = RTLSDR_ERROR_USB; goto err; } @@ -1625,7 +1696,7 @@ found: *out_dev = dev; - return 0; + return RTLSDR_SUCCESS; err: if (dev) { if (dev->ctx) @@ -1640,7 +1711,7 @@ err: int rtlsdr_close(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if(!dev->dev_lost) { /* block until all async operations have been completed (if any) */ @@ -1672,26 +1743,34 @@ int rtlsdr_close(rtlsdr_dev_t *dev) free(dev); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_reset_buffer(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; rtlsdr_write_reg(dev, USBB, USB_EPA_CTL, 0x1002, 2); rtlsdr_write_reg(dev, USBB, USB_EPA_CTL, 0x0000, 2); - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_sync(rtlsdr_dev_t *dev, void *buf, int len, int *n_read) { + int r; + if (!dev) - return -1; + return RTLSDR_ERROR_NULL; - return libusb_bulk_transfer(dev->devh, 0x81, buf, len, n_read, BULK_TIMEOUT); + r = libusb_bulk_transfer(dev->devh, 0x81, buf, len, n_read, BULK_TIMEOUT); + if (r != 0) { + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; + } + + return r; } static void LIBUSB_CALL _libusb_callback(struct libusb_transfer *xfer) @@ -1732,7 +1811,7 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) unsigned int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (!dev->xfer) { dev->xfer = malloc(dev->xfer_buf_num * @@ -1743,7 +1822,7 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) } if (dev->xfer_buf) - return -2; + return RTLSDR_ERROR_STATE; dev->xfer_buf = malloc(dev->xfer_buf_num * sizeof(unsigned char *)); memset(dev->xfer_buf, 0, dev->xfer_buf_num * sizeof(unsigned char *)); @@ -1783,11 +1862,11 @@ static int _rtlsdr_alloc_async_buffers(rtlsdr_dev_t *dev) dev->xfer_buf[i] = malloc(dev->xfer_buf_len); if (!dev->xfer_buf[i]) - return -ENOMEM; + return RTLSDR_ERROR_NOMEM; } } - return 0; + return RTLSDR_SUCCESS; } static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) @@ -1795,7 +1874,7 @@ static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) unsigned int i; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (dev->xfer) { for(i = 0; i < dev->xfer_buf_num; ++i) { @@ -1827,7 +1906,7 @@ static int _rtlsdr_free_async_buffers(rtlsdr_dev_t *dev) dev->xfer_buf = NULL; } - return 0; + return RTLSDR_SUCCESS; } int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, @@ -1840,10 +1919,10 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, enum rtlsdr_async_status next_status = RTLSDR_INACTIVE; if (!dev) - return -1; + return RTLSDR_ERROR_NULL; if (RTLSDR_INACTIVE != dev->async_status) - return -2; + return RTLSDR_ERROR_STATE; dev->async_status = RTLSDR_RUNNING; dev->async_cancel = 0; @@ -1882,6 +1961,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, "echo 0 > /sys/module/usbcore" "/parameters/usbfs_memory_mb\n", i); dev->async_status = RTLSDR_CANCELING; + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; break; } } @@ -1891,6 +1972,8 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, &dev->async_cancel); if (r < 0) { /*fprintf(stderr, "handle_events returned: %d\n", r);*/ + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; if (r == LIBUSB_ERROR_INTERRUPTED) /* stray signal */ continue; break; @@ -1914,8 +1997,11 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, * propagate */ libusb_handle_events_timeout_completed(dev->ctx, &zerotv, NULL); - if (r < 0) + if (r < 0) { + dev->libusb_err = r; + r = RTLSDR_ERROR_USB; continue; + } next_status = RTLSDR_CANCELING; } @@ -1942,13 +2028,13 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, int rtlsdr_cancel_async(rtlsdr_dev_t *dev) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; /* if streaming, try to cancel gracefully */ if (RTLSDR_RUNNING == dev->async_status) { dev->async_status = RTLSDR_CANCELING; dev->async_cancel = 1; - return 0; + return RTLSDR_SUCCESS; } /* if called while in pending state, change the state forcefully */ @@ -1958,7 +2044,7 @@ int rtlsdr_cancel_async(rtlsdr_dev_t *dev) return 0; } #endif - return -2; + return RTLSDR_ERROR_STATE; } uint32_t rtlsdr_get_tuner_clock(void *dev) @@ -1980,7 +2066,7 @@ int rtlsdr_i2c_write_fn(void *dev, uint8_t addr, uint8_t *buf, int len) if (dev) return rtlsdr_i2c_write(((rtlsdr_dev_t *)dev), addr, buf, len); - return -1; + return RTLSDR_ERROR_NULL; } int rtlsdr_i2c_read_fn(void *dev, uint8_t addr, uint8_t *buf, int len) @@ -1988,16 +2074,16 @@ int rtlsdr_i2c_read_fn(void *dev, uint8_t addr, uint8_t *buf, int len) if (dev) return rtlsdr_i2c_read(((rtlsdr_dev_t *)dev), addr, buf, len); - return -1; + return RTLSDR_ERROR_NULL; } int rtlsdr_set_bias_tee(rtlsdr_dev_t *dev, int on) { if (!dev) - return -1; + return RTLSDR_ERROR_NULL; rtlsdr_set_gpio_output(dev, 0); rtlsdr_set_gpio_bit(dev, 0, on); - return 0; + return RTLSDR_SUCCESS; } diff --git a/src/tuner_e4k.c b/src/tuner_e4k.c index 400e745..fc2c63b 100644 --- a/src/tuner_e4k.c +++ b/src/tuner_e4k.c @@ -27,6 +27,7 @@ #include <string.h> #include <stdio.h> +#include <rtl-sdr.h> #include <reg_field.h> #include <tuner_e4k.h> #include <rtlsdr_i2c.h> @@ -70,7 +71,8 @@ static int e4k_reg_write(struct e4k_state *e4k, uint8_t reg, uint8_t val) data[1] = val; r = rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, data, 2); - return r == 2 ? 0 : -1; + if (r < 0) return r; + return r == 2 ? RTLSDR_SUCCESS : RTLSDR_ERROR_SHORT; } /*! \brief Read a register of the tuner chip @@ -81,12 +83,15 @@ static int e4k_reg_write(struct e4k_state *e4k, uint8_t reg, uint8_t val) static int e4k_reg_read(struct e4k_state *e4k, uint8_t reg) { uint8_t data = reg; + int r; - if (rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1) < 1) - return -1; + r = rtlsdr_i2c_write_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1); + if (r < 0) return r; + if (r < 1) return RTLSDR_ERROR_SHORT; - if (rtlsdr_i2c_read_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1) < 1) - return -1; + r = rtlsdr_i2c_read_fn(e4k->rtl_dev, e4k->i2c_addr, &data, 1); + if (r < 0) return r; + if (r < 1) return RTLSDR_ERROR_SHORT; return data; } @@ -104,7 +109,7 @@ static int e4k_reg_set_mask(struct e4k_state *e4k, uint8_t reg, uint8_t tmp = e4k_reg_read(e4k, reg); if ((tmp & mask) == val) - return 0; + return RTLSDR_SUCCESS; return e4k_reg_write(e4k, reg, (tmp & ~mask) | (val & mask)); } @@ -203,7 +208,7 @@ static int choose_rf_filter(enum e4k_band band, uint32_t freq) freq); break; default: - rc = -EINVAL; + rc = RTLSDR_ERROR_INVALID; break; } @@ -277,7 +282,7 @@ static const struct reg_field if_filter_fields[] = { static int find_if_bw(enum e4k_if_filter filter, uint32_t bw) { if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; return closest_arr_idx(if_filter_bw[filter], if_filter_bw_len[filter], bw); @@ -296,7 +301,7 @@ int e4k_if_filter_bw_set(struct e4k_state *e4k, enum e4k_if_filter filter, const struct reg_field *field; if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; bw_idx = find_if_bw(filter, bandwidth); @@ -323,7 +328,7 @@ int e4k_if_filter_bw_get(struct e4k_state *e4k, enum e4k_if_filter filter) const struct reg_field *field; if (filter >= ARRAY_SIZE(if_filter_bw)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; field = &if_filter_fields[filter]; @@ -443,7 +448,7 @@ static uint32_t compute_flo(uint32_t f_osc, uint8_t z, uint16_t x, uint8_t r) { uint64_t fvco = compute_fvco(f_osc, z, x); if (fvco == 0) - return -EINVAL; + return 0; return fvco / r; } @@ -579,7 +584,7 @@ int e4k_tune_freq(struct e4k_state *e4k, uint32_t freq) /* determine PLL parameters */ rc = e4k_compute_pll_params(&p, e4k->vco.fosc, freq); if (!rc) - return -EINVAL; + return RTLSDR_ERROR_INVALID; /* actually tune to those parameters */ rc = e4k_tune_params(e4k, &p); @@ -588,7 +593,7 @@ int e4k_tune_freq(struct e4k_state *e4k, uint32_t freq) rc = e4k_reg_read(e4k, E4K_REG_SYNTH1); if (!(rc & 0x01)) { fprintf(stderr, "[E4K] PLL not locked for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } return 0; @@ -672,7 +677,7 @@ int e4k_set_lna_gain(struct e4k_state *e4k, int32_t gain) return gain; } } - return -EINVAL; + return RTLSDR_ERROR_INVALID; } int e4k_set_enh_gain(struct e4k_state *e4k, int32_t gain) @@ -688,9 +693,9 @@ int e4k_set_enh_gain(struct e4k_state *e4k, int32_t gain) /* special case: 0 = off*/ if(0 == gain) - return 0; + return RTLSDR_SUCCESS; else - return -EINVAL; + return RTLSDR_ERROR_INVALID; } int e4k_enable_manual_gain(struct e4k_state *e4k, uint8_t manual) @@ -710,7 +715,7 @@ int e4k_enable_manual_gain(struct e4k_state *e4k, uint8_t manual) e4k_reg_set_mask(e4k, E4K_REG_AGC11, 0x7, 0); } - return 0; + return RTLSDR_SUCCESS; } static int find_stage_gain(uint8_t stage, int8_t val) @@ -719,7 +724,7 @@ static int find_stage_gain(uint8_t stage, int8_t val) int i; if (stage >= ARRAY_SIZE(if_stage_gain)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; arr = if_stage_gain[stage]; @@ -727,7 +732,7 @@ static int find_stage_gain(uint8_t stage, int8_t val) if (arr[i] == val) return i; } - return -EINVAL; + return RTLSDR_ERROR_INVALID; } /*! \brief Set the gain of one of the IF gain stages @@ -765,7 +770,7 @@ int e4k_mixer_gain_set(struct e4k_state *e4k, int8_t value) bit = 1; break; default: - return -EINVAL; + return RTLSDR_ERROR_INVALID; } return e4k_reg_set_mask(e4k, E4K_REG_GAIN2, 1, bit); @@ -774,9 +779,9 @@ int e4k_mixer_gain_set(struct e4k_state *e4k, int8_t value) int e4k_commonmode_set(struct e4k_state *e4k, int8_t value) { if(value < 0) - return -EINVAL; + return RTLSDR_ERROR_INVALID; else if(value > 7) - return -EINVAL; + return RTLSDR_ERROR_INVALID; return e4k_reg_set_mask(e4k, E4K_REG_DC7, 7, value); } @@ -789,13 +794,13 @@ int e4k_manual_dc_offset(struct e4k_state *e4k, int8_t iofs, int8_t irange, int8 int res; if((iofs < 0x00) || (iofs > 0x3f)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((irange < 0x00) || (irange > 0x03)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((qofs < 0x00) || (qofs > 0x3f)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; if((qrange < 0x00) || (qrange > 0x03)) - return -EINVAL; + return RTLSDR_ERROR_INVALID; res = e4k_reg_set_mask(e4k, E4K_REG_DC2, 0x3f, iofs); if(res < 0) @@ -886,7 +891,7 @@ int e4k_dc_offset_gen_table(struct e4k_state *e4k) TO_LUT(offs_i, range_i)); } - return 0; + return RTLSDR_SUCCESS; } /*********************************************************************** @@ -899,7 +904,7 @@ int e4k_standby(struct e4k_state *e4k, int enable) e4k_reg_set_mask(e4k, E4K_REG_MASTER1, E4K_MASTER1_NORM_STBY, enable ? 0 : E4K_MASTER1_NORM_STBY); - return 0; + return RTLSDR_SUCCESS; } /*********************************************************************** @@ -916,7 +921,7 @@ static int magic_init(struct e4k_state *e4k) e4k_reg_write(e4k, 0x9f, 0x7f); e4k_reg_write(e4k, 0xa0, 0x07); - return 0; + return RTLSDR_SUCCESS; } /*! \brief Initialize the E4K tuner @@ -996,5 +1001,5 @@ int e4k_init(struct e4k_state *e4k) e4k_reg_set_mask(e4k, E4K_REG_DCTIME1, 0x03, 0); e4k_reg_set_mask(e4k, E4K_REG_DCTIME2, 0x03, 0); - return 0; + return RTLSDR_SUCCESS; } diff --git a/src/tuner_fc0012.c b/src/tuner_fc0012.c index 768cf1c..4378273 100644 --- a/src/tuner_fc0012.c +++ b/src/tuner_fc0012.c @@ -24,34 +24,40 @@ #include <stdint.h> #include <stdio.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc0012.h" static int fc0012_writereg(void *dev, uint8_t reg, uint8_t val) { + int r; uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, data, 2) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, data, 2); + if (r < 0) + return r; - return 0; + return RTLSDR_SUCCESS; } static int fc0012_readreg(void *dev, uint8_t reg, uint8_t *val) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0012_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(dev, FC0012_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_read_fn(dev, FC0012_I2C_ADDR, &data, 1); + if (r < 0) + return r; *val = data; - return 0; + return RTLSDR_SUCCESS; } /* Incomplete list of register settings: @@ -230,7 +236,7 @@ int fc0012_set_params(void *dev, uint32_t freq, uint32_t bandwidth) if ((reg[1] > 15) || (reg[2] < 0x0b)) { fprintf(stderr, "[FC0012] no valid PLL combination " "found for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } /* fix clock out */ diff --git a/src/tuner_fc0013.c b/src/tuner_fc0013.c index 78b696e..6df3afd 100644 --- a/src/tuner_fc0013.c +++ b/src/tuner_fc0013.c @@ -27,34 +27,40 @@ #include <stdint.h> #include <stdio.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc0013.h" static int fc0013_writereg(void *dev, uint8_t reg, uint8_t val) { + int r; uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, data, 2) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, data, 2); + if (r < 0) + return r; - return 0; + return RTLSDR_SUCCESS; } static int fc0013_readreg(void *dev, uint8_t reg, uint8_t *val) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_write_fn(dev, FC0013_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(dev, FC0013_I2C_ADDR, &data, 1) < 0) - return -1; + r = rtlsdr_i2c_read_fn(dev, FC0013_I2C_ADDR, &data, 1); + if (r < 0) + return r; *val = data; - return 0; + return RTLSDR_SUCCESS; } int fc0013_init(void *dev) @@ -335,7 +341,7 @@ int fc0013_set_params(void *dev, uint32_t freq, uint32_t bandwidth) if ((reg[1] > 15) || (reg[2] < 0x0b)) { fprintf(stderr, "[FC0013] no valid PLL combination " "found for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } /* fix clock out */ @@ -428,22 +434,25 @@ exit: int fc0013_set_gain_mode(void *dev, int manual) { - int ret = 0; + int ret; + int fret = 0; uint8_t tmp = 0; - ret |= fc0013_readreg(dev, 0x0d, &tmp); + fret = fc0013_readreg(dev, 0x0d, &tmp); if (manual) tmp |= (1 << 3); else tmp &= ~(1 << 3); - ret |= fc0013_writereg(dev, 0x0d, tmp); + ret = fc0013_writereg(dev, 0x0d, tmp); + if (ret) fret = ret; /* set a fixed IF-gain for now */ - ret |= fc0013_writereg(dev, 0x13, 0x0a); + ret = fc0013_writereg(dev, 0x13, 0x0a); + if (ret) fret = ret; - return ret; + return fret; } int fc0013_lna_gains[] ={ @@ -477,11 +486,12 @@ int fc0013_lna_gains[] ={ int fc0013_set_lna_gain(void *dev, int gain) { - int ret = 0; + int ret; + int fret = 0; unsigned int i; uint8_t tmp = 0; - ret |= fc0013_readreg(dev, 0x14, &tmp); + fret = fc0013_readreg(dev, 0x14, &tmp); /* mask bits off */ tmp &= 0xe0; @@ -494,7 +504,8 @@ int fc0013_set_lna_gain(void *dev, int gain) } /* set gain */ - ret |= fc0013_writereg(dev, 0x14, tmp); + ret = fc0013_writereg(dev, 0x14, tmp); + if (ret) fret = ret; - return ret; + return fret; } diff --git a/src/tuner_fc2580.c b/src/tuner_fc2580.c index d2eeba5..9aa9ff7 100644 --- a/src/tuner_fc2580.c +++ b/src/tuner_fc2580.c @@ -8,6 +8,7 @@ #include <stdint.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_fc2580.h" @@ -16,32 +17,32 @@ /* glue functions to rtl-sdr code */ -fc2580_fci_result_type fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val) +enum rtlsdr_error fc2580_i2c_write(void *pTuner, unsigned char reg, unsigned char val) { uint8_t data[2]; data[0] = reg; data[1] = val; - if (rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, data, 2) < 0) - return FC2580_FCI_FAIL; - - return FC2580_FCI_SUCCESS; + return rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, data, 2); } -fc2580_fci_result_type fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data) +enum rtlsdr_error fc2580_i2c_read(void *pTuner, unsigned char reg, unsigned char *read_data) { + int r; uint8_t data = reg; - if (rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, &data, 1) < 0) - return FC2580_FCI_FAIL; + r = rtlsdr_i2c_write_fn(pTuner, FC2580_I2C_ADDR, &data, 1); + if (r < 0) + return r; - if (rtlsdr_i2c_read_fn(pTuner, FC2580_I2C_ADDR, &data, 1) < 0) - return FC2580_FCI_FAIL; + r = rtlsdr_i2c_read_fn(pTuner, FC2580_I2C_ADDR, &data, 1); + if (r < 0) + return r; *read_data = data; - return FC2580_FCI_SUCCESS; + return RTLSDR_SUCCESS; } int @@ -59,15 +60,7 @@ fc2580_Initialize( // Note: CrystalFreqKhz = round(CrystalFreqHz / 1000) CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_init(pTuner, AgcMode, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_initialize_tuner; - - - return FUNCTION_SUCCESS; - - -error_status_initialize_tuner: - return FUNCTION_ERROR; + return fc2580_set_init(pTuner, AgcMode, CrystalFreqKhz); } int @@ -85,13 +78,7 @@ fc2580_SetRfFreqHz( RfFreqKhz = (unsigned int)((RfFreqHz + 500) / 1000); CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_freq(pTuner, RfFreqKhz, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_set_tuner_rf_frequency; - - return FUNCTION_SUCCESS; - -error_status_set_tuner_rf_frequency: - return FUNCTION_ERROR; + return fc2580_set_freq(pTuner, RfFreqKhz, CrystalFreqKhz); } /** @@ -111,14 +98,7 @@ fc2580_SetBandwidthMode( // Note: CrystalFreqKhz = round(CrystalFreqHz / 1000) CrystalFreqKhz = (unsigned int)((CRYSTAL_FREQ + 500) / 1000); - if(fc2580_set_filter(pTuner, (unsigned char)BandwidthMode, CrystalFreqKhz) != FC2580_FCI_SUCCESS) - goto error_status_set_tuner_bandwidth_mode; - - return FUNCTION_SUCCESS; - - -error_status_set_tuner_bandwidth_mode: - return FUNCTION_ERROR; + return fc2580_set_filter(pTuner, (unsigned char)BandwidthMode, CrystalFreqKhz); } void fc2580_wait_msec(void *pTuner, int a) @@ -143,37 +123,57 @@ void fc2580_wait_msec(void *pTuner, int a) 2 : Voltage Control Mode ==============================================================================*/ -fc2580_fci_result_type fc2580_set_init( void *pTuner, int ifagc_mode, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_init( void *pTuner, int ifagc_mode, unsigned int freq_xtal ) { - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; - - result &= fc2580_i2c_write(pTuner, 0x00, 0x00); /*** Confidential ***/ - result &= fc2580_i2c_write(pTuner, 0x12, 0x86); - result &= fc2580_i2c_write(pTuner, 0x14, 0x5C); - result &= fc2580_i2c_write(pTuner, 0x16, 0x3C); - result &= fc2580_i2c_write(pTuner, 0x1F, 0xD2); - result &= fc2580_i2c_write(pTuner, 0x09, 0xD7); - result &= fc2580_i2c_write(pTuner, 0x0B, 0xD5); - result &= fc2580_i2c_write(pTuner, 0x0C, 0x32); - result &= fc2580_i2c_write(pTuner, 0x0E, 0x43); - result &= fc2580_i2c_write(pTuner, 0x21, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x22, 0x82); + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; + + result = fc2580_i2c_write(pTuner, 0x00, 0x00); /*** Confidential ***/ + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x12, 0x86); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x14, 0x5C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x16, 0x3C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1F, 0xD2); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x09, 0xD7); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0B, 0xD5); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0C, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x0E, 0x43); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x21, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x22, 0x82); + if (result) fresult = result; if( ifagc_mode == 1 ) { - result &= fc2580_i2c_write(pTuner, 0x45, 0x10); //internal AGC - result &= fc2580_i2c_write(pTuner, 0x4C, 0x00); //HOLD_AGC polarity + result = fc2580_i2c_write(pTuner, 0x45, 0x10); //internal AGC + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x4C, 0x00); //HOLD_AGC polarity + if (result) fresult = result; } else if( ifagc_mode == 2 ) { - result &= fc2580_i2c_write(pTuner, 0x45, 0x20); //Voltage Control Mode - result &= fc2580_i2c_write(pTuner, 0x4C, 0x02); //HOLD_AGC polarity + result = fc2580_i2c_write(pTuner, 0x45, 0x20); //Voltage Control Mode + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x4C, 0x02); //HOLD_AGC polarity + if (result) fresult = result; } - result &= fc2580_i2c_write(pTuner, 0x3F, 0x88); - result &= fc2580_i2c_write(pTuner, 0x02, 0x0E); - result &= fc2580_i2c_write(pTuner, 0x58, 0x14); - result &= fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz - - return result; + result = fc2580_i2c_write(pTuner, 0x3F, 0x88); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x02, 0x0E); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x58, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + if (result) fresult = result; + + return fresult; } @@ -192,7 +192,7 @@ fc2580_fci_result_type fc2580_set_init( void *pTuner, int ifagc_mode, unsigned i ex) 2.6GHz = 2600000 ==============================================================================*/ -fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigned int freq_xtal ) { unsigned int f_diff, f_diff_shifted, n_val, k_val; unsigned int f_vco, r_val, f_comp; @@ -202,7 +202,8 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne fc2580_band_type band = ( f_lo > 1000000 )? FC2580_L_BAND : ( f_lo > 400000 )? FC2580_UHF_BAND : FC2580_VHF_BAND; - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; f_vco = ( band == FC2580_UHF_BAND )? f_lo * 4 : (( band == FC2580_L_BAND )? f_lo * 2 : f_lo * 12); r_val = ( f_vco >= 2*76*freq_xtal )? 1 : ( f_vco >= 76*freq_xtal )? 2 : 4; @@ -227,102 +228,176 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne case FC2580_UHF_BAND: data_0x02 = (data_0x02 & 0x3F); - result &= fc2580_i2c_write(pTuner, 0x25, 0xF0); - result &= fc2580_i2c_write(pTuner, 0x27, 0x77); - result &= fc2580_i2c_write(pTuner, 0x28, 0x53); - result &= fc2580_i2c_write(pTuner, 0x29, 0x60); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); + result = fc2580_i2c_write(pTuner, 0x25, 0xF0); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x27, 0x77); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x28, 0x53); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x29, 0x60); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; if( f_lo < 538000 ) - result &= fc2580_i2c_write(pTuner, 0x5F, 0x13); + result = fc2580_i2c_write(pTuner, 0x5F, 0x13); else - result &= fc2580_i2c_write(pTuner, 0x5F, 0x15); + result = fc2580_i2c_write(pTuner, 0x5F, 0x15); + if (result) fresult = result; if( f_lo < 538000 ) { - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x06); - result &= fc2580_i2c_write(pTuner, 0x67, 0x06); - result &= fc2580_i2c_write(pTuner, 0x68, 0x08); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; } else if( f_lo < 794000 ) { - result &= fc2580_i2c_write(pTuner, 0x61, 0x03); - result &= fc2580_i2c_write(pTuner, 0x62, 0x03); - result &= fc2580_i2c_write(pTuner, 0x67, 0x03); //ACI improve - result &= fc2580_i2c_write(pTuner, 0x68, 0x05); //ACI improve - result &= fc2580_i2c_write(pTuner, 0x69, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x0E); + result = fc2580_i2c_write(pTuner, 0x61, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x03); //ACI improve + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x05); //ACI improve + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x0E); + if (result) fresult = result; } else { - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x06); - result &= fc2580_i2c_write(pTuner, 0x67, 0x07); - result &= fc2580_i2c_write(pTuner, 0x68, 0x09); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x06); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; } - result &= fc2580_i2c_write(pTuner, 0x63, 0x15); - - result &= fc2580_i2c_write(pTuner, 0x6B, 0x0B); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6D, 0x78); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x32); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x14); - result &= fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + result = fc2580_i2c_write(pTuner, 0x63, 0x15); + if (result) fresult = result; + + result = fc2580_i2c_write(pTuner, 0x6B, 0x0B); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0x78); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 8, freq_xtal); //BW = 7.8MHz + if (result) fresult = result; break; case FC2580_VHF_BAND: data_0x02 = (data_0x02 & 0x3F) | 0x80; - result &= fc2580_i2c_write(pTuner, 0x27, 0x77); - result &= fc2580_i2c_write(pTuner, 0x28, 0x33); - result &= fc2580_i2c_write(pTuner, 0x29, 0x40); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); - result &= fc2580_i2c_write(pTuner, 0x5F, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x61, 0x07); - result &= fc2580_i2c_write(pTuner, 0x62, 0x00); - result &= fc2580_i2c_write(pTuner, 0x63, 0x15); - result &= fc2580_i2c_write(pTuner, 0x67, 0x03); - result &= fc2580_i2c_write(pTuner, 0x68, 0x05); - result &= fc2580_i2c_write(pTuner, 0x69, 0x10); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x12); - result &= fc2580_i2c_write(pTuner, 0x6B, 0x08); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x6D, 0x78); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x32); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x54); - result &= fc2580_set_filter(pTuner, 7, freq_xtal); //BW = 6.8MHz + result = fc2580_i2c_write(pTuner, 0x27, 0x77); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x28, 0x33); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x29, 0x40); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x5F, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x61, 0x07); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x63, 0x15); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x03); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x05); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x10); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x12); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6B, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0x78); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x32); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x54); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 7, freq_xtal); //BW = 6.8MHz + if (result) fresult = result; break; case FC2580_L_BAND: data_0x02 = (data_0x02 & 0x3F) | 0x40; - result &= fc2580_i2c_write(pTuner, 0x2B, 0x70); - result &= fc2580_i2c_write(pTuner, 0x2C, 0x37); - result &= fc2580_i2c_write(pTuner, 0x2D, 0xE7); - result &= fc2580_i2c_write(pTuner, 0x30, 0x09); - result &= fc2580_i2c_write(pTuner, 0x44, 0x20); - result &= fc2580_i2c_write(pTuner, 0x50, 0x8C); - result &= fc2580_i2c_write(pTuner, 0x53, 0x50); - result &= fc2580_i2c_write(pTuner, 0x5F, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x61, 0x0F); - result &= fc2580_i2c_write(pTuner, 0x62, 0x00); - result &= fc2580_i2c_write(pTuner, 0x63, 0x13); - result &= fc2580_i2c_write(pTuner, 0x67, 0x00); - result &= fc2580_i2c_write(pTuner, 0x68, 0x02); - result &= fc2580_i2c_write(pTuner, 0x69, 0x0C); - result &= fc2580_i2c_write(pTuner, 0x6A, 0x0E); - result &= fc2580_i2c_write(pTuner, 0x6B, 0x08); - result &= fc2580_i2c_write(pTuner, 0x6C, 0x0A); - result &= fc2580_i2c_write(pTuner, 0x6D, 0xA0); - result &= fc2580_i2c_write(pTuner, 0x6E, 0x50); - result &= fc2580_i2c_write(pTuner, 0x6F, 0x14); - result &= fc2580_set_filter(pTuner, 1, freq_xtal); //BW = 1.53MHz + result = fc2580_i2c_write(pTuner, 0x2B, 0x70); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2C, 0x37); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2D, 0xE7); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x30, 0x09); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x44, 0x20); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x50, 0x8C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x53, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x5F, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x61, 0x0F); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x62, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x63, 0x13); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x67, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x68, 0x02); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x69, 0x0C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6A, 0x0E); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6B, 0x08); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6C, 0x0A); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6D, 0xA0); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6E, 0x50); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x6F, 0x14); + if (result) fresult = result; + result = fc2580_set_filter(pTuner, 1, freq_xtal); //BW = 1.53MHz + if (result) fresult = result; break; default: break; @@ -331,23 +406,32 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne // } //A command about AGC clock's pre-divide ratio - if( freq_xtal >= 28000 ) - result &= fc2580_i2c_write(pTuner, 0x4B, 0x22 ); + if( freq_xtal >= 28000 ) { + result = fc2580_i2c_write(pTuner, 0x4B, 0x22 ); + if (result) fresult = result; + } //Commands about VCO Band and PLL setting. - result &= fc2580_i2c_write(pTuner, 0x02, data_0x02); + result = fc2580_i2c_write(pTuner, 0x02, data_0x02); + if (result) fresult = result; data_0x18 = ( ( r_val == 1 )? 0x00 : ( ( r_val == 2 )? 0x10 : 0x20 ) ) + (unsigned char)(k_val >> 16); - result &= fc2580_i2c_write(pTuner, 0x18, data_0x18); //Load 'R' value and high part of 'K' values - result &= fc2580_i2c_write(pTuner, 0x1A, (unsigned char)( k_val >> 8 ) ); //Load middle part of 'K' value - result &= fc2580_i2c_write(pTuner, 0x1B, (unsigned char)( k_val ) ); //Load lower part of 'K' value - result &= fc2580_i2c_write(pTuner, 0x1C, (unsigned char)( n_val ) ); //Load 'N' value + result = fc2580_i2c_write(pTuner, 0x18, data_0x18); //Load 'R' value and high part of 'K' values + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1A, (unsigned char)( k_val >> 8 ) ); //Load middle part of 'K' value + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1B, (unsigned char)( k_val ) ); //Load lower part of 'K' value + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x1C, (unsigned char)( n_val ) ); //Load 'N' value + if (result) fresult = result; //A command about UHF LNA Load Cap - if( band == FC2580_UHF_BAND ) - result &= fc2580_i2c_write(pTuner, 0x2D, ( f_lo <= (unsigned int)794000 )? 0x9F : 0x8F ); //LNA_OUT_CAP + if( band == FC2580_UHF_BAND ) { + result = fc2580_i2c_write(pTuner, 0x2D, ( f_lo <= (unsigned int)794000 )? 0x9F : 0x8F ); //LNA_OUT_CAP + if (result) fresult = result; + } - return result; + return fresult; } @@ -369,57 +453,78 @@ fc2580_fci_result_type fc2580_set_freq( void *pTuner, unsigned int f_lo, unsigne ==============================================================================*/ -fc2580_fci_result_type fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ) +enum rtlsdr_error fc2580_set_filter( void *pTuner, unsigned char filter_bw, unsigned int freq_xtal ) { unsigned char cal_mon = 0, i; - fc2580_fci_result_type result = FC2580_FCI_SUCCESS; + enum rtlsdr_error result; + enum rtlsdr_error fresult = RTLSDR_SUCCESS; if(filter_bw == 1) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x1C); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4151*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x00); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x1C); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4151*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } if(filter_bw == 6) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4400*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x00); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(4400*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x00); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else if(filter_bw == 7) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3910*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x80); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3910*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x80); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else if(filter_bw == 8) { - result &= fc2580_i2c_write(pTuner, 0x36, 0x18); - result &= fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3300*freq_xtal/1000000) ); - result &= fc2580_i2c_write(pTuner, 0x39, 0x80); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x36, 0x18); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x37, (unsigned char)(3300*freq_xtal/1000000) ); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x39, 0x80); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } for(i=0; i<5; i++) { fc2580_wait_msec(pTuner, 5);//wait 5ms - result &= fc2580_i2c_read(pTuner, 0x2F, &cal_mon); + result = fc2580_i2c_read(pTuner, 0x2F, &cal_mon); + if (result) fresult = result; if( (cal_mon & 0xC0) != 0xC0) { - result &= fc2580_i2c_write(pTuner, 0x2E, 0x01); - result &= fc2580_i2c_write(pTuner, 0x2E, 0x09); + result = fc2580_i2c_write(pTuner, 0x2E, 0x01); + if (result) fresult = result; + result = fc2580_i2c_write(pTuner, 0x2E, 0x09); + if (result) fresult = result; } else break; } - result &= fc2580_i2c_write(pTuner, 0x2E, 0x01); + result = fc2580_i2c_write(pTuner, 0x2E, 0x01); + if (result) fresult = result; - return result; + return fresult; } /*============================================================================== diff --git a/src/tuner_r82xx.c b/src/tuner_r82xx.c index fe52bd9..9561c1f 100644 --- a/src/tuner_r82xx.c +++ b/src/tuner_r82xx.c @@ -26,6 +26,7 @@ #include <stdint.h> #include <string.h> +#include "rtl-sdr.h" #include "rtlsdr_i2c.h" #include "tuner_r82xx.h" @@ -275,7 +276,7 @@ static int r82xx_write(struct r82xx_priv *priv, uint8_t reg, const uint8_t *val, __FUNCTION__, rc, reg, size); if (rc < 0) return rc; - return -1; + return RTLSDR_ERROR_SHORT; } reg += size; @@ -283,7 +284,7 @@ static int r82xx_write(struct r82xx_priv *priv, uint8_t reg, const uint8_t *val, pos += size; } while (len > 0); - return 0; + return RTLSDR_SUCCESS; } static int r82xx_write_reg(struct r82xx_priv *priv, uint8_t reg, uint8_t val) @@ -298,7 +299,7 @@ static int r82xx_read_cache_reg(struct r82xx_priv *priv, int reg) if (reg >= 0 && reg < NUM_REGS) return priv->regs[reg]; else - return -1; + return RTLSDR_ERROR_INVALID; } static int r82xx_write_reg_mask(struct r82xx_priv *priv, uint8_t reg, uint8_t val, @@ -330,8 +331,10 @@ static int r82xx_read(struct r82xx_priv *priv, uint8_t reg, uint8_t *val, int le priv->buf[0] = reg; rc = rtlsdr_i2c_write_fn(priv->rtl_dev, priv->cfg->i2c_addr, priv->buf, 1); - if (rc < 1) + if (rc < 0) return rc; + if (rc < 1) + return RTLSDR_ERROR_SHORT; rc = rtlsdr_i2c_read_fn(priv->rtl_dev, priv->cfg->i2c_addr, p, len); @@ -340,14 +343,14 @@ static int r82xx_read(struct r82xx_priv *priv, uint8_t reg, uint8_t *val, int le __FUNCTION__, rc, reg, len); if (rc < 0) return rc; - return -1; + return RTLSDR_ERROR_SHORT; } /* Copy data to the output buffer */ for (i = 0; i < len; i++) val[i] = r82xx_bitrev(p[i]); - return 0; + return RTLSDR_SUCCESS; } /* @@ -490,7 +493,7 @@ static int r82xx_set_pll(struct r82xx_priv *priv, uint32_t freq) if (nint > ((128 / vco_power_ref) - 1)) { fprintf(stderr, "[R82XX] No valid PLL values for %u Hz!\n", freq); - return -1; + return RTLSDR_ERROR_INVALID; } ni = (nint - 13) / 4; @@ -549,7 +552,7 @@ static int r82xx_set_pll(struct r82xx_priv *priv, uint32_t freq) if (!(data[2] & 0x40)) { fprintf(stderr, "[R82XX] PLL not locked!\n"); priv->has_lock = 0; - return 0; + return RTLSDR_SUCCESS; } priv->has_lock = 1; @@ -754,7 +757,7 @@ static int r82xx_sysfreq_sel(struct r82xx_priv *priv, uint32_t freq, if (rc < 0) return rc; } - return 0; + return RTLSDR_SUCCESS; } static int r82xx_set_tv_standard(struct r82xx_priv *priv, @@ -911,7 +914,7 @@ static int r82xx_set_tv_standard(struct r82xx_priv *priv, priv->type = type; priv->bw = bw; - return 0; + return RTLSDR_SUCCESS; } static int r82xx_read_gain(struct r82xx_priv *priv) @@ -1010,7 +1013,7 @@ int r82xx_set_gain(struct r82xx_priv *priv, int set_manual_gain, int gain) return rc; } - return 0; + return RTLSDR_SUCCESS; } /* Bandwidth contribution by low-pass filter. */ @@ -1131,7 +1134,7 @@ int r82xx_standby(struct r82xx_priv *priv) /* If device was not initialized yet, don't need to standby */ if (!priv->init_done) - return 0; + return RTLSDR_ERROR_NOOP; rc = r82xx_write_reg(priv, 0x06, 0xb1); if (rc < 0) @@ -1229,7 +1232,7 @@ static int r82xx_xtal_check(struct r82xx_priv *priv) } if (i == ARRAY_SIZE(r82xx_xtal_capacitor)) - return -1; + return RTLSDR_ERROR_INVALID; return r82xx_xtal_capacitor[i][1]; } -- 2.11.0

5 years, 7 months

1
0
0 0

[PATCH] rtl-sdr/lib: take 2 manually releasing async buffers

by Karl Semich

New rtl-sdr manual buffer resubmission patch after discussion on IRC. This implementation uses the existing rtlsdr_read_async API and is more compartmentalized.

5 years, 7 months

1
0
0 0

[PATCH} gr-osmosdr/rtl: overflow fixes

by Karl Semich

RTLSDR driver is amended to handle overflows in a robust way. Previous code appeared to have many issues: overflows were happening more than needed and could result in data corruption. Handling is changed to stop the stream when buffers are exhausted, and restart it when they have drained. I apologize that my patches are sent as attachments; I only have access to webmail at this time.

5 years, 8 months

1
0
0 0

[PATCH] Add support for message commands

by Karl Semich

Hi, I've modified gr-osmosdr such that all devices respond to message commands ala USRP. I feel this is a really valuable addition, and I am happy to continue to work with it to meet any needs or desires. Please let me know that this e-mail was received. Thanks so much, Karl

5 years, 8 months

1
0
0 0

[PATCH] Add support for message commands

by Karl

Hi, I've modified gr-osmosdr such that all devices respond to message commands ala USRP. I feel this is a really valuable addition, and I am happy to continue to work with it to meet any needs or desires. Please let me know that this e-mail was received. Thanks so much, Karl

5 years, 8 months

1
0
0 0

[PATCH] Add API for releasing zero-copy USB buffers

by Karl Semich

Hi, I was trying to take advantage of the async zero-copy buffer feature in librtlsdr, but I found that the automatic resubmission of them made it hard to make use of them safely. This patch adds a couple function to manage buffers in a more advanced manner, so that latency and reuse can be tracked precisely. I also added some documentation. I can occasionally make a lot of mistakes, so if anybody has time to take a brief glance through, it would be really great. Karl

5 years, 8 months

1
0
0 0

[PATCH 0/3] Adds support for the AirspyHF+

by Kieren Rasmussen

This builds on the work started in gr-osmosdr-gqrx arispyhf branch by Alexandru Csete. Further adds support for all the gain stages within the Airspy. Kieren Rasmussen (3): - Added support for manual gain modes of AirspyHF+ - TODO support for AGC threshold level - Incorrect gain clipping when setting attenuation - Verified working with a git build of GQRX - Split the AirspyHF+ into a separate block in GRC with more relevant parameters exposed README | 1 + grc/CMakeLists.txt | 1 + grc/gen_airspyhf_blocks.py | 281 ++++++++++++++++++++++++++++++ grc/gen_osmosdr_blocks.py | 2 + lib/airspyhf/airspyhf_source_c.cc | 102 ++++++++++- lib/airspyhf/airspyhf_source_c.h | 9 + 6 files changed, 392 insertions(+), 4 deletions(-) create mode 100644 grc/gen_airspyhf_blocks.py -- 2.18.0

5 years, 8 months

1
3
0 0

Re: [PATCH] gr-osmosdr Microtelecom Perseus HF receiver support (II)

by Andrea Montefusco IW0HDV

Hi Dimitri, >> could you please provide a signed-off patch with your latest changes ongithub and a proper commit message? >> Feel free to add information to AUTHORS, README and the grc/gen_osmosdr_blocks.py files just like we did for other radios and ideally include a link where libperseus is hosted (I understand this is https://github.com/Microtelecom/libperseus-sdr ?). I added the infor requested and even tested the module under GRC (non only under GQRX that is the reason I developed the patch at start). Below you find the patch as per git command. *am* IW0HDV --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/airspy/airspy_source_c.cc | 5 +- lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 507 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 120 +++++++++ lib/rtl/rtl_source_c.cc | 2 +- lib/source_impl.cc | 18 +- 11 files changed, 727 insertions(+), 4 deletions(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 50150e5..02fc6ab 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -350,9 +350,10 @@ osmosdr::meta_range_t airspy_source_c::get_sample_rates() { osmosdr::meta_range_t range; - for (size_t i = 0; i < _sample_rates.size(); i++) + for (size_t i = 0; i < _sample_rates.size(); i++) { + std::cerr << "SR: [" << i << "]: " << _sample_rates[i].first << std::endl; range += osmosdr::range_t( _sample_rates[i].first ); - + } return range; } diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# 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. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..0720da4 --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,507 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * 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 <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_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 + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0) +{ + //int ret; + + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + //fprintf (stderr, "Revision: %s\n", git_revision); + //fprintf (stderr, "SAMPLE RATE: %d\n", sr); + //fprintf (stderr, "NBUF: %d BUF SIZE: %d TOTAL BUFFER LENGTH: %d\n", nb, bs, nb*bs); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, PERSEUS_ATT_0DB); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, true, false); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + + /* Push sample to the fifo */ + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_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]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + 1); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + return {}; +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return osmosdr::gain_range_t(); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_gain( double gain, size_t chan ) +{ + return gain; +} + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + return gain; +} + +double perseus_source_c::get_gain( size_t chan ) +{ + return 0.0; +} + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + return 0.0; +} + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += get_antenna( chan ); + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..9eda23d --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,120 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * This file is part of GNU Radio + * + * 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_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + 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 ); + 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 int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index a371464..eb7042e 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -221,7 +221,7 @@ rtl_source_c::rtl_source_c (const std::string &args) throw std::runtime_error("Failed to enable offset tuning."); } - ret = rtlsdr_set_bias_tee(_dev, bias_tee); +// ret = rtlsdr_set_bias_tee(_dev, bias_tee); if (ret < 0) throw std::runtime_error("Failed to set bias tee."); diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1 >From 1b6cf50a7a6074754717b0270757931c379561bc Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Thu, 1 Feb 2018 17:33:39 +0100 Subject: [PATCH 2/6] More hardware controls added (attenuator, ADC preamp and dither, preselector) --- lib/perseus/perseus_source_c.cc | 136 ++++++++++++++++++++++++++++++++++++---- lib/perseus/perseus_source_c.h | 19 +++++- 2 files changed, 142 insertions(+), 13 deletions(-) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 0720da4..89674b1 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -89,7 +89,11 @@ perseus_source_c::perseus_source_c (const std::string &args) _center_freq(0), _freq_corr(0), _frun(false), - _cnt(0) + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) { //int ret; @@ -174,9 +178,9 @@ perseus_source_c::perseus_source_c (const std::string &args) PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - perseus_set_attenuator_in_db(_dev, PERSEUS_ATT_0DB); + perseus_set_attenuator_in_db(_dev, _att_value); // Enable ADC Dither, Disable ADC Preamp - perseus_set_adc(_dev, true, false); + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); // set the NCO frequency in the middle of the range allowed set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); set_sample_rate( get_sample_rates().start() ); @@ -425,7 +429,7 @@ double perseus_source_c::set_center_freq( double freq, size_t chan ) ret = perseus_set_ddc_center_freq(_dev, (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), - 1); + _preselector == true ? 1:0); if ( ret == PERSEUS_NOERROR ) { _center_freq = freq; } else { @@ -453,55 +457,165 @@ double perseus_source_c::get_freq_corr( size_t chan ) std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) { - return {}; + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; } +// +// FIXME +// osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) { - return osmosdr::gain_range_t(); + return get_gain_range( "Attenuator", chan ); } osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) { + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + return osmosdr::gain_range_t(); } -double perseus_source_c::set_gain( double gain, size_t chan ) +double perseus_source_c::set_attenuator( double gain, size_t chan ) { + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } return gain; } -double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +double perseus_source_c::set_adc_dither( double gain, size_t chan ) { + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } return gain; } -double perseus_source_c::get_gain( size_t chan ) +double perseus_source_c::get_attenuator( size_t chan ) { - return 0.0; + return _att_value; } +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + double perseus_source_c::get_gain( const std::string & name, size_t chan ) { + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } return 0.0; } + + std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) { std::vector< std::string > antennas; - antennas += get_antenna( chan ); + antennas += "RX"; + antennas += "RX+PRESELECTOR"; return antennas; } std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) { + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } return get_antenna( chan ); } std::string perseus_source_c::get_antenna( size_t chan ) { + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; return "RX"; } diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h index 9eda23d..934ff2b 100644 --- a/lib/perseus/perseus_source_c.h +++ b/lib/perseus/perseus_source_c.h @@ -87,9 +87,20 @@ public: 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 ); - double set_gain( double gain, size_t chan = 0 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( 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 ); @@ -115,6 +126,10 @@ private: bool _frun; int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; }; #endif /* INCLUDED_PERSEUS_SOURCE_C_H */ -- 1.9.1 >From ff520c9d98d0bdeb9cf59cc092a08d54ced76af1 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Sat, 3 Feb 2018 08:55:32 +0100 Subject: [PATCH 3/6] files not enclosed in patch restored --- lib/airspy/airspy_source_c.cc | 5 ++--- lib/rtl/rtl_source_c.cc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc index 02fc6ab..50150e5 100644 --- a/lib/airspy/airspy_source_c.cc +++ b/lib/airspy/airspy_source_c.cc @@ -350,10 +350,9 @@ osmosdr::meta_range_t airspy_source_c::get_sample_rates() { osmosdr::meta_range_t range; - for (size_t i = 0; i < _sample_rates.size(); i++) { - std::cerr << "SR: [" << i << "]: " << _sample_rates[i].first << std::endl; + for (size_t i = 0; i < _sample_rates.size(); i++) range += osmosdr::range_t( _sample_rates[i].first ); - } + return range; } diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc index eb7042e..a371464 100644 --- a/lib/rtl/rtl_source_c.cc +++ b/lib/rtl/rtl_source_c.cc @@ -221,7 +221,7 @@ rtl_source_c::rtl_source_c (const std::string &args) throw std::runtime_error("Failed to enable offset tuning."); } -// ret = rtlsdr_set_bias_tee(_dev, bias_tee); + ret = rtlsdr_set_bias_tee(_dev, bias_tee); if (ret < 0) throw std::runtime_error("Failed to set bias tee."); -- 1.9.1 >From a195b8a7eb328ed7c0b31a1e4aa077e11789f648 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Sat, 3 Feb 2018 10:25:27 +0100 Subject: [PATCH 4/6] Microtelecom Perseus HF receiver support --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 613 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 135 ++++++++ lib/source_impl.cc | 18 +- 9 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# 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. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..bf7c9be --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,613 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * 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 <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_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 + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) +{ + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, _att_value); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + // Push sample to the fifo + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_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]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + _preselector == true ? 1:0); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; +} + +// +// FIXME +// +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return get_gain_range( "Attenuator", chan ); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_attenuator( double gain, size_t chan ) +{ + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::set_adc_dither( double gain, size_t chan ) +{ + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::get_attenuator( size_t chan ) +{ + return _att_value; +} + +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } + return 0.0; +} + + + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += "RX"; + antennas += "RX+PRESELECTOR"; + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..55d3f89 --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,135 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * This file is part of GNU Radio + * + * 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_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + 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 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( size_t chan = 0 ); + + double set_gain( double gain, const std::string & name, 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 int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1 >From 9be9bfc531d793f0d3d728c361f0b7f520d5c991 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Tue, 27 Mar 2018 20:35:30 +0200 Subject: [PATCH 5/6] Avoid to throw exception when the new frequency is out of range; it happens when we are coming back to Perseus from wider range receivers --- lib/perseus/perseus_source_c.cc | 76 ++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 89674b1..faab51d 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -103,15 +103,15 @@ perseus_source_c::perseus_source_c (const std::string &args) // Set debug info dumped to stderr to the maximum verbose level perseus_set_debug(3); - + //fprintf (stderr, "Revision: %s\n", git_revision); //fprintf (stderr, "SAMPLE RATE: %d\n", sr); //fprintf (stderr, "NBUF: %d BUF SIZE: %d TOTAL BUFFER LENGTH: %d\n", nb, bs, nb*bs); - + // Check how many Perseus receivers are connected to the system int num_perseus = perseus_init(); std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; - + if (num_perseus==0) { perseus_exit(); PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); @@ -125,19 +125,19 @@ perseus_source_c::perseus_source_c (const std::string &args) if (int rc = perseus_firmware_download(_dev,NULL)<0) { PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); } - + // Dump some information about the receiver (S/N and HW rev) int flag; perseus_is_preserie(_dev, &flag); - if (flag != 0) + if (flag != 0) fprintf(stderr, "The device is a preserie unit"); else { eeprom_prodid prodid; - if (perseus_get_product_id(_dev,&prodid)<0) + if (perseus_get_product_id(_dev,&prodid)<0) fprintf(stderr, "get product id error: %s", perseus_errorstr()); else fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", - (uint16_t) prodid.sn, + (uint16_t) prodid.sn, (uint16_t) prodid.signature[5], (uint16_t) prodid.signature[4], (uint16_t) prodid.signature[3], @@ -146,18 +146,18 @@ perseus_source_c::perseus_source_c (const std::string &args) (uint16_t) prodid.signature[0], (uint16_t) prodid.hwrel, (uint16_t) prodid.hwver); - } + } // Printing all sampling rates available ..... { int buf[BUFSIZ]; - + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); } else { int i = 0; while (buf[i]) { fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); - + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); i++; } @@ -177,14 +177,14 @@ perseus_source_c::perseus_source_c (const std::string &args) std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - + perseus_set_attenuator_in_db(_dev, _att_value); // Enable ADC Dither, Disable ADC Preamp perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); // set the NCO frequency in the middle of the range allowed set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); set_sample_rate( get_sample_rates().start() ); - + _fifo = new boost::circular_buffer<gr_complex>(5000000); if (!_fifo) { throw std::runtime_error( std::string(__FUNCTION__) + " " + @@ -237,10 +237,10 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) size_t i, n_avail, to_copy, num_samples; uint8_t *samplebuf = (uint8_t*)buf; - + num_samples = buf_size/6; - if (buf_size % 6) + if (buf_size % 6) std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; iq_sample s; @@ -251,7 +251,7 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) to_copy = (n_avail < num_samples ? n_avail : num_samples); for (i = 0; i < to_copy; i++ ) { - + s.i1 = s.q1 = 0; s.i2 = *samplebuf++; s.i3 = *samplebuf++; @@ -259,16 +259,16 @@ int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) s.q2 = *samplebuf++; s.q3 = *samplebuf++; s.q4 = *samplebuf++; - + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range - + /* Push sample to the fifo */ _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); } // keep a counter of processed bytes _cnt += buf_size; - + _fifo_lock.unlock(); /* We have made some new samples available to the consumer in work() */ @@ -290,7 +290,7 @@ int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) perseus_source_c *obj = (perseus_source_c *)extra; return obj->perseus_rx_callback((float *)buf, buf_size); - + return 0; } @@ -301,8 +301,8 @@ bool perseus_source_c::start() if ( ! _dev ) return false; - - std::cerr << "***** START COUNTER: " << _cnt + + std::cerr << "***** START COUNTER: " << _cnt << " mod 6 " << (_cnt % 6) << std::endl; _frun = true; @@ -311,15 +311,15 @@ bool perseus_source_c::start() // re-set the sample rate each time the stream is started set_sample_rate( get_sample_rate() ); - ret = perseus_start_async_input(_dev, - 6 * 1024 * 2 /* buffer size */, + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, perseus_source_c::_perseus_rx_callback, (void *)this); if (ret != PERSEUS_NOERROR) { - std::cerr << "Failed to start RX streaming (" + std::cerr << "Failed to start RX streaming (" << ret << ")" << std::endl; - return false; - } else + return false; + } else return true; } @@ -330,15 +330,15 @@ bool perseus_source_c::stop() _frun = false; - std::cerr << "***** STOP COUNTER: " << _cnt + std::cerr << "***** STOP COUNTER: " << _cnt << " mod 6 " << (_cnt % 6) << std::endl; int ret = perseus_stop_async_input(_dev); if ( ret != PERSEUS_NOERROR ) { std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; - return false; - } else + return false; + } else return true; } @@ -375,7 +375,7 @@ std::vector<std::string> perseus_source_c::get_devices() std::string args = "perseus=0,label='Perseus'"; devices.push_back( args ); - + return devices; } @@ -390,7 +390,7 @@ osmosdr::meta_range_t perseus_source_c::get_sample_rates() for (size_t i = 0; i < _sample_rates.size(); i++) { range += osmosdr::range_t( _sample_rates[i].first ); - std::cerr << "SR: " << i << " : (" + std::cerr << "SR: " << i << " : (" << _sample_rates[i].first << ")" << std::endl; } return range; @@ -400,10 +400,10 @@ double perseus_source_c::set_sample_rate( double rate ) { int ret; if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { - PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); - } else + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else _sample_rate = rate; - + return get_sample_rate(); } @@ -426,9 +426,13 @@ double perseus_source_c::set_center_freq( double freq, size_t chan ) int ret; if (_dev) { - ret = + // avoid to crash when the frequency is out of range + if (freq > PERSEUS_DDC_FREQ_MAX) freq = PERSEUS_DDC_FREQ_MAX; + if (freq < PERSEUS_DDC_FREQ_MIN) freq = PERSEUS_DDC_FREQ_MIN; + + ret = perseus_set_ddc_center_freq(_dev, - (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), _preselector == true ? 1:0); if ( ret == PERSEUS_NOERROR ) { _center_freq = freq; -- 1.9.1 >From 38f121f6d823d7971262e0768ab2f8be9ec35e43 Mon Sep 17 00:00:00 2001 From: Andrea Montefusco IW0HDV <andrew(a)montefusco.com> Date: Tue, 21 Aug 2018 13:49:17 +0200 Subject: [PATCH 6/6] perseus: gr-osmosdr Microtelecom Perseus HF receiver support --- AUTHORS | 1 + MANIFEST.md | 1 + README | 2 ++ grc/gen_osmosdr_blocks.py | 6 +++++ lib/perseus/perseus_source_c.cc | 57 ++++++++++++++++++++++++++--------------- 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2fd882c..fd51a22 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,3 +7,4 @@ SDRplay Ltd. Pavel Demin Marcus Müller Lukas Lao Beyer +Andrea Montefusco IW0HDV <andrew(a)montefusco.com> diff --git a/MANIFEST.md b/MANIFEST.md index 9e19f5f..ad33c82 100644 --- a/MANIFEST.md +++ b/MANIFEST.md @@ -10,6 +10,7 @@ tags: - sdrplay - uhd - osmocom + - perseus author: - Dimitri Stolnikov <horiz0n(a)gmx.net> copyright_owner: diff --git a/README b/README index 67fa475..9ff3d5c 100644 --- a/README +++ b/README @@ -18,6 +18,8 @@ as well supports: * Fairwaves UmTRX through Fairwaves' fork of UHD * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com) * FreeSRP through libfreesrp + * Microtelecom Perseus HF receiver through libperseus-sdr + available in https://github.com/Microtelecom/libperseus-sdr/ By using the OsmoSDR block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware. diff --git a/grc/gen_osmosdr_blocks.py b/grc/gen_osmosdr_blocks.py index d1f2b1a..b7e33ef 100644 --- a/grc/gen_osmosdr_blocks.py +++ b/grc/gen_osmosdr_blocks.py @@ -219,6 +219,8 @@ While primarily being developed for the OsmoSDR hardware, this block as well sup * gnuradio .cfile input through libgnuradio-blocks * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option) * AirSpy Wideband Receiver through libairspy + * Microtelecom Perseus HF Receiver through libperseus-sdr + available in https://github.com/Microtelecom/libperseus-sdr/ #end if #if $sourk == 'sink': * gnuradio .cfile output through libgnuradio-blocks @@ -260,6 +262,7 @@ Lines ending with ... mean it's possible to bind devices together by specifying cloudiq=127.0.0.1[:50000] sdr-iq=/dev/ttyUSB0 airspy=0[,bias=0|1][,linearity][,sensitivity] + perseus=0[,attenuator=0|-10|-20|-30][,wideband[0|1]][,adcpreamp=0|1][,adcdither=0|1] #end if #if $sourk == 'sink': file='/path/to/your file',rate=1e6[,freq=100e6][,append=true][,throttle=true] ... @@ -474,6 +477,9 @@ if __name__ == '__main__': elif tail.startswith('osmosdr'): title = 'osmocom' prefix = 'osmosdr' + elif tail.startswith('perseus'): + title = 'Perseus' + prefix = 'perseus' else: raise Exception, 'file %s has wrong syntax!'%tail if tail.endswith ('source.xml'): diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc index 3a388d5..4a8f12d 100644 --- a/lib/perseus/perseus_source_c.cc +++ b/lib/perseus/perseus_source_c.cc @@ -175,18 +175,36 @@ perseus_source_c::perseus_source_c (const std::string &args) PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); } - perseus_set_attenuator_in_db(_dev, _att_value); - // Enable ADC Dither, Disable ADC Preamp - perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); - // set the NCO frequency in the middle of the range allowed - set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); - set_sample_rate( get_sample_rates().start() ); - _fifo = new boost::circular_buffer<gr_complex>(5000000); if (!_fifo) { throw std::runtime_error( std::string(__FUNCTION__) + " " + "Failed to allocate a sample FIFO!" ); } + + int nav = -1; + //perseus=0[,attenuator=0|-10|-20|-30][,wideband[0|1]][,adcpreamp=0|1][,adcdither=0|1] + if ( dict.count( "attenuator" ) ) + nav = -(boost::lexical_cast< int >( dict["attenuator"] )); + if ( dict.count( "preselector" ) ) + _preselector = ( boost::lexical_cast< int > ( dict["preselector"] ) == 1 ); + if ( dict.count( "adcpreamp" ) ) + _adc_preamp = boost::lexical_cast< int >( dict["adcpreamp"] ); + if ( dict.count( "adcdither" ) ) + _adc_dither = boost::lexical_cast< int >( dict["adcdither"] ); + + + // attenuator + if (nav != -1) { + std::cerr << "perseus_set_attenuator_in_db: new value: " << nav << " old value: " << _att_value << std::endl; + perseus_set_attenuator_in_db(_dev, nav); + _att_value = nav; + } + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + // and, implicitly, the preselector status + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); } /* @@ -465,12 +483,9 @@ std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) return names; } -// -// FIXME -// osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) { - return get_gain_range( "Attenuator", chan ); + return osmosdr::gain_range_t( -30, +7, 1 ); } osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) @@ -491,16 +506,12 @@ osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name double perseus_source_c::set_attenuator( double gain, size_t chan ) { - int ret; - gain = - gain; if (_dev && _att_value != gain) { - ret = perseus_set_attenuator_in_db (_dev, gain); - - if ( PERSEUS_NOERROR == ret ) { + if ( PERSEUS_NOERROR == perseus_set_attenuator_in_db (_dev, gain) ) { _att_value = gain; } else { - std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + std::cerr << "ERROR: perseus_set_attenuator_in_db: new value was: " << gain << std::endl; } } @@ -600,21 +611,25 @@ std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) { + std::cerr << "perseus_source_c::set_antenna: preselector: " << _preselector << "ch: " << chan << std::endl; + if ( antenna == "RX" ) { _preselector = false; set_center_freq( get_center_freq() ); - return "RX"; + return get_antenna(chan); } if ( antenna == "RX+PRESELECTOR" ) { _preselector = true; set_center_freq( get_center_freq() ); - return "RX+PRESELECTOR"; + return get_antenna(chan); } - return get_antenna( chan ); + return get_antenna( chan ); } std::string perseus_source_c::get_antenna( size_t chan ) { std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; - return "RX"; + + if (_preselector == false ) return "RX"; + else return "RX+PRESELECTOR"; } -- 1.9.1

5 years, 8 months

1
0
0 0

Non Graphical Use of gnuradio Tools

by Martin McCormick

If there is a better mailing list for the following question, I will gladly take it there. I want to use as much of the gnu radio project as practical but the graphical way to string various modules together isn't terribly useful for computer users who happen to be blind. Unix and to a lesser degree, DOS handled input and output logic elegantly with <, >, | and even tee when one sends output to multiple files and unix just turned 50 this Summer so it's doing something right. Is there any kind of text-based way to string those python GNU modules together to cause them to work as they do when connected using GRC? This could very well be a dumb question as I have only scratched at python a few years ago and what I am talking about may be similar to a Makefile which is what you use to refer to a bunch of C modules that might be in a program. Anyway, I sure hope there is something else out there that accomplishes the same job. I have played with the Realtek, RTL2838UHIDIR and it does surprisingly well on analog signals so it's time to string some of those modules together and try some digital decoding. Thanks for any and all constructive suggestions. Martin McCormick WB5AGZ

5 years, 9 months

2
1
0 0

sdrplay2: Which changes to merge?

by horizon

trying to figure out what patches to merge for sdrplay2 suppoort. So far i've received the following sources: Frank's patch by email on 06/30/18 https://github.com/willcode/gr-osmosdr/tree/sdrplay2 <https://github.com/willcode/gr-osmosdr/tree/sdrplay2>https://github.com/SDRplay/gr-osmosdr/tree/sdrplay2 Could you please comment on whats the most recent and correct state to apply? Thanks a lot! Best regards, Dimitri

5 years, 9 months

3
2
0 0

[PATCH] gr-osmosdr Microtelecom Perseus HF receiver support (II)

by andrea.montefusco＠gmail.com

Second attempt: I removed all the changes not related to Perseus. @Sylvain: thanks for take time to review. --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 613 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 135 ++++++++ lib/source_impl.cc | 18 +- 9 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# 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. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..bf7c9be --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,613 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * 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 <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_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 + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) +{ + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, _att_value); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + // Push sample to the fifo + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_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]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + _preselector == true ? 1:0); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; +} + +// +// FIXME +// +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return get_gain_range( "Attenuator", chan ); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_attenuator( double gain, size_t chan ) +{ + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::set_adc_dither( double gain, size_t chan ) +{ + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::get_attenuator( size_t chan ) +{ + return _att_value; +} + +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } + return 0.0; +} + + + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += "RX"; + antennas += "RX+PRESELECTOR"; + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..55d3f89 --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,135 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * This file is part of GNU Radio + * + * 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_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + 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 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( size_t chan = 0 ); + + double set_gain( double gain, const std::string & name, 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 int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1

5 years, 9 months

3
2
0 0

USING MINI DIGITAL TV STICK RTL2832U 820T2 & SDR ON GRC

by Andres Campos Santana

Good afternoon everyone. I write here to see if any of you know that installation errors I may have had to use the r820t2 in gnu radio companion. I'm trying to make an FM receiver and other analog TV receiver but when running the program does not receive any type of signal and the view errors, I have: devices not supported. I believe that this is some driver to be installed but I don't know where or how. The steps that I have followed for installation (Ubuntu 16.04 LTS) have been: 1. Install gnuradio. 2. Install Xenial Xerius specifications (it is supposed to do I need for my version of Ubuntu). I3. nstall specifications of gr-osmosdr to enable some features of the chip. The Stick comes with a CD but i do not know how to install it since, according to the specifications only works for WXP, 2000, Vista, 7 and 8; and it is something that it seems strange to me since I have seen videos where they use this same model of stick to carry out projects in Gnuradio on Ubuntu. I tried with this: sudo apt-get update sudo apt-get install git sudo apt-get install cmake sudo apt-get install build-essential sudo apt-get install libusb-1.0-0-dev git clone git://git.osmocom.org/rtl-sdr.git cd rtl-sdr/ mkdir build cd build cmake ../ -DINSTALL_UDEV_RULES=ON make sudo make install sudo ldconfig sudo cp ../rtl-sdr.rules /etc/udev/rules.d/ Opening /etc/modprobe.d folder Creating a new file 'blacklist-rtl.conf' and add this one line: blacklist dvb_usb_rtl28xxu rtl_test -t I tried those commands but I do not know if I need to install something else because GNRC still says: "FATAL: No supported devices found to pick from"... Please, if any of you know that i need to install It would serve as much help as I am a novice programmer and i need to resolve this problem for my project. Enviado desde Outlook<http://aka.ms/weboutlook>

5 years, 9 months

1
0
0 0

Creating GPS indoors

by Mike Bishop

Hello, I hope you are well. I am looking to commission an array of GPS units that emulate the standard GPS. This is to provide positioning service indoors and underground in a large open space. Can you help with something like this? Kindest regards, Mike *Mike Bishop* Operations Director Spider UAS Operations Ltd CAA Authorised UAV Operator M: 07801 450 392 ***SHOWREEL*** <http://t.sidekickopen08.com/e1t/c/5/f18dQhb0S7lC8dDMPbW2n0x6l2B9nMJW7t5XZs4…> E: Mike(a)spideraerialfilming.com W: spideraerialfilming.com W: dronebuilders.co.uk Instagram: Spider_Drone <http://t.sidekickopen08.com/e1t/c/5/f18dQhb0S7lC8dDMPbW2n0x6l2B9nMJW7t5XZs4…>

5 years, 9 months

1
0
0 0

issues with osmo-trx-lms with LimeSDR

by baha sagar

Hello I'm trying to get the osmo-trx-lms to work with my LimeSDR. the setup is the latest version of LimeSDR and osmo-trx built from source with the command (./configure --with-lms) . I can see the device through LimeUtil but when I try the command it fails with the following error Info: SSE3 support compiled in and supported by CPU Info: SSE4.1 support compiled in and supported by CPU Sun Jul 29 07:01:27 2018 DLGLOBAL <0002> telnet_interface.c:104 telnet at 127.0.0.1 4237 Sun Jul 29 07:01:27 2018 DLCTRL <0009> control_if.c:887 CTRL at 127.0.0.1 4236 Config Settings Log Level… 3 Device args… TRX Base Port… 5700 TRX Address… 127.0.0.1 GSM BTS Address… 127.0.0.1 Channels… 1 Tx Samples-per-Symbol… 4 Rx Samples-per-Symbol… 4 EDGE support… 0 Reference… 0 C0 Filler Table… 1 Multi-Carrier… 0 Tuning offset… 0 RSSI to dBm offset… 0 Swap channels… 0 Tx Antennas… 'BAND1’ Rx Antennas… ‘LNAW’ Setting SCHED_RR priority(18) Sun Jul 29 07:01:27 2018 DMAIN <0000> osmo-trx.cpp:379 [tid=140014553808704] Config: Setting SCHED_RR failed I tried using the configuration file from the osmo-trx git url and the below file as well. both gave the same result. https://osmocom.org/attachments/3219/limesdr.cfg1 Any ideas? Thanks Bahaeddin Sagar

5 years, 9 months

2
1
0 0

SDRPlay patch no merge?

by Frank Werner-Krippendorf

Hi I just wanted to ask if there is something wrong with http://lists.osmocom.org/pipermail/osmocom-sdr/2018-June/001801.html <http://lists.osmocom.org/pipermail/osmocom-sdr/2018-June/001801.html> ? The patch is tested and I think it is better to have some working code in the repo instead of 3 year old incompatible & incomplete stuff that will confuse people!? Best regares Frank, HB9FXQ

5 years, 9 months

1
0
0 0

bias-T issue with rtl-sdr

by Michael Tatarinov

Hello I submitted a pull request on Github[1] which fixes bug with bias-T power. The bias-T voltage was staying on after rtl tools ended. This is dangerous and can lead to damage device. [1] https://github.com/steve-m/librtlsdr/pull/47

5 years, 10 months

1
0
0 0

[patch] performance improvement in gr-osmosdr (hackrf)

by Alain Carlucci

Hi, I have submitted a pull request on Github[1] which improves the performance of the hackrf source. With this patch the conversion int8_t -> float is done in realtime instead of looking up values in the "_lut" lookup table. In this way the compiler is able to generate AVX/SSE code (-O3 -march=native) to perform the conversion. In [2] you can find a benchmark to show the differences. Using -Ofast (or -O3) and -march=native I get ~2.8x using an Intel i7 (4th gen) and 3.1x on a Core i5 (6th gen). Gqrx with the patched library can play a WFM radio without any interruption even with just 3 buffers (option="hackrf=0,buffers=3"). Best regards, Alain [1] https://github.com/osmocom/gr-osmosdr/pull/14 [2] https://gist.github.com/carpikes/cad029c338605f70d9f687aeee447db4

5 years, 10 months

4
3
0 0

willcode/gr-osmosdr sdrplay2 requires API 2.13

by Jeff Long

For anyone using the willcode/gr-osmosdr sdrplay2 branch, the SDRplay API/SDK version 2.13 is now required. Previously, any 2.X version would work. There was a change to a function signature in 2.13, and since there aren't a lot of users of this branch, I decided not to sprinkle ifdefs around the code. Thanks to krippendorf for the fix.

5 years, 10 months

1
0
0 0

[PATCH] SDRPlay API breaking changes & support recent hardware / API v2.13+

by Frank Werner-Krippendorf

The current NONFREE SDRplay class is unusable with recent APIs, too many breaking API changes. This patch is tested with the current up-to-date API V2.13 diff --git a/lib/sdrplay/sdrplay_source_c.cc b/lib/sdrplay/sdrplay_source_c.cc index 9a9ee40..6f20d5f 100644 --- a/lib/sdrplay/sdrplay_source_c.cc +++ b/lib/sdrplay/sdrplay_source_c.cc @@ -1,9 +1,12 @@ /* -*- c++ -*- */ /* + * Copyright 2018 Frank Werner-Krippendorf <mail(a)hb9fxq.ch> + * Copyright 2018 Jeff Long <willcode4(a)gmail.com> * Copyright 2015 SDRplay Ltd <support(a)sdrplay.com> * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> * Copyright 2012 Steve Markgraf <steve(a)steve-m.de> * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) @@ -32,179 +35,159 @@ #include "sdrplay_source_c.h" #include <gnuradio/io_signature.h> #include "osmosdr/source.h" +#include "arg_helpers.h" #include <boost/assign.hpp> #include <boost/format.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> +#include <boost/chrono.hpp> -#include <stdexcept> #include <iostream> -#include <stdio.h> -#include <math.h> - -#include <mirsdrapi-rsp.h> - -#include "arg_helpers.h" +#include <mutex> #define MAX_SUPPORTED_DEVICES 4 -struct sdrplay_dev -{ - int gRdB; - double gain_dB; - double fsHz; - double rfHz; - mir_sdr_Bw_MHzT bwType; - mir_sdr_If_kHzT ifType; - int samplesPerPacket; - int maxGain; - int minGain; - int dcMode; -}; - using namespace boost::assign; -#define BYTES_PER_SAMPLE 4 // sdrplay device delivers 16 bit signed IQ data - // containing 12 bits of information +// Index by mir_sdr_Bw_MHzT +static std::vector<double> bandwidths = { + 0, // Dummy + 200e3, + 300e3, + 600e3, + 1536e3, + 5000e3, + 6000e3, + 7000e3, + 8000e3 +}; -#define SDRPLAY_AM_MIN 150e3 -#define SDRPLAY_AM_MAX 30e6 -#define SDRPLAY_FM_MIN 64e6 -#define SDRPLAY_FM_MAX 108e6 -#define SDRPLAY_B3_MIN 162e6 -#define SDRPLAY_B3_MAX 240e6 -#define SDRPLAY_B45_MIN 470e6 -#define SDRPLAY_B45_MAX 960e6 -#define SDRPLAY_L_MIN 1450e6 -#define SDRPLAY_L_MAX 1675e6 +// TODO - RSP1 lower freq is 10e3. +#define SDRPLAY_FREQ_MIN 1e3 +#define SDRPLAY_FREQ_MAX 2000e6 -#define SDRPLAY_MAX_BUF_SIZE 504 +static std::string hwName(int hwVer) +{ + if (hwVer == 1) + return "RSP1"; + if (hwVer == 2) + return "RSP2"; + if (hwVer == 255) + return "RSP1A"; + if (hwVer == 3) + return "RSPduo"; + return "UNK"; +} -/* - * Create a new instance of sdrplay_source_c and return - * a boost shared_ptr. This is effectively the public constructor. - */ sdrplay_source_c_sptr make_sdrplay_source_c (const std::string &args) { return gnuradio::get_initial_sptr(new sdrplay_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 +// 0 inputs, 1 output +static const int MIN_IN = 0; +static const int MAX_IN = 0; +static const int MIN_OUT = 1; +static const int MAX_OUT = 1; -/* - * The private constructor - */ sdrplay_source_c::sdrplay_source_c (const std::string &args) : gr::sync_block ("sdrplay_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(false), - _uninit(false), - _auto_gain(false) -{ - _dev = (sdrplay_dev_t *)malloc(sizeof(sdrplay_dev_t)); - if (_dev == NULL) - { - return; -} - _dev->fsHz = 2048e3; - _dev->rfHz = 200e6; - _dev->bwType = mir_sdr_BW_1_536; - _dev->ifType = mir_sdr_IF_Zero; - _dev->samplesPerPacket = 0; - _dev->dcMode = 0; - _dev->gRdB = 60; - set_gain_limits(_dev->rfHz); - _dev->gain_dB = _dev->maxGain - _dev->gRdB; + _auto_gain(true), + _gRdB(40), + _lna(0), + _bcastNotch(0), + _dabNotch(0), + _fsHz(2e6), + _decim(1), + _rfHz(100e6), + _bwType(mir_sdr_BW_1_536), + _ifType(mir_sdr_IF_Zero), + _loMode(mir_sdr_LO_Auto), + _dcMode(true), + _iqMode(true), + _buffer(NULL), + _streaming(false), + _flowgraphRunning(false), + _reinit(false) +{ + dict_t dict = params_to_dict(args); + if (dict.count("sdrplay")) { + _devIndex = boost::lexical_cast<unsigned int>(dict["sdrplay"]); + } + else { + _devIndex = 0; + } + + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); + if (((_devIndex+1 > numDevices) || !mirDevices[_devIndex].devAvail)) { + std::cerr << "Failed to open SDRplay device " + std::to_string(_devIndex) << std::endl; + throw std::runtime_error("Failed to open SDRplay device " + std::to_string(_devIndex)); + } + + for (int i; i < numDevices; i++) { + std::cerr << "RSP devIndex: [" << i << "] hwVer: " << hwName(mirDevices[i].hwVer) << " SerNo: " << mirDevices[i].SerNo + << std::endl;; + } + + _hwVer = mirDevices[_devIndex].hwVer; + + int debug = 0; + if (dict.count("debug") && (boost::lexical_cast<int>(dict["debug"]) != 0)) + debug = 1; + mir_sdr_DebugEnable(debug); + + if (_hwVer == 2) { + _antenna = "A"; +} + else { + _antenna = "RX"; + } - _bufi.reserve(SDRPLAY_MAX_BUF_SIZE); - _bufq.reserve(SDRPLAY_MAX_BUF_SIZE); - - _buf_mutex.lock(); - _buf_offset = 0; - _buf_mutex.unlock(); + // bias=[0|1] to turn [off|on] bias tee. Default is off. + _biasT = 0; + if (dict.count("bias")) { + _biasT = boost::lexical_cast<int>(dict["bias"]); + } + + // lo=[120|144|168] to set first LO to 120/144/168 MHz. Default is Auto. + if (dict.count("lo")) { + int loMode = boost::lexical_cast<int>(dict["lo"]); + if (loMode == 120) + _loMode = mir_sdr_LO_120MHz; + else if (loMode == 144) + _loMode = mir_sdr_LO_144MHz; + else if (loMode == 168) + _loMode = mir_sdr_LO_168MHz; + } } -/* - * Our virtual destructor. - */ sdrplay_source_c::~sdrplay_source_c () { - free(_dev); - _dev = NULL; - _buf_mutex.lock(); - if (_running) - { - _running = false; + if (_streaming) { + stopStreaming(); } - _uninit = true; - _buf_mutex.unlock(); } -void sdrplay_source_c::reinit_device() -{ - std::cerr << "reinit_device started" << std::endl; - _buf_mutex.lock(); - std::cerr << "after mutex.lock" << std::endl; - if (_running) - { - std::cerr << "mir_sdr_Uninit started" << std::endl; - mir_sdr_Uninit(); - } - - std::cerr << "mir_sdr_Init started" << std::endl; - mir_sdr_Init(_dev->gRdB, _dev->fsHz / 1e6, _dev->rfHz / 1e6, _dev->bwType, _dev->ifType, &_dev->samplesPerPacket); - - if (_dev->dcMode) +bool sdrplay_source_c::start(void) { - std::cerr << "mir_sdr_SetDcMode started" << std::endl; - mir_sdr_SetDcMode(4, 1); - } - - _buf_offset = 0; - _buf_mutex.unlock(); - std::cerr << "reinit_device end" << std::endl; + boost::mutex::scoped_lock lock(_bufferMutex); + _flowgraphRunning = true; + return true; } -void sdrplay_source_c::set_gain_limits(double freq) +bool sdrplay_source_c::stop(void) { - if (freq <= SDRPLAY_AM_MAX) - { - _dev->minGain = -4; - _dev->maxGain = 98; - } - else if (freq <= SDRPLAY_FM_MAX) - { - _dev->minGain = 1; - _dev->maxGain = 103; - } - else if (freq <= SDRPLAY_B3_MAX) - { - _dev->minGain = 5; - _dev->maxGain = 107; - } - else if (freq <= SDRPLAY_B45_MAX) - { - _dev->minGain = 9; - _dev->maxGain = 94; - } - else if (freq <= SDRPLAY_L_MAX) - { - _dev->minGain = 24; - _dev->maxGain = 105; - } + boost::mutex::scoped_lock lock(_bufferMutex); + _flowgraphRunning = false; + // FG may be modified, so assume copied pointer is invalid + _buffer = NULL; + return true; } int sdrplay_source_c::work( int noutput_items, @@ -212,186 +195,311 @@ int sdrplay_source_c::work( int noutput_items, gr_vector_void_star &output_items ) { gr_complex *out = (gr_complex *)output_items[0]; - int cnt = noutput_items; - unsigned int sampNum; - int grChanged; - int rfChanged; - int fsChanged; - if (_uninit) - { - return WORK_DONE; - } + if (!_streaming) + startStreaming(); - if (!_running) { - reinit_device(); - _running = true; + boost::mutex::scoped_lock lock(_bufferMutex); + _buffer = out; + _bufferSpaceRemaining = noutput_items; + _bufferOffset = 0; + _bufferReady.notify_one(); + + while (_buffer && _streaming) { + _bufferReady.wait(lock); + } + } + + if (!_streaming) { + return 0; } - _buf_mutex.lock(); + return noutput_items - _bufferSpaceRemaining; +} - if (_buf_offset) +// Called by sdrplay streamer thread when data is available +void sdrplay_source_c::streamCallback(short *xi, short *xq, + unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset) { - for (int i = _buf_offset; i < _dev->samplesPerPacket; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - cnt -= (_dev->samplesPerPacket - _buf_offset); - } + unsigned int i = 0; + _reinit = false; - while ((cnt - _dev->samplesPerPacket) >= 0) - { - mir_sdr_ReadPacket(_bufi.data(), _bufq.data(), &sampNum, &grChanged, &rfChanged, &fsChanged); - for (int i = 0; i < _dev->samplesPerPacket; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - cnt -= _dev->samplesPerPacket; - } + boost::mutex::scoped_lock lock(_bufferMutex); - _buf_offset = 0; - if (cnt) - { - mir_sdr_ReadPacket(_bufi.data(), _bufq.data(), &sampNum, &grChanged, &rfChanged, &fsChanged); - for (int i = 0; i < cnt; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - _buf_offset = cnt; + while (i < numSamples) { + + // Discard samples if not streaming, if flowgraph not running, or reinit needed. + if (!_streaming || _reinit || !_flowgraphRunning) + return; + + // While buffer is not ready for write, wait a short time. + while (!_buffer) { + if (boost::cv_status::timeout == + _bufferReady.wait_for(lock, boost::chrono::milliseconds(250))) + return; + } + + // Copy until out of samples or buffer is full + while ((i < numSamples) && (_bufferSpaceRemaining > 0)) { + _buffer[_bufferOffset] = + gr_complex(float(xi[i]) / 32768.0, float(xq[i]) / 32768.0); + + i++; + _bufferOffset++; + _bufferSpaceRemaining--; } - _buf_mutex.unlock(); - return noutput_items; + if (_bufferSpaceRemaining == 0) { + _buffer = NULL; + _bufferReady.notify_one(); + } + } +} + +// Callback wrapper +void sdrplay_source_c::streamCallbackWrap(short *xi, short *xq, + unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset, unsigned int hwRemoved, + void *cbContext) +{ + sdrplay_source_c *obj = (sdrplay_source_c *)cbContext; + obj->streamCallback(xi, xq, + firstSampleNum, + grChanged, rfChanged, fsChanged, + numSamples, reset); +} + +// Called by strplay streamer thread when gain reduction is changed. +void sdrplay_source_c::gainChangeCallback(unsigned int gRdB, + unsigned int lnaGRdB) +{ + mir_sdr_GainValuesT gainVals; + + mir_sdr_GetCurrentGain(&gainVals); + + if (gRdB < 200) + { + std::cerr << "GR change, BB+MIX -" << gRdB << "dB, LNA -" << lnaGRdB << std::endl; + } + + if (gRdB < mir_sdr_GAIN_MESSAGE_START_ID) + { + // gainVals.curr is a calibrated gain value + } + else if (gRdB == mir_sdr_ADC_OVERLOAD_DETECTED) + { + mir_sdr_GainChangeCallbackMessageReceived(); + // OVERLOAD DETECTED + } + else + { + mir_sdr_GainChangeCallbackMessageReceived(); + // OVERLOAD CORRECTED + } +} + +// Callback wrapper +void sdrplay_source_c::gainChangeCallbackWrap(unsigned int gRdB, + unsigned int lnaGRdB, + void *cbContext) +{ + sdrplay_source_c *obj = (sdrplay_source_c *)cbContext; + obj->gainChangeCallback(gRdB, lnaGRdB); +} + +void sdrplay_source_c::startStreaming(void) +{ + if (_streaming) + return; + + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; + mir_sdr_ReleaseDeviceIdx(); + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); + mir_sdr_SetDeviceIdx(_devIndex); + + std::cerr << "Using SDRplay " << hwName(_hwVer) << " " + << mirDevices[_devIndex].SerNo << std::endl; + + // Set bias voltage on/off (RSP1A/RSP2). + std::cerr << "Bias voltage: " << _biasT << std::endl; + if (_hwVer == 2) + mir_sdr_RSPII_BiasTControl(_biasT); + else if (_hwVer == 255) + mir_sdr_rsp1a_BiasT(_biasT); + + // Set first LO frequency + mir_sdr_SetLoMode(_loMode); + + _streaming = true; + + set_gain_mode(get_gain_mode(/*channel*/ 0), /*channel*/ 0); + + int gRdB = _gRdB; + int gRdBsystem = 0; + + mir_sdr_StreamInit(&gRdB, + _fsHz / 1e6, + _rfHz / 1e6, + _bwType, + _ifType, + checkLNA(_lna), + &gRdBsystem, + mir_sdr_USE_RSP_SET_GR, + &_samplesPerPacket, + &streamCallbackWrap, + &gainChangeCallbackWrap, + this); + + // Set decimation with halfband filter + mir_sdr_DecimateControl(_decim != 1, _decim, 1); + + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); + + // Model-specific initialization + if (_hwVer == 2) { + set_antenna(get_antenna(), 0); + mir_sdr_RSPII_RfNotchEnable(_bcastNotch); + } + + else if (_hwVer == 255) { + mir_sdr_rsp1a_BroadcastNotch(_bcastNotch); + mir_sdr_rsp1a_DabNotch(_dabNotch); + } +} + +void sdrplay_source_c::stopStreaming(void) +{ + if (!_streaming) + return; + + _streaming = false; + + mir_sdr_StreamUninit(); + mir_sdr_ReleaseDeviceIdx(); +} + +void sdrplay_source_c::reinitDevice(int reason) +{ + // If no reason given, reinit everything + if (reason == (int)mir_sdr_CHANGE_NONE) + reason = (mir_sdr_CHANGE_GR | + mir_sdr_CHANGE_FS_FREQ | + mir_sdr_CHANGE_RF_FREQ | + mir_sdr_CHANGE_BW_TYPE | + mir_sdr_CHANGE_IF_TYPE | + mir_sdr_CHANGE_LO_MODE | + mir_sdr_CHANGE_AM_PORT); + + int gRdB; + int gRdBsystem; // Returned overall system gain reduction + + gRdB = _gRdB; + + // Tell stream CB to return + _reinit = true; + + mir_sdr_Reinit(&gRdB, + _fsHz / 1e6, + _rfHz / 1e6, + _bwType, + _ifType, + _loMode, + checkLNA(_lna), + &gRdBsystem, + mir_sdr_USE_RSP_SET_GR, + &_samplesPerPacket, + (mir_sdr_ReasonForReinitT)reason + ); + + // Set decimation with halfband filter + if (reason & (int)mir_sdr_CHANGE_FS_FREQ) + mir_sdr_DecimateControl(_decim != 1, _decim, 1); + + _bufferReady.notify_one(); } std::vector<std::string> sdrplay_source_c::get_devices() { + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; std::vector<std::string> devices; - std::cerr << "get_devices started" << std::endl; - - unsigned int dev_cnt = 0; - int samplesPerPacket; - while(mir_sdr_Init(60, 2.048, 200.0, mir_sdr_BW_1_536, mir_sdr_IF_Zero, &samplesPerPacket) == mir_sdr_Success) - { - dev_cnt++; - } - std::cerr << "Device count: " << dev_cnt << std::endl; + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); - for (unsigned int i = 0; i < dev_cnt; i++) - { - mir_sdr_Uninit(); - std::string args = "sdrplay=" + boost::lexical_cast< std::string >( i ); - args += ",label='" + std::string("SDRplay RSP") + "'"; + for (unsigned int i=0; i<numDevices; i++) { + mir_sdr_DeviceT *dev = &mirDevices[i]; + if (!dev->devAvail) + continue; + std::string args = boost::str(boost::format("sdrplay=%d,label='SDRplay %s %s'") + % i % hwName((int)dev->hwVer) % dev->SerNo ); std::cerr << args << std::endl; devices.push_back( args ); } - std::cerr << "get_devices end" << std::endl; return devices; } size_t sdrplay_source_c::get_num_channels() { - std::cerr << "get_num_channels: 1" << std::endl; return 1; } osmosdr::meta_range_t sdrplay_source_c::get_sample_rates() { osmosdr::meta_range_t range; - - range += osmosdr::range_t( 2000e3, 12000e3 ); - + range += osmosdr::range_t( 62.5e3, 10e6 ); return range; } double sdrplay_source_c::set_sample_rate(double rate) { - std::cerr << "set_sample_rate start" << std::endl; - double diff = rate - _dev->fsHz; - _dev->fsHz = rate; + rate = std::min( std::max(rate,62.5e3), 10e6 ); + _fsHz = rate; - std::cerr << "rate = " << rate << std::endl; - std::cerr << "diff = " << diff << std::endl; - if (_running) - { - if (fabs(diff) < 10000.0) - { - std::cerr << "mir_sdr_SetFs started" << std::endl; - mir_sdr_SetFs(diff, 0, 0, 0); - } - else - { - std::cerr << "reinit_device started" << std::endl; - reinit_device(); + // Decimation is required for rates below 2MS/s + _decim = 1; + while (_fsHz < 2e6) { + _decim *= 2; + _fsHz *= 2; } - } - std::cerr << "set_sample_rate end" << std::endl; + + if (_streaming) + reinitDevice((int)mir_sdr_CHANGE_FS_FREQ); return get_sample_rate(); } double sdrplay_source_c::get_sample_rate() { - if (_running) - { - return _dev->fsHz; - } - -// return 0; - return _dev->fsHz; + return _fsHz/_decim; } osmosdr::freq_range_t sdrplay_source_c::get_freq_range( size_t chan ) { osmosdr::freq_range_t range; - - range += osmosdr::range_t( SDRPLAY_AM_MIN, SDRPLAY_AM_MAX ); /* LW/MW/SW (150 kHz - 30 MHz) */ - range += osmosdr::range_t( SDRPLAY_FM_MIN, SDRPLAY_FM_MAX ); /* VHF Band II (64 - 108 MHz) */ - range += osmosdr::range_t( SDRPLAY_B3_MIN, SDRPLAY_B3_MAX ); /* Band III (162 - 240 MHz) */ - range += osmosdr::range_t( SDRPLAY_B45_MIN, SDRPLAY_B45_MAX ); /* Band IV/V (470 - 960 MHz) */ - range += osmosdr::range_t( SDRPLAY_L_MIN, SDRPLAY_L_MAX ); /* L-Band (1450 - 1675 MHz) */ - + range += osmosdr::range_t(SDRPLAY_FREQ_MIN, SDRPLAY_FREQ_MAX); return range; } double sdrplay_source_c::set_center_freq( double freq, size_t chan ) { - std::cerr << "set_center_freq start" << std::endl; - std::cerr << "freq = " << freq << std::endl; - double diff = freq - _dev->rfHz; - std::cerr << "diff = " << diff << std::endl; - _dev->rfHz = freq; - set_gain_limits(freq); - if (_running) - { - if (fabs(diff) < 10000.0) - { - std::cerr << "mir_sdr_SetRf started" << std::endl; - mir_sdr_SetRf(diff, 0, 0); - } - else - { - std::cerr << "reinit_device started" << std::endl; - reinit_device(); - } + _rfHz = freq; + + if (_streaming) { + reinitDevice((int)mir_sdr_CHANGE_RF_FREQ); } - std::cerr << "set_center_freq end" << std::endl; return get_center_freq( chan ); } double sdrplay_source_c::get_center_freq( size_t chan ) { - if (_running) - { - return _dev->rfHz; - } - -// return 0; - return _dev->rfHz; + return _rfHz; } double sdrplay_source_c::set_freq_corr( double ppm, size_t chan ) @@ -408,7 +516,15 @@ std::vector<std::string> sdrplay_source_c::get_gain_names( size_t chan ) { std::vector< std::string > gains; - gains += "LNA_MIX_BB"; + gains += "LNA_ATTEN_STEP"; + gains += "IF_ATTEN_DB"; + + // RSP1A and RSP2 have broadcast notch filters, and RSP1A has a DAB + // notch filter. Show all controls for all models, mainly because + // gqrx gets confused when switching between sources with different + // sets of gains. + gains += "BCAST_NOTCH"; + gains += "DAB_NOTCH"; return gains; } @@ -417,32 +533,60 @@ osmosdr::gain_range_t sdrplay_source_c::get_gain_range( size_t chan ) { osmosdr::gain_range_t range; - for (int i = _dev->minGain; i < _dev->maxGain; i++) - { + for (int i = 20; i <= 59; i++) range += osmosdr::range_t( (float)i ); - } return range; } osmosdr::gain_range_t sdrplay_source_c::get_gain_range( const std::string & name, size_t chan ) { - return get_gain_range( chan ); + osmosdr::gain_range_t range; + int maxLnaState; + + if (name == "LNA_ATTEN_STEP") { + if (_hwVer == 2) + maxLnaState = 8; + else if (_hwVer == 255) + maxLnaState = 9; + else + maxLnaState = 3; + for (int i = 0; i <= maxLnaState; i++) + range += osmosdr::range_t((float)i); + } + // RSP1A, RSP2 + else if (name == "BCAST_NOTCH") { + range += osmosdr::range_t((float)0); + if (_hwVer == 2 || _hwVer == 255) + range += osmosdr::range_t((float)1); + } + // RSP1A + else if (name == "DAB_NOTCH") { + range += osmosdr::range_t((float)0); + if (_hwVer == 255) + range += osmosdr::range_t((float)1); + } + else { + for (int i = 20; i <= 59; i++) + range += osmosdr::range_t((float)i); + } + + return range; } bool sdrplay_source_c::set_gain_mode( bool automatic, size_t chan ) { - std::cerr << "set_gain_mode started" << std::endl; _auto_gain = automatic; - std::cerr << "automatic = " << automatic << std::endl; - if (automatic) - { - /* Start AGC */ - std::cerr << "AGC not yet implemented" << std::endl; + if (_streaming) { + if (automatic) { + mir_sdr_AgcControl(mir_sdr_AGC_5HZ, -30, 0, 0, 0, 0, checkLNA(_lna)); + } + else { + mir_sdr_AgcControl(mir_sdr_AGC_DISABLE, -30, 0, 0, 0, 0, checkLNA(_lna)); + } } - std::cerr << "set_gain_mode end" << std::endl; - return get_gain_mode(chan); + return _auto_gain; } bool sdrplay_source_c::get_gain_mode( size_t chan ) @@ -450,151 +594,216 @@ bool sdrplay_source_c::get_gain_mode( size_t chan ) return _auto_gain; } +int sdrplay_source_c::checkLNA(int lna) +{ + // Clip LNA reduction step. See table in API section 5.3. + if (_hwVer == 1) { + lna = std::min(3, lna); + } + else if (_hwVer == 255) { + if (_rfHz < 60000000) + lna = std::min(6, lna); + else if (_rfHz >= 1000000000) + lna = std::min(8, lna); + else + lna = std::min(9, lna); + } + else if (_hwVer == 2) { + if (_rfHz >= 420000000) + lna = std::min(5, lna); + else if (_rfHz < 60000000 && _antenna == "HIGHZ") + lna = std::min(4, lna); + else + lna = std::min(8, lna); + } + + return lna; +} + double sdrplay_source_c::set_gain( double gain, size_t chan ) { - std::cerr << "set_gain started" << std::endl; - _dev->gain_dB = gain; - std::cerr << "gain = " << gain << std::endl; - if (gain < _dev->minGain) + set_gain(gain, "IF_ATTEN_DB"); + return get_gain("IF_ATTEN_DB"); +} + +double sdrplay_source_c::set_gain(double gain, const std::string & name, size_t chan) { - _dev->gain_dB = _dev->minGain; + bool bcastNotchChanged = false; + bool dabNotchChanged = false; + bool gainChanged = false; + + if (name == "LNA_ATTEN_STEP") { + if (gain != _lna) + gainChanged = true; + _lna = int(gain); + } + else if (name == "IF_ATTEN_DB") { + // Ignore out-of-bounds values, since caller knows limits. (GQRX spurious calls). + if (gain >= 20.0 && gain <= 59.0 && gain != _gRdB) { + gainChanged = true; + _gRdB = int(gain); + } + } + // RSP1A, RSP2 + else if (name == "BCAST_NOTCH" && (_hwVer == 2 || _hwVer == 255)) { + if (int(gain) != _bcastNotch) + bcastNotchChanged = true; + _bcastNotch = int(gain); + } + // RSP1A + else if (name == "DAB_NOTCH" && _hwVer == 255) { + if (int(gain) != _dabNotch) + dabNotchChanged = true; + _dabNotch = int(gain); } - if (gain > _dev->maxGain) - { - _dev->gain_dB = _dev->maxGain; + + if (_streaming) { + if (gainChanged) + mir_sdr_RSP_SetGr(_gRdB, checkLNA(_lna), 1 /*absolute*/, 0 /*immediate*/); + + if (bcastNotchChanged) { + if (_hwVer == 255 ) { + mir_sdr_rsp1a_BroadcastNotch(_bcastNotch); } - _dev->gRdB = (int)(_dev->maxGain - gain); + else if (_hwVer == 2) { + mir_sdr_RSPII_RfNotchEnable(_bcastNotch); + } + } - if (_running) - { - std::cerr << "mir_sdr_SetGr started" << std::endl; - mir_sdr_SetGr(_dev->gRdB, 1, 0); + if (dabNotchChanged) { + mir_sdr_rsp1a_DabNotch(_dabNotch); + } } -std::cerr << "set_gain end" << std::endl; return get_gain( chan ); } -double sdrplay_source_c::set_gain( double gain, const std::string & name, size_t chan) -{ - return set_gain( gain, chan ); -} - double sdrplay_source_c::get_gain( size_t chan ) { - if ( _running ) - { - return _dev->gain_dB; - } - -// return 0; - return _dev->gain_dB; + return get_gain("IF_ATTEN_DB"); } double sdrplay_source_c::get_gain( const std::string & name, size_t chan ) { - return get_gain( chan ); + if (name == "LNA_ATTEN_STEP") + return _lna; + else if (name == "BCAST_NOTCH") + return _bcastNotch; + else if (name == "DAB_NOTCH") + return _dabNotch; + else if (name == "IF_ATTEN_DB") + return _gRdB; + else + return 0; } std::vector< std::string > sdrplay_source_c::get_antennas( size_t chan ) { std::vector< std::string > antennas; - antennas += get_antenna( chan ); + if (_hwVer == 2) { + antennas += "A"; + antennas += "B"; + antennas += "HIGHZ"; + } + else { + antennas += "RX"; + } return antennas; } std::string sdrplay_source_c::set_antenna( const std::string & antenna, size_t chan ) { - return get_antenna( chan ); + _antenna = antenna; + + if (_streaming) { + if (_hwVer == 2) { + // HIGHZ is ANTENNA_B with AmPortSelect + if (antenna == "HIGHZ") { + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_B); + mir_sdr_AmPortSelect(1); + } + else { + if (antenna == "A") + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_A); + else + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_B); + mir_sdr_AmPortSelect(0); + } + + reinitDevice((int)mir_sdr_CHANGE_AM_PORT); + } + } + + return antenna; } std::string sdrplay_source_c::get_antenna( size_t chan ) { - return "RX"; + return _antenna.c_str(); } void sdrplay_source_c::set_dc_offset_mode( int mode, size_t chan ) { - if ( osmosdr::source::DCOffsetOff == mode ) - { - _dev->dcMode = 0; - if (_running) - { - mir_sdr_SetDcMode(4, 1); - } - } - else if ( osmosdr::source::DCOffsetManual == mode ) - { - std::cerr << "Manual DC correction mode is not implemented." << std::endl; - _dev->dcMode = 0; - if (_running) - { - mir_sdr_SetDcMode(4, 1); - } - } - else if ( osmosdr::source::DCOffsetAutomatic == mode ) - { - _dev->dcMode = 1; - if (_running) - { + _dcMode = (osmosdr::source::DCOffsetAutomatic == mode); + + if (_dcMode) { mir_sdr_SetDcMode(4, 1); + mir_sdr_SetDcTrackTime(63); } - } + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); } void sdrplay_source_c::set_dc_offset( const std::complex<double> &offset, size_t chan ) { - std::cerr << "Manual DC correction mode is not implemented." << std::endl; + std::cerr << "set_dc_offset(): not implemented" << std::endl; +} + +void sdrplay_source_c::set_iq_balance_mode(int mode, size_t chan) +{ + _iqMode = (osmosdr::source::IQBalanceAutomatic == mode); + + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); } double sdrplay_source_c::set_bandwidth( double bandwidth, size_t chan ) { - if (bandwidth <= 200e3) _dev->bwType = mir_sdr_BW_0_200; - else if (bandwidth <= 300e3) _dev->bwType = mir_sdr_BW_0_300; - else if (bandwidth <= 600e3) _dev->bwType = mir_sdr_BW_0_600; - else if (bandwidth <= 1536e3) _dev->bwType = mir_sdr_BW_1_536; - else if (bandwidth <= 5000e3) _dev->bwType = mir_sdr_BW_5_000; - else if (bandwidth <= 6000e3) _dev->bwType = mir_sdr_BW_6_000; - else if (bandwidth <= 7000e3) _dev->bwType = mir_sdr_BW_7_000; - else _dev->bwType = mir_sdr_BW_8_000; + _bwType = mir_sdr_BW_8_000; - if (_running) - { - reinit_device(); + for (double bw : bandwidths) { + // Skip dummy value at index 0 + if (bw == 0) + continue; + if (bandwidth <= bw) { + _bwType = (mir_sdr_Bw_MHzT)(bw/1e3); + break; + } + } + + int actual = get_bandwidth(chan); + std::cerr << "SDRplay bandwidth requested=" << bandwidth + << " actual=" << actual << std::endl; + + if (_streaming) { + reinitDevice((int)mir_sdr_CHANGE_BW_TYPE); } - return get_bandwidth( chan ); + return actual; } double sdrplay_source_c::get_bandwidth( size_t chan ) { - double tmpbw=0.0f; - if (_dev->bwType == mir_sdr_BW_0_200) tmpbw = 200e3; - else if (_dev->bwType == mir_sdr_BW_0_300) tmpbw = 300e3; - else if (_dev->bwType == mir_sdr_BW_0_600) tmpbw = 600e3; - else if (_dev->bwType == mir_sdr_BW_1_536) tmpbw = 1536e3; - else if (_dev->bwType == mir_sdr_BW_5_000) tmpbw = 5000e3; - else if (_dev->bwType == mir_sdr_BW_6_000) tmpbw = 6000e3; - else if (_dev->bwType == mir_sdr_BW_7_000) tmpbw = 7000e3; - else tmpbw = 8000e3; - - return (double)tmpbw; + return (double)_bwType * 1e3; } osmosdr::freq_range_t sdrplay_source_c::get_bandwidth_range( size_t chan ) { osmosdr::freq_range_t range; - range += osmosdr::range_t( 200e3 ); - range += osmosdr::range_t( 300e3 ); - range += osmosdr::range_t( 600e3 ); - range += osmosdr::range_t( 1536e3 ); - range += osmosdr::range_t( 5000e3 ); - range += osmosdr::range_t( 6000e3 ); - range += osmosdr::range_t( 7000e3 ); - range += osmosdr::range_t( 8000e3 ); + // bandwidths[0] is a dummy + for (unsigned int i=1; i<bandwidths.size(); i++) + range += osmosdr::range_t(bandwidths[i]); return range; -} +} \ No newline at end of file diff --git a/lib/sdrplay/sdrplay_source_c.h b/lib/sdrplay/sdrplay_source_c.h index 2e4631e..35de63b 100644 --- a/lib/sdrplay/sdrplay_source_c.h +++ b/lib/sdrplay/sdrplay_source_c.h @@ -1,5 +1,7 @@ /* -*- c++ -*- */ /* + * Copyright 2018 Frank Werner-Krippendorf <mail(a)hb9fxq.ch> + * Copyright 2018 Jeff Long <willcode4(a)gmail.com> * Copyright 2015 SDRplay Ltd <support(a)sdrplay.com> * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> * @@ -22,17 +24,21 @@ #define INCLUDED_SDRPLAY_SOURCE_C_H #include <gnuradio/sync_block.h> - #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> #include "osmosdr/ranges.h" #include "source_iface.h" +#include <mirsdrapi-rsp.h> + class sdrplay_source_c; -typedef struct sdrplay_dev sdrplay_dev_t; + +template <typename T> +struct Range { + T min; + T max; +}; /* * We use boost::shared_ptr's instead of raw pointers for all access @@ -82,6 +88,9 @@ public: gr_vector_const_void_star &input_items, gr_vector_void_star &output_items ); + bool start( void ); + bool stop( void ); + static std::vector< std::string > get_devices(); size_t get_num_channels( void ); @@ -112,25 +121,58 @@ public: void set_dc_offset_mode( int mode, size_t chan = 0 ); void set_dc_offset( const std::complex<double> &offset, size_t chan = 0 ); + void set_iq_balance_mode( int mode, size_t chan = 0 ); double set_bandwidth( double bandwidth, size_t chan = 0 ); double get_bandwidth( size_t chan = 0 ); osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ); private: - void reinit_device(void); - void set_gain_limits(double freq); - - sdrplay_dev_t *_dev; - - std::vector< short > _bufi; - std::vector< short > _bufq; - int _buf_offset; - boost::mutex _buf_mutex; + void startStreaming(void); + void stopStreaming(void); + void reallocateBuffers(int size, int num); + void reinitDevice(int reason); + int checkLNA(int lna); + void streamCallback(short *xi, short *xq, unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset); + void gainChangeCallback(unsigned int gRdB, unsigned int lnaGRdB); + + static void streamCallbackWrap(short *xi, short *xq, unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset, + unsigned int hwRemoved, void *cbContext); + static void gainChangeCallbackWrap(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext); - bool _running; - bool _uninit; bool _auto_gain; + int _gain; + int _gRdB; + int _lna; + int _bcastNotch; + int _dabNotch; + double _fsHz; + int _decim; + double _rfHz; + mir_sdr_Bw_MHzT _bwType; + mir_sdr_If_kHzT _ifType; + mir_sdr_LoModeT _loMode; + int _samplesPerPacket; + bool _dcMode; + bool _iqMode; + unsigned char _hwVer; + unsigned int _devIndex; + std::string _antenna; + int _biasT; + + gr_complex *_buffer; + int _bufferOffset; + int _bufferSpaceRemaining; + boost::mutex _bufferMutex; + boost::condition_variable _bufferReady; // buffer is ready to move to other thread + + bool _streaming; + bool _flowgraphRunning; + bool _reinit; // signal streamer to return after a reinit }; #endif /* INCLUDED_SDRPLAY_SOURCE_C_H */

5 years, 10 months

1
0
0 0

[PATCH] Fix inline functions to use 'static inline'

by David Woodhouse

With just 'inline', if the compiler decides not to inline them, it isn't required to emit them at all. For some targets with -Os that is causing build failures. Perhaps we might consider using '__attribute__((always_inline))' for GCC builds, but 'static inline' is a good start. --- src/rtl_adsb.c | 8 ++++---- src/rtl_power.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c index 9087de4..7aea8dd 100644 --- a/src/rtl_adsb.c +++ b/src/rtl_adsb.c @@ -183,7 +183,7 @@ int magnitute(uint8_t *buf, int len) return len/2; } -inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d) +static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d) /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */ { int bit, bit_p; @@ -224,17 +224,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d return BADSAMPLE; } -inline uint16_t min16(uint16_t a, uint16_t b) +static inline uint16_t min16(uint16_t a, uint16_t b) { return a<b ? a : b; } -inline uint16_t max16(uint16_t a, uint16_t b) +static inline uint16_t max16(uint16_t a, uint16_t b) { return a>b ? a : b; } -inline int preamble(uint16_t *buf, int i) +static inline int preamble(uint16_t *buf, int i) /* returns 0/1 for preamble at index i */ { int i2; diff --git a/src/rtl_power.c b/src/rtl_power.c index 00f4d9f..625d818 100644 --- a/src/rtl_power.c +++ b/src/rtl_power.c @@ -250,7 +250,7 @@ void sine_table(int size) } } -inline int16_t FIX_MPY(int16_t a, int16_t b) +static inline int16_t FIX_MPY(int16_t a, int16_t b) /* fixed point multiply and scale */ { int c = ((int)a * (int)b) >> 14; -- 2.17.1

5 years, 10 months

4
7
0 0

[PATCH] CMake: Replace deprecated qt5_use_modules macro

by Martin Hauke

qt5_use_modules has been marked as deprecated since a while and is finally removed in Qt 5.11 Change-Id: I5ac81b654d248028bccf48ba0cfd0c11ff9409e1 --- CMakeLists.txt | 14 ++++++++------ plugins/channel/nfm/CMakeLists.txt | 6 ++++-- plugins/channel/tcpsrc/CMakeLists.txt | 6 ++++-- plugins/channel/tetra/CMakeLists.txt | 6 ++++-- plugins/samplesource/gnuradio/CMakeLists.txt | 6 ++++-- plugins/samplesource/osmosdr/CMakeLists.txt | 6 ++++-- plugins/samplesource/rtlsdr/CMakeLists.txt | 6 ++++-- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72ce30e..b5a264b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.9) +cmake_minimum_required(VERSION 2.8.11) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) project(sdrangelove) @@ -14,7 +14,7 @@ set(CMAKE_AUTOMOC ON) find_package(Qt5Core 5.0 REQUIRED) find_package(Qt5Widgets 5.0 REQUIRED) find_package(Qt5Multimedia 5.0 REQUIRED) -#find_package(QT5OpenGL 5.0 REQUIRED) +find_package(Qt5OpenGL 5.0 REQUIRED) find_package(OpenGL REQUIRED) find_package(PkgConfig) @@ -245,6 +245,10 @@ add_library(sdrbase SHARED ) target_link_libraries(sdrbase + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Multimedia ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${LIBUSB_LIBRARIES} @@ -260,8 +264,6 @@ endif(LIBFFTS_FOUND) set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrangelove_EXPORTS") -qt5_use_modules(sdrbase Core Widgets OpenGL Multimedia) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include @@ -304,6 +306,8 @@ add_executable(sdrangelove target_link_libraries(sdrangelove sdrbase + Qt5::Widgets + Qt5::Multimedia ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ) @@ -317,8 +321,6 @@ if(WIN32) set_target_properties(sdrangelove PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") endif(WIN32) -qt5_use_modules(sdrangelove Widgets Multimedia) - ############################################################################## add_subdirectory(plugins) diff --git a/plugins/channel/nfm/CMakeLists.txt b/plugins/channel/nfm/CMakeLists.txt index feeb891..a39931e 100644 --- a/plugins/channel/nfm/CMakeLists.txt +++ b/plugins/channel/nfm/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodnfm SHARED ) target_link_libraries(demodnfm + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodnfm Core Widgets OpenGL Multimedia) \ No newline at end of file diff --git a/plugins/channel/tcpsrc/CMakeLists.txt b/plugins/channel/tcpsrc/CMakeLists.txt index df7c4d4..86d8426 100644 --- a/plugins/channel/tcpsrc/CMakeLists.txt +++ b/plugins/channel/tcpsrc/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodtcpsrc SHARED ) target_link_libraries(demodtcpsrc + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodtcpsrc Core Widgets OpenGL Network) diff --git a/plugins/channel/tetra/CMakeLists.txt b/plugins/channel/tetra/CMakeLists.txt index f46c2bb..9da7aa4 100644 --- a/plugins/channel/tetra/CMakeLists.txt +++ b/plugins/channel/tetra/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodtetra SHARED ) target_link_libraries(demodtetra + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodtetra Core Widgets OpenGL Multimedia) diff --git a/plugins/samplesource/gnuradio/CMakeLists.txt b/plugins/samplesource/gnuradio/CMakeLists.txt index 0e08608..c5c3300 100644 --- a/plugins/samplesource/gnuradio/CMakeLists.txt +++ b/plugins/samplesource/gnuradio/CMakeLists.txt @@ -75,6 +75,10 @@ add_library(inputgnuradio SHARED ) target_link_libraries(inputgnuradio + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} @@ -82,6 +86,4 @@ target_link_libraries(inputgnuradio sdrbase ) -qt5_use_modules(inputgnuradio Core Widgets OpenGL Multimedia) - endif(Boost_FOUND AND GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) diff --git a/plugins/samplesource/osmosdr/CMakeLists.txt b/plugins/samplesource/osmosdr/CMakeLists.txt index 9dc9705..10f3cc9 100644 --- a/plugins/samplesource/osmosdr/CMakeLists.txt +++ b/plugins/samplesource/osmosdr/CMakeLists.txt @@ -45,10 +45,12 @@ add_library(inputosmosdr SHARED ) target_link_libraries(inputosmosdr + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${LIBOSMOSDR_LIBRARIES} ${LIBUSB_LIBRARIES} sdrbase ) - -qt5_use_modules(inputosmosdr Core Widgets OpenGL Multimedia) diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt index 35c4081..fa9a53a 100644 --- a/plugins/samplesource/rtlsdr/CMakeLists.txt +++ b/plugins/samplesource/rtlsdr/CMakeLists.txt @@ -41,10 +41,12 @@ add_library(inputrtlsdr SHARED ) target_link_libraries(inputrtlsdr + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${LIBRTLSDR_LIBRARIES} ${LIBUSB_LIBRARIES} sdrbase ) - -qt5_use_modules(inputrtlsdr Core Widgets OpenGL Multimedia) -- 2.13.7

5 years, 10 months

1
0
0 0

SpyServer support on gr-osmosdr

by Lucas Teske

Hi all, So I decided to add support for SpyServer in gr-osmosdr. It is currently at a fork of mirrored in github: https://github.com/racerxdl/gr-osmosdr What should be my next steps to get this to the official branch? -- Lucas Teske Teske Virtual System GPG: BD29 7EF3 4CCB EB61 B790 06C3 351A 8000 DEAD CE11 GPG: 4A90 974B ACE0 A9A6 AF09 B3B1 6C39 C1C1 6A9D A7BE GPG: BD09 9175 6DE8 37F4 08D3 B296 DE7A 51C3 87C9 27EE

5 years, 11 months

1
0
0 0

[patch] fix compilation with boost 1.67

by Maxime Vincent

Hi everyone @ gr-osmosdr, I have created a small pull request to fix compilation with boost-1.67. I filed it on your github mirror, but am not sure that's the way to make a contribution. It's available here: https://github.com/osmocom/gr-osmosdr/pull/13 I'll also include the patch here for completeness: diff -ura gr-osmosdr.orig/lib/CMakeLists.txt gr-osmosdr/lib/CMakeLists.txt --- gr-osmosdr.orig/lib/CMakeLists.txt 2018-06-10 12:06:35.662484236 +0200 +++ gr-osmosdr/lib/CMakeLists.txt 2018-06-10 12:06:51.886207437 +0200 @@ -43,6 +43,8 @@ time_spec.cc ) +list(APPEND Boost_LIBRARIES pthread) + GR_OSMOSDR_APPEND_LIBS( ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES} Cheers, Maxime

5 years, 11 months

2
2
0 0

Re: Usability of i2c of fl2k?

by Steve Markgraf

Hi Torben, I'm replying with the mailing-list in Cc, as this might also be interesting for others. As mentioned earlier, the issue is that the FL2000 has a very inflexible I2C implementation that was only intended (I guess?) for I2C EEPROMs. The PCF8574 you want to use is much simpler, as it expects only one data byte after being addressed. If you can live with only 6 of the 8 outputs on your port expander, you might still be able to get it working. What the FL2000 does for an I2C write is the following: START, I2C_ADDR(W), REG_ADDR, DATA[0], STOP START, I2C_ADDR(W), REG_ADDR+1, DATA[1], STOP START, I2C_ADDR(W), REG_ADDR+2, DATA[2], STOP START, I2C_ADDR(W), REG_ADDR+3, DATA[3], STOP As you can see, REG_ADDR is the first byte of data that is being sent to the device after the address. This is where you need to put the data you want to set on the IO expander outputs. As the FL2000 auto-increments the register address, you need to set the lowest 2 bits to 0, so that the increment is not carried to the higher bits. But that also means that output 0 and 1 of your port-expander will toggle with each write and are not controllable by you. >From the datasheet of the PCF8574: "If other data bytes are sent from the master, following the acknowledge, they are ignored by this device." That means that DATA[0-3] are completely ignored, which probably means that the device will send a NAK for that byte. So the transfer always will fail from the view of the FL2000, so you must ignore the return value of fl2k_i2c_write(), which means you also have no feedback if the slave is actually present or not. The first thing I would suggest trying is writing a non-zero reg_addr to all possible slave addresses and observe the output of the port expander. If you have a logic analyzer, I suggest to use that and have a look at the I2C bus. If all that doesn't work, using a small MCU and dealing with the FL2000 I2C oddities there is probably the easiest solution. Regards, Steve On 17.06.2018 21:11, Torben Keil wrote: > Hi Steve, > > I tried my luck with i2c... but I wasn't successful. > There's a PCF8574 (Portextender) connected directly on the I2C interface > of fl2k. > > Here's my code: > > torben@Mworkstation: <mailto:torben@Mworkstation:>~/Amateurfunk/C++$ cat > fl2k_i2c.cpp > // g++ fl2k_i2c.cpp -L/home/torben/Amateurfunk/osmo-fl2k/build/src > -I/home/torben/Amateurfunk/osmo-fl2k/include -losmo-fl2k -o fl2k-i2c_test > #include "osmo-fl2k.h" > #include <iostream> > #include <bitset> > > int main (int argc, char *argv[] ) { > int status; > fl2k_dev_t *dev = NULL; > uint8_t i2c_addr = 0b01000001; // Letztes Bit: Read / #Write > uint8_t reg_addr = 0; > uint8_t *data = new uint8_t[10]; > uint32_t dev_index = 0; > > fl2k_open(&dev, (uint32_t)dev_index); > if (NULL == dev) { > std::cerr << "Failed to open fl2k device " << dev_index > << std::endl; > return -1; > } > > for (i2c_addr=0; i2c_addr<128; i2c_addr++) { > status = fl2k_i2c_read(dev, i2c_addr, reg_addr, data); > if( status >= 0 ) { > std::cout << "Adress: " << i2c_addr; > std::cout << "; I2C-Status: " << status << "; Data: "; > for( int i=0; i<static_cast<int>(status); i++) { > std::cout << " " << std::bitset<8>(data[i]); > } > std::cout << std::endl; > > } > > > data[0]=127; > for (i2c_addr=0; i2c_addr<128; i2c_addr++) { > //fl2k_i2c_write(fl2k_dev_t *dev, uint8_t i2c_addr, uint8_t > reg_addr, uint8_t *data); > status = fl2k_i2c_write(dev, i2c_addr, 0, data); > if( status >= 0 ) { > std::cout << "Write Adress: " << i2c_addr; > std::cout << "; I2C-Status: " << status << std::endl; > } else { > std::cout << static_cast<int>(i2c_addr) << "\t"; > } > } > } > > fl2k_close(dev); > > free(data); > > return 0; > > } > > Output of that program after a fresh reboot of the system: > torben@Mworkstation:~/Amateurfunk/C++$ ./fl2k-i2c_test > Kernel mass storage driver is attached, detaching driver. This may take > more than 10 seconds! > 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 > 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 > 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 > 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 > 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 > 117 118 119 120 121 122 123 124 125 126 127 > > So there's nothing reachable via I2C. > > What am I doing wrong here? > > > Greetings, > Torben > > > > Am 17.06.2018 03:18, schrieb Steve Markgraf: >> Hi Torben, >> >> On 16.06.2018 09:40, Torben Keil wrote: >>> do you have a git repository for the code so that I could have a try? >> >> I've debugged and cleaned up the I2C code and just pushed it. >> I2C transfers with the FL2000 seem to fail from time to time, so make >> sure to check the return code of fl2k_i2c_read()/fl2k_i2c_write(). >> >> Regards, >> Steve

5 years, 11 months

1
0
0 0

Usability of i2c of fl2k?

by Torben Keil

Hello List, I tried to get a signal over the i2c interface but it wasn't sucsessful. Do you have an idea how to enable the i2c interface on the fl2k chip? Best whishes, Torben

5 years, 11 months

2
3
0 0

Re: Osmo-FL2K stops transmitting randomly

by Sajjad Golchin poor

Hi Marcus and thanks for your reply. >Your video is about 13 minutes longer than I'd like – can you pinpoint >at which time in that video your transmission stops? You can watch this video between 7:00 & 8:00 to observe the breakdowns. >As usual, debugging on the side of the observing party might very well >be helpful here. Figure out whether the program halts (a software >debugger, e.g. gdb, would be the appropriate tool), the USB transfers >stop (wireshark might be helpful here), or whether just something >happens inside the device while the computer and software happily >continue to work. Observing the spectrum might help. You just gave me a good point to start debugging this issue! Actually I don’t have a RTL-SDR or anything else in hand right now to observe the spectrum but I will do the tests soon. -------------------------------------------- Hi Steve, did a great job! >This will happen if the host cannot supply enough data to the device, >you need to use a lower sample rate in this case, or get rid of >a hypervisor like VMware, as is the case in this video. I tried fl2k_fm both in VMWare and in GNU radio live image booted from a flash drive and in both I had the problem. and why should I use a lower sample rate when my system can handle the samples well? (take a look at attachments) I’m using VMWare Workstation Pro (Version: 14.1.2 build-8497320) on a brand new ACER laptop (Model: Aspire A715-71G-71Y3) running Windows 10 Pro 1803 (Build: 17134.112) with 16 gigabyte RAM and an Intel Core i7 7700HQ CPU. The USB host controller is Intel(R) USB 3.0 eXtensible Host Controller - 1.0 (Microsoft) witch I believe it can handle up to 157 MS/s. all drivers are updated. However, I didn’t see anything wrong with virtualization except that the maximum achievable sample rate was a little lower than the GNU radio live booted from flash drive. Except for this, I didn't encounter by anything. >There seems to be a 'frame loss' mechanism to detect this in through an >interrupt transfer, but I haven't implemented this yet and have no idea >if this works with disabled synchronization. Looking forward to the results! And don’t mind asking me for a helping hand. I’ll do my best to help this project. I was reading the comments below this post in rtl-sdr.com blog and I saw a user who had the same issue mentioned something that might be useful: Of futher note (hopefully someone from osmocom will see this) the bug where the broadcast intermittently ceases in fl2k_fm under both an ubuntu virtual machine and directly ran as a windows exe seems to have something to do with cpu affinity and / or process priority – generally it starts spitting out the underflow message on stdout then the signal drops out and the process requires a restart. Regards, Sajjad

5 years, 11 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr