Commit graph

340 commits

Author SHA1 Message Date
Robert Ghilduta
6adfb3b594 libbladeRF: add note for normal meta mode 2020-11-23 00:59:27 -08:00
Robert Ghilduta
d294ba267b libbladeRF: add BLADERF_FORMAT_PACKET_META format 2020-11-23 00:59:27 -08:00
Robert Ghilduta
4dfbd52859 libbladeRF: set and unset config_gpio based on stream format 2020-11-23 00:59:27 -08:00
Robert Ghilduta
f03d84333b libbladeRF: clear up documentation 2019-10-01 16:46:12 -07:00
Robert Ghilduta
8e358c1941 libbladeRF: query backend for handle and lock 2019-09-01 22:51:27 -07:00
Robert Ghilduta
e3d7750e53 libbladeRF v2.2.1 2019-07-31 18:28:03 -05:00
Robert Ghilduta
0aca485ad0 libbladeRF: hdl: allow quicktune to control XB gpio register
This commit uses the reserved field of the pkt_retune NiOS packet to encode
xb_gpio register configuration data.
2019-04-02 01:59:55 -07:00
Robert Ghilduta
3bb8ad613e libbladeRF: add functionality to lock OTP 2018-12-27 18:33:33 -08:00
Robert Ghilduta
300d536ac1 libbladeRF: add OTP read/write support 2018-12-27 18:25:51 -08:00
Robert Ghilduta
1416d4918a libbladeRF: update FPGA flash type definitions 2018-12-26 00:21:14 -08:00
Rey Tucker
57b6abdc35 libbladeRF v2.2.0 2018-12-21 16:12:50 -05:00
Rey Tucker
d09761f2e4 host: libbladeRF: include inttypes.h in libbladeRF.h
This is where PRI{i,u,x}{32,64} are defined, which we use
in #defines further down. So, including inttypes.h is sort
of necessary.
2018-12-21 15:12:16 -05:00
Rey Tucker
9a0310d556 host: libbladeRF: minor doxygen fixes 2018-12-21 12:49:56 -05:00
Rey Tucker
825d986b4e host: libbladeRF: add bladerf_get_fpga_bytes() call
This adds a bladerf_get_fpga_bytes() function, which returns the
expected length of the FPGA image.

This is a dynamic replacement for BLADERF_FLASH_BYTE_LEN_FPGA,
which has been removed.

In particular, this is used in spi_flash_write_fpga_bitstream() and
spi_flash_erase_fpga() to determine the number of blocks to erase
during FPGA flashing operations.

This fixes an issue where xA9 boards were not being adequately
erased before writing.
2018-12-21 01:28:17 -08:00
Brian Glod
5081471c5b host: libbladeRF: Remove BLADERF_FLASH_EB_SIZE and BLADERF_FLASH_TO_EB(bytes)
Macros no longer needed/used.
2018-12-21 01:28:17 -08:00
Brian Glod
55bbfb1537 host: Remove BLADERF_FLASH_EB_FPGA and BLADERF_FLASH_EB_LEN_FPGA
Macros no longer needed:
- Switched to using byte-unit functions.
- Perform any byte->EB calculations internally based on device's flash
  architecture.
2018-12-21 01:28:17 -08:00
Brian Glod
b45a08d3d0 host: Remove BLADERF_FLASH_EB_CAL and BLADERF_FLASH_EB_LEN_CAL
Macros no longer needed once switching to byte-unit functions.
2018-12-21 01:28:17 -08:00
Brian Glod
44534c0799 host: Remove BLADERF_FLASH_EB_FIRMWARE and BLADERF_FLASH_EB_LEN_FIRMWARE
Replaced these macros with appropriate calculations using
BLADERF_FLASH_ADDR_FIRMWARE and the page size held in the device's flash
architecture structure. Page size may change depending on the flash
used.
2018-12-21 01:28:17 -08:00
Brian Glod
4cf375137f host: libbladeRF: Remove BLADERF_FLASH_PAGE_SIZE
Macro no longer used.
2018-12-21 01:28:17 -08:00
Brian Glod
d9293a85ab host: libbladeRF: Remove BLADERF_FLASH_TO_PAGES(bytes)
Macro no longer used.
2018-12-21 01:28:17 -08:00
Brian Glod
ae9f8440a1 host: libbladeRF: Remove BLADERF_FLASH_PAGE_FPGA
Replaced this macro with an appropriate calculation using the
BLADERF_FLASH_ADDR_FPGA macro and the page size held in the device's
flash architecture structure. Page size may change depending on the
flash used.
2018-12-21 01:28:17 -08:00
Brian Glod
4316bf6368 host: libbladeRF: Remove BLADERF_FLASH_PAGE_LEN_CAL
Macro is not used anywhere.
2018-12-21 01:28:17 -08:00
Brian Glod
9516216a25 host: libbladeRF: Remove BLADERF_FLASH_PAGE_CAL
Macro is not used anywhere.
2018-12-21 01:28:17 -08:00
Brian Glod
eb94ece146 host: libbladeRF: Remove BLADERF_FLASH_PAGE_LEN_FIRMWARE
Macro is not used anywhere.
2018-12-21 01:28:17 -08:00
Brian Glod
4caed4e280 host: libbladeRF: Remove BLADERF_FLASH_PAGE_FIRMWARE
Replaced the BLADERF_FLASH_PAGE_FIRMWARE macro with the appropriate
calculation using the page size held in the device's flash architecture
structure.
2018-12-21 01:28:17 -08:00
Brian Glod
048678df98 host: libbladeRF: API changes, BLADERF_FLASH_EB_SIZE usage
API change:
  - bladerf_image_write(): new parameter: bladeRF device handle
      Change is inspired by the pending removal of BLADERF_FLASH_EB_SIZE
      macro. This macro really shouldn't be exposed to the world, nor
      should it be constant as it may change depending on the flash
      used on the board.

API new function:
  - bladerf_erase_flash_bytes(): new function
      Similar to the existing bladerf_erase_flash() function, but
      handles the conversion from bytes to flash erase block pages
      internally. This function is recommended for new designs because
      the erase block size may change depending on the board. This
      function also checks for proper alignment along erase block
      boundaries.

General changes:
  Although the macro still exists (for now), all uses of
  BLADERF_FLASH_EB_SIZE have been replaced with equivalent
  dev->flash_arch->ebsize_bytes because the value may change depending
  on the flash used on the board.
2018-12-21 01:28:17 -08:00
Brian Glod
b0c1f750ea host: libbladeRF: API new bladerf_{read,write}_flash_bytes()
New API functions:
  - bladerf_read_flash_bytes()
      This function is nearly identical to the existing
      bladerf_read_flash() function, but takes the address and length in
      units of bytes instead of flash pages. The function performs the
      necessary conversions from bytes to pages internally based on the
      specific flash architecture in use.
  - bladerf_write_flash_bytes()
      Same as above, for writes.

New code is advised to use these byte-unit functions instead of the
older page-unit functions because the page size may not be guaranteed to
be 256 bytes in future bladeRF platforms.
2018-12-21 01:28:17 -08:00
Brian Glod
fdc1f341f3 host: libbladeRF: Remove BLADERF_FLASH_TOTAL_SIZE
Macro definition no longer used.
2018-12-21 01:28:17 -08:00
Brian Glod
907994587d host: libbladeRF: Replace BLADERF_FLASH_NUM_EBS
The BLADERF_FLASH_NUM_EBS macro was replaced with data from the device's
flash architecture structure (e.g. dev->flash_arch->num_ebs).

Functions with new parameters include:

- spi_flash.c: check_eb_access() - bladeRF device handle
2018-12-21 01:28:17 -08:00
Brian Glod
bc06d86ea3 host: libbladeRF: Replace BLADERF_FLASH_NUM_PAGES
The BLADERF_FLASH_NUM_PAGES macro was replaced with data from the
device's flash architecture structure (e.g. dev->flash_arch->num_pages).

Functions with new parameters include:
  - spi_flash.c: check_page_access() - bladeRF device handle
2018-12-21 01:28:17 -08:00
Brian Glod
03edb51ee4 host: libbladeRF API changes, BLADERF_FLASH_TOTAL_SIZE usage
API changes:
  - bladerf_alloc_image(): new parameter - bladeRF device handle
  - bladerf_alloc_cal_image(): new parameter - bladeRF device handle

General changes:
  Although the macro still exists (for now), all uses of the
  BLADERF_FLASH_TOTAL_SIZE macro have been replaced with equivalent
  dev->flash_arch->tsize_bytes because the value may change depending on
  teh flash used on the board.

  During this process, some function prototypes were modified so the
  device handle could be passed in, thus allowing flash architecture
  data to be extracted.

    - calibration.c: dc_cal_tbl_image_load()
    - image.c: is_valid_addr_len()
2018-12-21 01:28:17 -08:00
Rey Tucker
a7b6888747 host: bladeRF1.h: update docs to reflect deprecation 2018-12-11 13:07:49 -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
Brian Glod
37bd65d9c7 host: libbladeRF/bladeRF2: improve bladerf2_get_quick_tune()
A few changes to the bladerf_quick_tune structure:
  - rename 'profile' to 'rffe_profile' for clarity
  - delete 'data[16]' not needed anymore and preserves ABI compatibility
  - add    'nios_profile' for indexing the profile stored in the BBP
  - add    'port' for storing the RFFE port settings
  - add    'spdt' for storing the external RF switch settings

Improvements to bladerf2_get_quick_tune():
  - Send rffe_fastlock_save packet to instruct Nios to save a copy of
    the RFFE fast lock profile to itself. This means the fast lock
    profile data (16 bytes) no longer needs to be transmitted to/from
    the Nios and the host machine (retune speedup).
  - Save the RFFE port setting to the quick tune structure so it may be
    sent down to the Nios when scheduling a retune.

Saving the 16-bytes of fast lock profile data to the host is no longer
necessary because it is stored on the Nios itself. This has two
additional benefits: quicker retunes (the profile data does not need to
be shuffled across USB), and it preserves ABI compatibility because the
size of the bladerf_quick_tune struct does not increase compared to
previous versions of libbladeRF.
2018-11-26 16:03:46 -05:00
Brian Glod
a8e3e67568 host: libbladeRF/bladeRF2: implement bladerf2_get_quick_tune()
Update bladerf_quick_tune structure for bladeRF2 data. It now contains:
- profile (profile number, integer)
- data    (profile data, 16 bytes)

Fill in the bladerf2_get_quick_tune() function. The bladeRF2's RFIC uses
the concept of fast lock profiles, of which there are 8 for TX and 8 for
RX. These profiles store the VCO information needed to quickly change
frequencies. To use more than 8 profiles, the profiles may be stored
off-chip, which is what we're doing here.

1. It is assumed the RFIC has been tuned to a particular frequency.
2. The profile is created using ad9361_fastlock_store().
3. The profile is read back and stored in host memory using
   ad9361_fastlock_save().
2018-11-26 16:03:46 -05:00
Rey Tucker
97d0cfae2f libbladeRF v2.1.0 2018-10-30 16:34:14 -04:00
Robert Ghilduta
e1d8c61c44 libbladeRF: add meta RX hardware flags for underflow, miniexp{1,2} 2018-10-21 01:20:01 -07:00
Rey Tucker
fa73127ba0 host: libbladeRF: add bladerf_get_fpga_source()
Adds a new API call, bladerf_get_fpga_source(), which queries
the firmware for the source of the most recent FPGA programming.

This requires firmware v2.3.1 or later. Using an older firmware
will result in BLADERF_ERR_UNSUPPORTED.
2018-09-26 14:50:23 -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
Brian Glod
08a3a8cf76 host: libbladeRF: API add bladerf_get_flash_size()
New function allows the SPI flash size to be returned. Result is in
bytes.
2018-09-14 12:33:30 -04:00
Brian Glod
71bb8f1089 host: libbladeRF: Add flash ID decode to bladerf_open()
bladerf_open() will retrieve the SPI flash ID information from
the FX3 and decode it to get the flash density, page size, and other
architectural information required for flash interaction.

