From 5b4f3cbbf8ebc2bf09ab6cfce0950db8718d8a60 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Wed, 17 Aug 2022 15:49:32 -0500 Subject: [PATCH] libbladeRF: 8bit fpga version check implemented async.c and sync.c throw an error if 8bit mode is detected with an fpga version < 0.15.0 --- .../libbladeRF/src/board/bladerf1/capabilities.c | 4 ++++ .../libbladeRF/src/board/bladerf2/capabilities.c | 4 ++++ host/libraries/libbladeRF/src/board/board.h | 5 +++++ host/libraries/libbladeRF/src/streaming/async.c | 8 ++++++++ host/libraries/libbladeRF/src/streaming/sync.c | 8 ++++++++ 5 files changed, 29 insertions(+) diff --git a/host/libraries/libbladeRF/src/board/bladerf1/capabilities.c b/host/libraries/libbladeRF/src/board/bladerf1/capabilities.c index c0bc5c3d..8454f5c7 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/capabilities.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/capabilities.c @@ -110,5 +110,9 @@ uint64_t bladerf1_get_fpga_capabilities(const struct bladerf_version *fpga_versi capabilities |= BLADERF_CAP_FPGA_PACKET_META; } + if (version_fields_greater_or_equal(fpga_version, 0, 15, 0)) { + capabilities |= BLADERF_CAP_FPGA_8BIT_SAMPLES; + } + return capabilities; } diff --git a/host/libraries/libbladeRF/src/board/bladerf2/capabilities.c b/host/libraries/libbladeRF/src/board/bladerf2/capabilities.c index 4fc30a77..1373a0b5 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/capabilities.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/capabilities.c @@ -98,5 +98,9 @@ uint64_t bladerf2_get_fpga_capabilities( capabilities |= BLADERF_CAP_FPGA_PACKET_META; } + if (version_fields_greater_or_equal(fpga_version, 0, 15, 0)) { + capabilities |= BLADERF_CAP_FPGA_8BIT_SAMPLES; + } + return capabilities; } diff --git a/host/libraries/libbladeRF/src/board/board.h b/host/libraries/libbladeRF/src/board/board.h index 9ec5bc8b..00e07295 100644 --- a/host/libraries/libbladeRF/src/board/board.h +++ b/host/libraries/libbladeRF/src/board/board.h @@ -156,6 +156,11 @@ */ #define BLADERF_CAP_FW_SHORT_PACKET (((uint64_t)1) << 38) +/** + * FPGA v0.15.0 introduces support for 8bit mode. + */ +#define BLADERF_CAP_FPGA_8BIT_SAMPLES (((uint64_t)1) << 39) + struct bladerf { /* Handle lock - to ensure atomic access to control and configuration * operations */ diff --git a/host/libraries/libbladeRF/src/streaming/async.c b/host/libraries/libbladeRF/src/streaming/async.c index 2d33fbf0..5889c8a5 100644 --- a/host/libraries/libbladeRF/src/streaming/async.c +++ b/host/libraries/libbladeRF/src/streaming/async.c @@ -101,6 +101,14 @@ int async_init_stream(struct bladerf_stream **stream, } } + if (format == BLADERF_FORMAT_SC8_Q7 || format == BLADERF_FORMAT_SC8_Q7_META) { + if (!have_cap_dev(dev, BLADERF_CAP_FPGA_8BIT_SAMPLES)) { + log_error("FPGA does not support 8bit mode. " + "Upgrade to at least FPGA version 0.15.0.\n"); + return BLADERF_ERR_UNSUPPORTED; + } + } + switch(format) { case BLADERF_FORMAT_SC8_Q7: case BLADERF_FORMAT_SC8_Q7_META: diff --git a/host/libraries/libbladeRF/src/streaming/sync.c b/host/libraries/libbladeRF/src/streaming/sync.c index 5e05dc00..fdd5a5bb 100644 --- a/host/libraries/libbladeRF/src/streaming/sync.c +++ b/host/libraries/libbladeRF/src/streaming/sync.c @@ -160,6 +160,14 @@ int sync_init(struct bladerf_sync *sync, } } + if (format == BLADERF_FORMAT_SC8_Q7 || format == BLADERF_FORMAT_SC8_Q7_META) { + if (!have_cap_dev(dev, BLADERF_CAP_FPGA_8BIT_SAMPLES)) { + log_error("FPGA does not support 8bit mode. " + "Upgrade to at least FPGA version 0.15.0.\n"); + return BLADERF_ERR_UNSUPPORTED; + } + } + switch (format) { case BLADERF_FORMAT_SC8_Q7: case BLADERF_FORMAT_SC8_Q7_META: