osmocom-sdr February 2020

osmocom-sdr@lists.osmocom.org

5 participants
7 discussions

Start a nNew thread

gr-osmosdr: add clock_source= parameter

by Michael Loeffler

Hello, the attached patch allows to set the clock_source on uhd devices in programs like gqrx. Bye

3 years, 1 month

Request for Comment: Creating a binary format output for rtl_power

by Bill Gaylord

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

4 years, 1 month

Fix 64 bit casts in librtlsdr

by Christian Ebner

4 years, 2 months

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

by Piotr Krysik

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

4 years, 2 months

[PATCH] build: Allow building with GNU Radio master

by argilo＠gmail.com

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

4 years, 2 months

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

by argilo＠gmail.com

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

4 years, 2 months

[PATCH] build: Allow building with GNU Radio master

by argilo＠gmail.com

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

4 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr February 2020