If the FX3 firmware does not support flash ID readback, assumptions will
be made based on the FPGA size. If FPGA size is not available, sane
defaults will be used. This should be sufficient to read calibration and
other important data from flash for board operation. Flashing an FPGA,
however, may not work depending on the device specifics.
2018-09-14 12:33:30 -04:00
Rey Tucker
32f84d3d11 libbladeRF: add bladerf_get_serial_struct function
Adds a bladerf_get_serial_struct function, which is similar
in functionality to bladerf_get_serial, but instead of requiring
a user-supplied buffer of at least BLADERF_SERIAL_LENGTH bytes,
it expects a pointer to a struct bladerf_serial which itself has
a buffer of BLADERF_SERIAL_LENGTH bytes as a member.

This turns BLADERF_SERIAL_LENGTH into an API-internal value,
instead of something that API users have to be intently aware of.

Fixes #382
2018-09-14 12:19:33 -04:00
Rey Tucker
f4ca0ba212 libbladeRF: add manufacturer/product strings to devinfo
Adds 'manufacturer' and 'product' members to the
bladerf_devinfo struct, and ensures they are properly
initialized and populated during enumeration.

These contain the human-readable manufacturer and
product names from the USB device descriptor.
2018-09-12 17:51:00 -04:00
Rey Tucker
045708a0f3 libbladeRF: add format macros for frequency, timestamp
Adds new format macros for displaying bladerf_frequency and
bladerf_timestamp values to libbladeRF.h.

Transitions bladerf1.c and bladerf2.c to use these new macros,
and also cleans up a few more places where the typedefs aren't
currently used.

Also fixes a doxygen warning for undocumented #defines in
bladeRF2.h.

Fixes #577
Fixes #618
Fixes #620
2018-09-12 17:50:40 -04:00
Rey Tucker
c556947565
Revert "host: add a product description string to devinfo" (#622)
* Revert "Revert "host: add format macros for bladerf_frequency, bladerf_timestamp" (#621)"

This reverts commit 5e481b1db2.

* Revert "bladeRF-cli: ensure device is initialized after deferred open"

This reverts commit 5ed03a3b01.

* Revert "bladeRF-cli: print product string where relevant"

This reverts commit 2ccd6e3d5e.

* Revert "libbladeRF: add 'product' string to devinfo"

This reverts commit 11a71d835a.
2018-09-10 21:39:03 -04:00
Rey Tucker
5e481b1db2
Revert "host: add format macros for bladerf_frequency, bladerf_timestamp" (#621)
* Revert "bladeRF-cli: ensure device is initialized after deferred open"

This reverts commit 5ed03a3b01.

* Revert "bladeRF-cli: print product string where relevant"

This reverts commit 2ccd6e3d5e.

* Revert "libbladeRF: add 'product' string to devinfo"

This reverts commit 11a71d835a.

* Revert "bladeRF-cli: update print/sets to use typedefs"

This reverts commit a4b176c516.

* Revert "libbladeRF: add format macros for frequency, timestamp"

This reverts commit 1cf6a7871c.
2018-09-10 21:32:11 -04:00
Rey Tucker
11a71d835a libbladeRF: add 'product' string to devinfo
Adds a 'product' member to the bladerf_devinfo struct, and
populates it during device enumeration.

This will contain a human-readable description of the found
device, built from the USB Manufacturer and Product strings.
2018-09-07 18:16:09 -04:00
Rey Tucker
1cf6a7871c libbladeRF: add format macros for frequency, timestamp
Adds new format macros for displaying bladerf_frequency and
bladerf_timestamp values to libbladeRF.h.

Transitions bladerf1.c and bladerf2.c to use these new macros,
and also cleans up a few more places where the typedefs aren't
currently used.
2018-09-07 18:15:34 -04:00
Rey Tucker
13afbb8d8e libbladeRF: move rf_ports into low-level functions
These settings generally don't need to be manually adjusted,
because higher-level functions (e.g. bladerf_set_frequency)
handle the setup in coordination with the rest of the RF
hardware (e.g. via bladerf_get_rf_switch_config).
2018-09-07 18:15:06 -04:00
Brian Glod
5e808b843c bladeRF1: Fix nios_gpio assignment for AGC_EN
Fixes #607

The nios_gpio bit assignment for AGC_EN was already being used for
led(1). This commit also fixes a bug in the agc_band_sel signal
assignment introduced in 3b670ca.
2018-09-06 12:01:22 -04:00