Commit graph

525 commits

Author SHA1 Message Date
Jon Szymaniak
94fed3d0cd libbladeRF: Fixed an invalid mask value 2015-09-01 15:59:08 -04:00
Jon Szymaniak
1d0a6cc0c7 libbladeRF: Added support for attaching XB100
It appears that the voltage across the LEDs is always large
enough to keep them ON despite the output voltage.

A potential workaround for this rev of the XB100 is to use the
directionality of the LED IO pins to turn the LED on/off.
2015-09-01 13:24:33 -04:00
Jon Szymaniak
82191d8dee libbladeRF: Added masked XB GPIO write routines and XB GPIO macro definitions 2015-09-01 13:11:35 -04:00
Jon Szymaniak
a7c9d64d4f libbladeRF: Updated FPGA version compat table for v0.4.1 2015-09-01 11:37:03 -04:00
Jon Szymaniak
859377326b nios, lms, libbladeRF: Utilize FPGA support for atomic NINT/NFRAC write
Both the host and NIOS II FPGA retuning modes now make use of
FPGA v0.4.0's atomic write of the LMS6002D NINT and NFRAC PLL registers.

This helps avoid changing the PLL multiple times when attempting to
configure it.
2015-08-27 15:54:25 -04:00
Jon Szymaniak
20b7196e2d libbladeRF: Return BLADERF_ERR_PERMISSION in file operations 2015-08-25 14:40:51 -04:00
Jon Szymaniak
a8f5f71a97 libbladeRF: Added INFO message regarding insufficient permissions
This is intended to help folks recognize that they've forgotten
to update their udev rules.
2015-08-25 14:19:39 -04:00
Jon Szymaniak
2afcc6a895 libbladeRF: Added error code to denote insufficient permissions 2015-08-25 14:13:40 -04:00
Jon Szymaniak
2636bb377f libbladeRF: Restored default of FPGA tuning mode per v0.3.5 fix 2015-08-25 13:28:05 -04:00
Jon Szymaniak
0d67e4e689 libbladeRF: Updated compatibility table for FPGA v0.3.5 2015-08-25 13:28:05 -04:00
Jon Szymaniak
9fea12caaf libbladeRF: Added frequency tuning debug message 2015-08-25 13:28:05 -04:00
Martin Murray
7274d263ad libbladeRF: Always set a default rx/tx filter for an XB-200
While we could read back the mux state via gpio to infer what filters were
previously set, we don't know if the user had selected them explicitly or
had been using the auto_1db or auto_3db filters. Since it's ambiguous, we
should instead apply a default so that users can expect consistent results.
2015-08-23 02:41:34 -04:00
Martin Murray
1dd24e1de0 libbladeRF: Fixed segfault in nios_legacy_expansion_gpio_write
An error log message was missing a printf format argument causing a
segfault on old FPGA images.
2015-08-23 02:41:34 -04:00
Martin Murray
0ce3aaa280 libbladeRF: Simplified xb200 filter configuration routines.
Handling of the XB-200 hard and auto filters is separated into two
paths to avoid the confusion introduced in the fix for #404.

xb200_set_filterbank is the internal API entry point for the external
bladerf_xb200_set_filterbank. If the configured filter is a hard
filter, then internal state is updated and set_filterbank_mux is
invoked to realize the hardware changes.

If the configured filter is an automatic filter, then internal state
is updated and xb200_auto_filter_selection() is called with the
currently tuned frequency for specificed module.

xb200_auto_filter_selection() then invokes set_filterbank_mux to
realize the hardware changes.
2015-08-23 02:41:34 -04:00
Martin Murray
aeacd6df8c libbladeRF: Added a debug message when changing xb-200 filter mux. 2015-08-23 02:41:34 -04:00
Jon Szymaniak
6919e9ef4c libbladeRF: Temporarily default to host tuning until #417 is resolved
Failures have been observed when using FPGA tuning to retune
between vastly different frequencies.  It appears that in cases
where significant VCOCAP changes take place, much longer delay between
VCOCAP updates and VTUNE reads are needed than currently utilized in the
NIOS II implementation.

Until this is resolved, host tuning is being set as the default mode,
which does not exhibit this failure because register access overhead
incurs more than ample delay.
2015-08-13 14:47:46 -04:00
Jon Szymaniak
022a966987 libbladeRF: Hold lock when resetting sync state items
Per CID 1288660 and CID 1288661, these cases were the only times
these were accessed without holding the buffer management lock.

