Commit graph

99 commits

Author SHA1 Message Date
Robert Ghilduta
b1ab659d6d libbladeRF: replace pthreadswin32 with native threading and locking API on Windows 2023-12-04 01:15:59 -08:00
Robert Ghilduta
94f2159c87 windows: add a few missing depencies 2023-11-30 05:11:23 -08:00
Ryan Thompson
366ea46295 libbladeRF: channel2direction function added to conversions 2023-07-07 15:44:14 -05:00
Robert Ghilduta
150bc1bbdf bladeRF-cli: add tuning_mode print/set parameter
libbladeRF supports host and FPGA based tuning. This print/set can be used to
query and set a device's tuning mode by running:

> print tuning_mode
> set tuning_mode <FPGA|host>
2019-04-02 01:59:07 -07:00
Rey Tucker
7d58cdfada host: common: conversions: add tuningmode2str conversion 2018-12-12 16:42:52 -05:00
Rey Tucker
f644ceca63 host: common: add iterators.h
Adds iterators.h, which contains macros useful for iterating over
directions and/or channels.
2018-11-26 18:03:45 -05:00
Rey Tucker
05f7fd571a host: refactoring bladerf2.c
General documentation cleanup, function name adjustments, merging of
redundant structures, etc.

fpga_common/ad936x_helpers:
    Contains wrappers for AD936x RFIC functionality.

fpga_common/bladerf2_common:
    Contains bladeRF2-specific helper functions and constants.

fpga_common/ad936x_params:
    Reformat (no more tabs, phew)

    Move ina219 shunt const to bladerf2_common

host/common/range:
    Move functions and macros for handling bladerf_range structs

../libbladeRF/include/bladeRF2.h:
    Explicitly index RX/TX FIR enums

    Update references to ad936x_params.c

../libbladeRF/src/board/bladerf2/common:
    New macros for boilerplate:
        - WITH_MUTEX: wrap around locked blocks
        - CHECK_STATUS: calls function, checks return code
        - CHECK_AD936X: calls function, checks return code, translates
          from AD936x to libbladeRF error codes
        - CHECK_*_LOCKED: above, but unlocks mutex before erroring
        - NULL_CHECK: checks a var for null

    Move helper functions into here

../libbladeRF/src/board/bladerf2/bladerf2.c:
    Use new macros

    Code style fixes

    Remove redundant code
