From 74104f12451be677c802645c2c52c27eed797ee2 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Thu, 18 Jun 2015 12:11:57 -0400 Subject: [PATCH] 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. --- .../src/backend/usb/nios_legacy_access.c | 11 --------- .../src/backend/usb/nios_legacy_access.h | 23 ------------------- .../libbladeRF/src/backend/usb/usb.c | 19 +++++++++------ 3 files changed, 12 insertions(+), 41 deletions(-) diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c index ce713892..fb6dd362 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c +++ b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.c @@ -580,14 +580,3 @@ int nios_legacy_expansion_gpio_dir_write(struct bladerf *dev, uint32_t val) log_verbose("%s: 0x%08\n", __FUNCTION__, val); return nios_legacy_pio_write(dev, NIOS_PKT_LEGACY_PIO_ADDR_EXP_DIR, val); } - -int nios_legacy_retune(struct bladerf *dev, bladerf_module module, - uint64_t timestamp, uint16_t nint, uint32_t nfrac, - uint8_t freqsel, uint8_t vcocap, bool low_band, - bool quick_tune) -{ - log_debug("%s: The selected NIOS access routines do not support this.", - __FUNCTION__); - - return BLADERF_ERR_UNSUPPORTED; -} diff --git a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h index 81a1c384..ffac382b 100644 --- a/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h +++ b/host/libraries/libbladeRF/src/backend/usb/nios_legacy_access.h @@ -261,27 +261,4 @@ int nios_legacy_expansion_gpio_dir_read(struct bladerf *dev, uint32_t *val); */ int nios_legacy_expansion_gpio_dir_write(struct bladerf *dev, uint32_t val); -/** - * Dummy handler for a retune request, which is not supported on - * earlier FPGA versions. - * - * All of the following parameters are ignored. - * - * @param[in] dev Device handle - * @param[in] module Module to retune - * @param[in] timestamp Time to schedule retune at - * @param[in] nint Integer portion of frequency multiplier - * @param[in] nfrac Fractional portion of frequency multiplier - * @param[in] freqsel VCO and divider selection - * @param[in] low_band High vs low band selection - * @param[in] quick_tune Denotes quick tune should be used instead of - * tuning algorithm - * - * @return BLADERF_ERR_UNSUPPORTED - */ -int nios_legacy_retune(struct bladerf *dev, bladerf_module module, - uint64_t timestamp, uint16_t nint, uint32_t nfrac, - uint8_t freqsel, uint8_t vcocap, bool low_band, - bool quick_tune); - #endif diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.c b/host/libraries/libbladeRF/src/backend/usb/usb.c index 3341097a..85e3f9dc 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.c +++ b/host/libraries/libbladeRF/src/backend/usb/usb.c @@ -173,13 +173,18 @@ static int post_fpga_load_init(struct bladerf *dev) /* Update device capabilities mask based upon FPGA version number */ capabilities_init_post_fpga_load(dev); - /* Switch to our newer NIOS II request/response packet format - * if the FPGA supports it */ - if (have_cap(dev, BLADERF_CAP_PKT_HANDLER_FMT)) { - log_verbose("Using current packet handler formats\n"); - dev->fn = &backend_fns_usb; + if (!getenv("BLADERF_FORCE_LEGACY_NIOS_PKT")) { + /* Switch to our newer NIOS II request/response packet format + * if the FPGA supports it */ + if (have_cap(dev, BLADERF_CAP_PKT_HANDLER_FMT)) { + log_verbose("Using current packet handler formats\n"); + dev->fn = &backend_fns_usb; + } else { + log_verbose("Using legacy packet handler format\n"); + } } else { - log_verbose("Using legacy current packet handler format\n"); + dev->capabilities &= ~(BLADERF_CAP_PKT_HANDLER_FMT); + log_verbose("Using legacy packet handler format due to env var\n"); } return status; @@ -1111,7 +1116,7 @@ const struct backend_fns backend_fns_usb_legacy = { FIELD_INIT(.submit_stream_buffer, usb_submit_stream_buffer), FIELD_INIT(.deinit_stream, usb_deinit_stream), - FIELD_INIT(.retune, nios_legacy_retune), + FIELD_INIT(.retune, nios_retune), FIELD_INIT(.load_fw_from_bootloader, usb_load_fw_from_bootloader), };