Although there shouldn't be a race here, this change is introduced to
maintain consistency with other accesses of the sync i/f state info.
2015-08-12 16:22:16 -04:00
Jon Szymaniak
75e7793636 libbladeRF: Added bug catcher for CID 1308077
This addresses an item picked up by Coverity. Defects in bands[] or
frequency checks could potentially cause an out-of-bounds memory access.

A bounds check has been added to avoid an invalid access, should one of
the aforementioned defect ever creep in.
2015-08-12 15:50:00 -04:00
Jon Szymaniak
f11427e661 libbladeRF: Fixed format specifier typos (Fixes #416) 2015-08-05 10:11:09 -04:00
Jon Szymaniak
c259e3d233 libbladeRF: Fixed order of add/data params to log_verbose(). Fixes #415. 2015-08-04 09:30:32 -04:00
Jon Szymaniak
6ecca0b3a9 libbladeRF: End bursts with 3 zero-samples, not 2.
See "Figure 9: TX data interface" in the LMS6002D data sheet for the
register stages that drive this requirement.

Due to a extra clock cycle delay in bladeRF FPGA <= v0.3.3, we were
"getting away" with a 2-sample 0-pad. However, FPGA v0.3.4 removes the
extraneous delay, which requires us to end the burst properly, with 3
zero samples.
2015-07-25 15:30:19 -04:00
Jon Szymaniak
bf4ec73ab4 libbladeRF: Updated FPGA version compatibility table 2015-07-25 15:28:57 -04:00
Jon Szymaniak
60fe9c65e3 libbladeRF: Prepend installation prefix to file search paths
When searching for FPGA bitstreams or other files, we should be
searching locations relative to the installation prefix.

In an effort to avoid breaking existing packaging scripts, the
previously used paths "/usr/share/Nuand/bladeRF" and
"/etc/Nuand/bladeRF" have been kept in the search list, but at a lower
priority than the items with the installation prefix.
2015-07-22 12:06:05 -04:00
Jon Szymaniak
774e60b5d5 libbladeRF: Made some verbose log output clearer 2015-07-14 11:04:36 -04:00
Jon Szymaniak
9dad01f9fa libbladeRF: Fix #404, XB-200 filter bank selection regression in 41476cb
The fix for issue #394 introduced another defect via:

    /* Update state information regarding automatically selected filter.
     * Invalidate the entry if we're not performing automatic selection. */
    if (filter == BLADERF_XB200_AUTO_1DB || filter == BLADERF_XB200_AUTO_3DB) {
        dev->auto_filter[module] = filter;
    } else {
        dev->auto_filter[module] = -1;
    }

The problem is that xb200_auto_filter_selection() ends up calling this with
filter set to the desired filterbank. We should only apply this state update
when getting called from bladerf_xb200_set_filterbank(), and not when we're
updating the filter selection from xb200_auto_filter_selection().
2015-07-13 14:58:59 -04:00
Jon Szymaniak
962d7b2be9 libbladeRF: Support matching a subset of a serial number
Users no longer have to enter the entire serial number when using
bladerf_open() or bladerf_open_with_devinfo(). Instead, the
shortest unambiguous subset (starting at the first character) can
be used.

For example, for a bladeRF with serial f12ce1037830a1b27f3ceeba1f521413,
one could open it via the device string:
    "*:serial=f12c"

If the requested serial number subset is ambiguous, then libbladeRF
will open whichever matching device it encounters first.
2015-07-05 13:48:04 -04:00
Jon Szymaniak
5517732a24 libbladeRF: Updated version compat table for FPGA v0.3.3 2015-06-30 18:58:12 -04:00
Jon Szymaniak
93b91fd40a libbladeRF: Added verbose output for nios access operations 2015-06-24 10:51:54 -04:00
Jon Szymaniak
2ecffd28bd libbladeRF: Fixed build of dummy backend 2015-06-24 10:43:50 -04:00
Jon Szymaniak
57d47acbdb libbladeRF: Readback of current VCTCXO dac for FPGA >= v0.3.2 2015-06-23 23:12:04 -04:00
Jon Szymaniak
c0cbeeab24 libbladeRF: Fixed pkt_8x16 read operation
The data wasn't being provided back to the caller.
2015-06-23 23:12:04 -04:00
Jon Szymaniak
c9acfecef4 libbladeRF: Added vctcxo trim dac readback support 2015-06-22 22:47:18 -04:00
Jon Szymaniak
a2743426ef libbladeRF: Minor cleanup in XB200 path selection
Added checks of user-supplied module and path. Minor stylistic cleanup.
2015-06-22 11:43:18 -04:00
Jon Szymaniak
41476cbbce libbladeRF: Fixed #394, xb200 filterbank code cleanup
This fixes #394, in which selecting one of the auto filter selection
options prevents one of the specific settings from being used.

Some further cleanup and additional error checking has been
added to the xb200 filter bank functions.
2015-06-22 11:25:09 -04:00
Jon Szymaniak
f59f0709d0 libbladeRF: Added check_module() for use throughout lib code
There's a lot of bladerf_module checks in the codebase in one
form or another. These should get switched over to use check_module().
2015-06-22 10:43:06 -04:00
Jon Szymaniak
9dd6954613 libbladeRF: Moved IQ corr gain offset adjustment to top-level
Instead of duplicating this in the NIOS II pkt routines, it makes
more sense to have this up at the "top" in bladerf.c.

Backend code shouldn't need to understand the "meaning" of values
and need to adjust them -- it should only be concerned with
moving data to/from the device.
2015-06-18 20:20:58 -04:00
Jon Szymaniak
74104f1245 libbladeRF: Support schedule retune even if nios legacy pkt format is used
The retune packet is introduced in FPGA v0.2.0 and is unrelated to the
legacy packet formats. It can be used when legacy packet support is
disabled.
2015-06-18 20:20:58 -04:00
Jon Szymaniak
aa75d1ee68 libbladeRF: Updated version compat table for FPGA v0.3.1 2015-06-18 20:20:58 -04:00
Jon Szymaniak
d28a953ab9 libbladeRF: Use updated NIOS II packet formats for FPGA >= v0.3.0 2015-06-18 20:20:58 -04:00
Jon Szymaniak
b8143bd342 libbladeRF: Read device capabilities in backend FPGA load implementation
The backend may need to make decisions about what it needs to do
after loading an FPGA. Combined with the fact that the backend is
responsible for defining the initial capabilities, it's more sensible to
have the capabilities mask filled in during the backend open().
2015-06-18 20:20:58 -04:00
Jon Szymaniak
46092c45a7 libbladeRF: Fixed debug prints 2015-06-18 20:20:57 -04:00
Jon Szymaniak
a219666893 libbladeRF: Decoupling correction calls from USB code
The backend interface now presents functions for IQ gain/phase
access, instead of lumping it all under "FPGA corrections."

There is no need for the USB code to know anything about LMS
corrections, so this has been moved back up the top level,
with bladerf.c calling into the lms.c functions that now
provide this functionality.

The USB backend now hooks up calls to nios_legacy_* routines.
In the future we can maintain a USB backend that uses these, while
another backend structure proivdes the use of new NIOS packet handlers.
2015-06-18 20:20:57 -04:00
Jon Szymaniak
af5623019c libbladeRF: Moved legacy NIOS II access code to a separate file
The legacy NIOS II access code is being decoupled from the core
USB logic and moved to allow the usage of new NIOS II functionality
to be integrated.
2015-06-18 20:20:57 -04:00
Jon Szymaniak
9bd4ce9157 nios, libbladeRF: Macro renaming, added PIO addr defs
The legacy packet format uses magic values for the "address" for
PIO accesses. This commit adds some definitions of these to be shared
between the NIOS II code and the host code, to help reduce the
use of magic values.

Some general macro naming has been done to keep the macro naming
scheme for packet handlers more consistent.
2015-06-18 20:20:57 -04:00
Jon Szymaniak
4f37d2b202 libbladeRF, fpga_common: Fixed typo in legacy subdevice address macro 2015-06-18 20:20:57 -04:00
Jon Szymaniak
1c04e458d2 libbladeRF: Use capabilities mask for FPGA tuning check 2015-06-18 18:34:30 -04:00
Jon Szymaniak
a1d39c2811 libbladeRF: Use capabilities mask for timestamp support check 2015-06-18 18:34:30 -04:00
Jon Szymaniak
f3e31ab0c3 libbladeRF: Use capabilities mask for FW loopback support check 2015-06-18 18:34:30 -04:00
Jon Szymaniak
1b83428144 libbladeRF: Use capabilities mask for XB-200 support check 2015-06-18 18:34:30 -04:00
Jon Szymaniak
c86aee1bc9 libbladeRF: Use capabilities mask in usb.c 2015-06-18 18:34:30 -04:00