2018-11-26 18:03:45 -05:00
Rey Tucker
c9a2230cf4
host: common: include pthread.h in nanosleep.h (#669) (#671)
* host: common: include pthread.h in nanosleep.h (#669)

default header sort on nanosleep.c puts nanosleep.h above
pthread.h, which creates an implicit definition of struct
timespec.

Fixes #669

* host: common/nanosleep: cleanup includes
2018-10-08 18:04:29 -04:00
Rey Tucker
fb9e6d02d0 host: libbladeRF/common: allow more accurate trigger labeling
This adds two new values for the bladerf_trigger_signal enum,
BLADERF_TRIGGER_J51_1 and BLADERF_TRIGGER_MINI_EXP_1, as well
as the necessary backend processing to make them work.

It turns out that it doesn't actually matter which one is chosen;
they all behave identically and interchangeably once they're passed
to the Nios interface functions.

The reason for this change is to reduce confusion, as the bladeRF
x40/x115 use J71-4 for mini_exp[1] and the bladeRF xA4/xA9 use
J51-1.
2018-09-26 12:43:16 -04:00
Rey Tucker
8fdfa6abcd
host: add nanosleep shim for Windows (#589)
Windows does not have nanosleep(), so this PR emulates it with a wrapper that calls Sleep().

* host/common: add nanosleep shim for Windows

* bladeRF-cli: on Windows, use nanosleep shim

* host/common: nanosleep: fixes for Windows building...

* host: common/nanosleep: convert to milliseconds, not microseconds

whoops
2018-08-24 15:36:04 -04:00
Rey Tucker
78286d47f9 host: common: add log_get_verbosity function
log_get_verbosity returns the current logging level, which may be useful
for situations where a lot of processing is required for verbose
logging, etc.
2018-08-01 16:24:54 -04:00
Rey Tucker
fff07e422c
host: bladeRF_cli: add support for MIMO RX and TX (#57)
Adds support for multi-channel RX and TX via the bladeRF-cli utility
2018-05-30 15:27:54 -04:00
Rey Tucker
14c4cfeda1 host: common: add loopback2str conversion (#40)
Implements a loopback2str() function to convert a bladerf_loopback into a C string.

Also, formatting fixes by clang-format
2018-05-22 13:00:03 -04:00
Rey Tucker
ee55f859b9
host: clean up build warnings across multiple platforms (#21)
With this commit, we build without warnings on Arch Linux; CentOS 7; Debian 8 and 9; latest Fedora; Ubuntu 14.04, 16.04, 17.10, and 18.04; Visual Studio 2017; and macOS 10.13.3 w/ Homebrew.

* host: libbladeRF: compile AD9361 srcs with -std=gnu11

Fixes compile errors involving ‘for’ loop initial declarations only
allowed in C99 or C11 mode, on older GCCs.

* host: libbladeRF/adi: remove stdbool workaround

This is not necessary now that we're building to -std=gnu11, and in
fact, it seems to create a conflict.

* host: libbladeRF: pre-declare loop variables

Some compilers are not happy with declaring the loop variable in the for
statement.  Begrudgingly placate them.

* host: libbladeRF_test: pre-declare loop variables

Some compilers are not happy with declaring the loop variable in the for
statement.  Begrudgingly placate them.

* host: bladeRF-cli: pre-declare loop variables

Some compilers are not happy with declaring the loop variable in the for
statement.  Begrudgingly placate them.

* host: libbladeRF: remove refs to strings.h

Windows doesn't have strings.h, but string.h seems to do just fine.

* host: libbladeRF: fix windows compile errors (WIP)

* host: libbladeRF/ad9361: fix windows compile error

"IGNORE" is #define'd in the Windows environment, creating a conflict.
Renaming this to solve the conflict.

* host: common: add setenv implementation for Windows

* host: libbladeRF: build setenv.c stub on Windows

* host: bladeRF-cli: use setenv stub on Windows

* host: common: fixup spacing consistency in setenv

* host: libbladeRF: cast channel macros to bladerf_channel

Visual Studio is picky about this, and throws warnings.

* host: libbladeRF: bladerf2.c: undo workaround for bladerf_channel

* host: libbladeRF: bladerf_get_gain_stages count type is now size_t

This fixes a Windows compile error, and is also generally more sensible.

* host: bladeRF-cli: fix windows compile errors

* host: ad9361: fix variadic macro syntax

Fixes Windows build errors

* host: ad9361: rename _DEBUG to AD9361_DEBUG

Visual Studio automagically sets _DEBUG if the /MDd option is set. Turns
out that a lot of the debugging sections don't build in Visual Studio,
so this accounts for a large number of the build errors...

* host: libbladeRF: fixes for Visual Studio builds

* host: common: fixes for Visual Studio builds

* host: libbladeRF/ad9361: fixes for Visual Studio builds

* host: libbladeRF_test: fixes for Visual Studio builds

* host: bladeRF-cli: fixes for Visual Studio builds

* host: bladeRF-cli: fix static analysis warnings

Fixes potential memory leak in main

Fixes unused values in set_adf_refclk, set_samplerate

* host: common: fix static analysis warnings

fixes:
unread variable in perform_rx_cal
memory leaks in add_arg, add_opt

* host: libbladeRF: fix static analysis warnings

fixes unused variables in bladerf2_set_gain and xb100_enable
2018-04-03 18:20:51 -04:00
Rey Tucker
dc7094abb9 host: libbladeRF_test: win32 fixes for test_config_file (#546)
* host: common: add mkdtemp implementation for Win32

Windows does not have mkdtemp, which is something used by at least one
test case. This is a simple-enough implementation thereof.

* host: common/host_config: add more defs on Win32

chdir, getcwd, rmdir, unlink, and mkdir are all somewhat special on
Win32, so they need special handling.

* host: test_config_file: fix builds on Win32
2018-03-30 14:04:40 -04:00
Rey Tucker
14e7f317a2 host: common/conversions: add str2channel
Converts from a string to a bladerf_channel
2018-02-05 15:35:28 -05:00
Rey Tucker
1bf9f4e9af host: common/host_config.h: add macro for fallthrough cases
GCC 7.x adds a warning for implicit fallthroughs in switch cases. We
intentionally do this sometimes, so adding an EXPLICIT_FALLTHROUGH macro
to denote this.

The __attribute__((fallthrough)) on a null statement is only supported
by GCC 7.x as well, hence the macro.
2018-01-15 17:55:17 -05:00
Vanya A. Sergeev
bccd7e19f7 libbladeRF: migrate api to 64-bit frequency 2017-12-21 12:54:58 -05:00
Vanya A. Sergeev
9062b66d9c libbladeRF: migrate bladerf_module to bladerf_channel and bladerf_direction 2017-12-21 12:54:58 -05:00
Vanya A. Sergeev
562243c80d libbladeRF: refactor codebase for multi-board support
Includes fixups for clean rebase atop bladeRF commit 8b420eb
2017-12-15 18:15:06 -05:00
Robert Ghilduta
a39a81d700 Add config option file parsing capabilities
This commit adds functions that parse config option files
2017-12-07 20:34:34 -08:00
Robert Ghilduta
68bf8e231a Add string parsing functions
The line to argumenet parser uses a two pass approach. The first pass
finds beginning and end of arguments, and counts the number of quotes.
The second pass copies the characters into the argument buffers.
2017-12-07 20:34:33 -08:00
Robert Ghilduta
82c424cc8c Add string manipulation functions 2017-12-07 20:34:33 -08:00
Robert Ghilduta
38664eaa10 Add bladeRF and libbladeRF specific look-ups and conversion 2017-12-07 17:10:28 -08:00
Robert Ghilduta
579199768c Cleanup files to add options file parser 2017-12-07 17:10:28 -08:00
Robert Ghilduta
dccc4edc2f Filenames are starting to become ambiguous without full pathnames 2017-12-07 17:10:28 -08:00
Rey Tucker
5ba5f16221 clock_gettime.h: include host_config.h 2017-08-02 19:25:49 -04:00
Rey Tucker
0779109841 host: explicitly test for clock_gettime (#508)
Instead of using version-based guessing on macOS (which appears to fail
with newer versions of Xcode on older versions of macOS), use an
explicit test for clock_gettime in CMake.
2017-08-02 15:02:38 -04:00
Robert Ghilduta
7aff155a97 libbladeRF: add gain specific mean errors to DC calibration table
The DC calibration table will now include mean residual errors for 3 different
gains (that will be used by the AGC amont other things) including:
    Max : LNA=6dB, RXVGA1=30dB, RXVGA2=15dB
    Mid : LNA=6dB, RXVGA1=30dB, RXVGA2= 0dB
    Low : LNA=3dB, RXVGA1=12dB, RXVGA2= 0dB

The DC cal table version has been bumped to 2. This commit will allow backward
compatibility with existing DC cal tables.
2017-07-05 08:59:08 -07:00
Thomas Brown
21690e5da0 libbladeRF: Use system clock_gettime on macOS >= 10.12. 2017-07-05 08:58:17 -07:00
Ian Frasch
63afe69ac5 bladeRF-fsk: Added support for Visual studio 2012
- Added round() and roundf() functions for VS version 2012 and below, since
    they lack implementation of these functions

- Minor formatting edits to make the compiler (v17.00.50727.1) happy
2016-08-22 16:13:20 -04:00
Jon Szymaniak
210591e8e2 host: common: Added conversion routines for bladerf_smb_mode 2016-05-17 00:20:01 -04:00
Jon Szymaniak
7656724db7 host: common: Added trigger role conversion routines 2016-05-17 00:20:01 -04:00
Jon Szymaniak
8c0ac5629d host/common: Added string <-> trigger enum conversion functions 2016-05-17 00:19:53 -04:00
Jon Szymaniak
3537c3a49a host: common: Added str2bool() conversion routine
This is intended for use with functions that require
enable/disable, on/off, true/false.
2016-04-25 19:03:34 -04:00
Jon Szymaniak
a4a065f3ae host: Added endian-conversion macros for use with constants
The existing macros make use of functions, which cannot be used to
define constants on architectures where they are actually implemented
as functions (as opposed to macros).
2016-01-11 23:38:02 -05:00
Jon Szymaniak
279db7aee4 host/common: Added missing extern "C" { ... } in headers 2016-01-11 23:01:20 -05:00
Bjoern Kerler
5a360d7b4c libbladeRF: use c99 snprintf/vsnprintf for vc14
These functions come with MSVC 2015 (vc14) as part of the c99 support.
The compatibility definitions in host_config.h.in were causing
a compilation error. This fix disables the compatibility definitions
when the more recent vc14 compiler is detected.
2016-01-10 17:27:36 -08:00
Jon Szymaniak
221083a2d6 host/common: Added MIT-licensed DC calibration routines
This code is a re-designed set of DC calibration functionality
built atop of libbladeRF.

This functionality provides the ability to:
    - Run LMS6002D DC calibrations per module (or all at once)

    - Search for nominal RX/TX DC correction values for a single
      frequencies or a range of frequencies.

To avoid inducing issue #408 by utilizing a single stream,
rather than repeatedly starting and stopping streams.

No TX thread is used, as this is uneccessary; it is sufficient to
flush 0+0j samples through the TX path at the start of calibration
and allow the DAC to remain held in this state as the FPGA
(intentionally) underruns.
2015-12-28 22:29:04 -05:00
Jon Szymaniak
454b4931ec host/common: Added str to bladerf_module & bladerf_dc_cal_module fns 2015-12-28 22:20:20 -05:00
Nick "Darkfiber" Wolff
327dce57b1 host: Minimal build fixes for FreeBSD
Work still needs to be done to troubleshoot libusb issues.
2015-12-14 11:36:15 -05:00
Jon Szymaniak
c5d1e4a9f3 host/common: Made devcfg_perform_sync_config() parameter const 2015-11-29 21:20:54 -05:00
Jon Szymaniak
672cf27eae host/common: Added string to uint64 and double w/ suffix conversions 2015-10-08 12:48:55 -04:00
Jon Szymaniak
bf9f8a62a4 host: Moved device config helpers to host/common
People may find these useful when developing their own tools or
contributions to the bladeRF codebase.
2015-06-21 23:07:40 -04:00
Jon Szymaniak
3cfb507f91 host_common: Use size_t for array length, MSVC build fix
size_t or unsigned int are preferred for variables that describe
the length of an array.

This change fixes an additional MSVC build issue caused by
test_scheduled_retune.
2015-06-21 22:52:19 -04:00
Jon Szymaniak
cd6cb0cca7 host/common: Added SC16Q11 <-> float conversion routines 2015-04-10 13:39:09 -04:00
Jon Szymaniak
4d5027bc41 host: Don't redefine inline for C++ (Windows) in host-compat header
It appears the 'inline' keyword still isn't supported as of VS2013
(MSVC 18.00). However, we shouldn't be re-defining it
if building with VS's C++ compiler.
2015-01-22 18:47:31 -05:00
Jon Szymaniak
41bcf7b12c host: Centralized duplicated code
Moved function to get string description to conversions.c.

There's a similar function within libbladeRF's backend.c, but that
is intended to be used in the device information string; this is
intended to be a bit more humand-readable.
2014-12-18 17:58:21 -05:00
Jon Szymaniak
7218273716 libbladeRF_test: Added common cmdline arg handling and device config
Most of the libbladeRF_test items contain their own command line
argument handling, yielding repeated code and inconsistent invocations.

This commit introduces common command-line argument handling and device
configuration for the most used device parameters.

Future patches will migrate the tests over to using this functionality.
New tests should use this immediately.
2014-11-18 17:09:11 -05:00
Jon Szymaniak
64275e768f host: Updated and moved Windows C99 compatibility headers
Visual Studio 2013 now includes these headers, so they have
been moved as not to conflict (even though they are intended to
be equivalent.)

Our stdbool.h was providing an incorrect typedef; sizeof(bool)
should have been 1, not sizeof(int).

Per http://msdn.microsoft.com/en-us/library/tf4dy80a.aspx:
    "In Visual C++4.2, the Standard C++ header files contained a typedef
    that equated bool with int. In Visual C++ 5.0 and later, bool is
    implemented as a built-in type with a size of 1 byte. That means
    that for Visual C++ 4.2, a call of sizeof(bool) yields 4, while in
    Visual C++ 5.0 and later, the same call yields 1. This can cause
    memory corruption problems if you have defined structure members of
    type bool in Visual C++ 4.2 and are mixing object files (OBJ) and/or
    DLLs built with the 4.2 and 5.0 or later compilers."
2014-11-14 15:19:18 -05:00