diff options
Diffstat (limited to 'Radio')
-rw-r--r-- | Radio/HW/AirSpy/src/airspy.c | 41 | ||||
-rw-r--r-- | Radio/HW/AirSpy/src/airspy.h | 46 | ||||
-rw-r--r-- | Radio/Utils/AirSpyIQ/main.swift | 94 | ||||
-rw-r--r-- | Radio/Utils/TestAirSpy/main.swift | 2 |
4 files changed, 143 insertions, 40 deletions
diff --git a/Radio/HW/AirSpy/src/airspy.c b/Radio/HW/AirSpy/src/airspy.c index 02c1542..8ca11fc 100644 --- a/Radio/HW/AirSpy/src/airspy.c +++ b/Radio/HW/AirSpy/src/airspy.c @@ -39,15 +39,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI #include "iqconverter_int16.h" #include "filters.h" -#ifndef bool -typedef int bool; -#define true 1 -#define false 0 -#endif - #define PACKET_SIZE (12) #define UNPACKED_SIZE (16) -#define RAW_BUFFER_COUNT (8) + #ifdef AIRSPY_BIG_ENDIAN #define TO_LE(x) __builtin_bswap32(x) @@ -76,39 +70,6 @@ typedef struct { uint32_t freq_hz; } set_freq_params_t; -typedef struct airspy_device -{ - libusb_context* usb_context; - libusb_device_handle* usb_device; - struct libusb_transfer** transfers; - airspy_sample_block_cb_fn callback; - volatile bool streaming; - volatile bool stop_requested; - pthread_t transfer_thread; - pthread_t consumer_thread; - bool transfer_thread_running; - bool consumer_thread_running; - pthread_cond_t consumer_cv; - pthread_mutex_t consumer_mp; - uint32_t supported_samplerate_count; - uint32_t *supported_samplerates; - uint32_t transfer_count; - uint32_t buffer_size; - uint32_t dropped_buffers; - uint32_t dropped_buffers_queue[RAW_BUFFER_COUNT]; - uint16_t *received_samples_queue[RAW_BUFFER_COUNT]; - volatile int received_samples_queue_head; - volatile int received_samples_queue_tail; - volatile int received_buffer_count; - void *output_buffer; - uint16_t *unpacked_samples; - bool packing_enabled; - iqconverter_float_t *cnv_f; - iqconverter_int16_t *cnv_i; - void* ctx; - enum airspy_sample_type sample_type; -} airspy_device_t; - static const uint16_t airspy_usb_vid = 0x1d50; static const uint16_t airspy_usb_pid = 0x60a1; diff --git a/Radio/HW/AirSpy/src/airspy.h b/Radio/HW/AirSpy/src/airspy.h index 573298b..3a778ee 100644 --- a/Radio/HW/AirSpy/src/airspy.h +++ b/Radio/HW/AirSpy/src/airspy.h @@ -26,7 +26,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI #define __AIRSPY_H__ #include <stdint.h> +#include "libusb.h" #include "airspy_commands.h" +#include "iqconverter_float.h" +#include "iqconverter_int16.h" #define AIRSPY_VERSION "1.0.12" #define AIRSPY_VER_MAJOR 1 @@ -116,8 +119,51 @@ typedef struct { uint32_t revision; } airspy_lib_version_t; +#ifndef bool +typedef int bool; +#define true 1 +#define false 0 +#endif + typedef int (*airspy_sample_block_cb_fn)(airspy_transfer* transfer); +#define RAW_BUFFER_COUNT (8) + +typedef struct airspy_device +{ + libusb_context* usb_context; + libusb_device_handle* usb_device; + struct libusb_transfer** transfers; + airspy_sample_block_cb_fn callback; + volatile bool streaming; + volatile bool stop_requested; + pthread_t transfer_thread; + pthread_t consumer_thread; + bool transfer_thread_running; + bool consumer_thread_running; + pthread_cond_t consumer_cv; + pthread_mutex_t consumer_mp; + uint32_t supported_samplerate_count; + uint32_t *supported_samplerates; + uint32_t transfer_count; + uint32_t buffer_size; + uint32_t dropped_buffers; + uint32_t dropped_buffers_queue[RAW_BUFFER_COUNT]; + uint16_t *received_samples_queue[RAW_BUFFER_COUNT]; + volatile int received_samples_queue_head; + volatile int received_samples_queue_tail; + volatile int received_buffer_count; + void *output_buffer; + uint16_t *unpacked_samples; + bool packing_enabled; + iqconverter_float_t *cnv_f; + iqconverter_int16_t *cnv_i; + void* ctx; + enum airspy_sample_type sample_type; +} airspy_device_t; + + + extern ADDAPI void ADDCALL airspy_lib_version(airspy_lib_version_t* lib_version); /* airspy_init() deprecated */ extern ADDAPI int ADDCALL airspy_init(void); diff --git a/Radio/Utils/AirSpyIQ/main.swift b/Radio/Utils/AirSpyIQ/main.swift index 2d6f0fd..1fa6b04 100644 --- a/Radio/Utils/AirSpyIQ/main.swift +++ b/Radio/Utils/AirSpyIQ/main.swift @@ -9,3 +9,97 @@ import Foundation import ArgumentParser import libairspy +//set the command line arguments +struct CommandLineArgs: ParsableCommand { + @Argument var file:String = "" + @Option(name:.shortAndLong) var device_idx: Int = 0 + @Option(name:.shortAndLong) var samplerate: Int = 3000000 + @Option(name:.shortAndLong) var gain: Int = 0 + @Option(name:.shortAndLong) var frequency: Int = 100000000 + @Option(name:.shortAndLong) var nsamples: Int = 1024 + @Flag(help:"Version \(software_version)") var version: Bool = false + @Flag(name: .shortAndLong) var verbose: Bool = false +} + +let args = CommandLineArgs.parseOrExit() + +if (args.version) { + print("AirSpyIQ version \(software_version)") + exit(0) +} + +var libersion:airspy_lib_version_t = airspy_lib_version_t() + +airspy_lib_version(&libersion) +print("libairspy \(libersion.major_version).\(libersion.minor_version).\(libersion.revision)") + + +//detect number of devices +//let AIRSPY_MAX_DEVICES=32 +//var device:airspy_device_t = airspy_device_t() +//var device:UnsafeMutablePointer<OpaquePointer?>? +var dev:UnsafeMutablePointer<airspy_device_t>? = .allocate(capacity: 1) + +var ret:Int32 +ret = airspy_init() +if (ret != AIRSPY_SUCCESS.rawValue) { + print("Couldnt init library") + exit(1) +} + +print("Here") + +ret = airspy_open(&dev) + +let sample_rate_count: UnsafeMutablePointer<UInt32> = .allocate(capacity: 1) +print("Here 2 \(sample_rate_count)") +ret = airspy_get_samplerates(dev, sample_rate_count, 0) +print("ret = \(ret)") +print("Here 3") +print("Number of supported sample rates \(sample_rate_count.pointee)") + +var samplerates:UnsafeMutableBufferPointer<UInt32> = .allocate(capacity: Int(sample_rate_count.pointee)) +let rawPointer = UnsafeMutablePointer<UInt32>?(samplerates.baseAddress!) +ret = airspy_get_samplerates(dev, rawPointer, sample_rate_count.pointee) +print("ret=\(ret)") +for i in 0..<sample_rate_count.pointee { + print("sample rate \(i): \(samplerates[Int(i)])") +} + +print("Here 4") +ret = airspy_set_samplerate(dev, 3000000) //3M +if (ret != AIRSPY_SUCCESS.rawValue) { + print("Couldnt set samplerate") +} + +print("Here 5") +func rf_callback(_ transffer: UnsafeMutablePointer<airspy_transfer_t>?) -> Int32 { + print("Got some samples") + return 0 +} + +print("Here 6") +ret = airspy_start_rx(dev, rf_callback, nil) +if (ret != AIRSPY_SUCCESS.rawValue) { + print("Couldn't start rf thread") +} + +print("Here 7") +ret = airspy_set_freq(dev, 100000000) //100M +if (ret != AIRSPY_SUCCESS.rawValue) { + print("Couldn't set frequency") +} + +print("Here 8") +sleep(1) +var count = 10 +while((airspy_is_streaming(dev) != AIRSPY_TRUE.rawValue) +&& (count>0)) { + print("Streaming") + sleep(1) + count -= 1 +} +print("Here 9") + +airspy_close(dev) +airspy_exit() diff --git a/Radio/Utils/TestAirSpy/main.swift b/Radio/Utils/TestAirSpy/main.swift index 13b37d2..091d979 100644 --- a/Radio/Utils/TestAirSpy/main.swift +++ b/Radio/Utils/TestAirSpy/main.swift @@ -11,3 +11,5 @@ import libairspy print("Version \(software_version)") airspy_init() + + |