From ac55b6edebc1e13ffd493f9637e3b50d565bbc19 Mon Sep 17 00:00:00 2001 From: Rey Tucker Date: Mon, 5 Feb 2018 16:34:14 -0500 Subject: [PATCH] host: libbladeRF: add per-device query of supported loopback modes * host: libbladeRF: add bladerf_get_loopback_modes Returns a pointer to an array of supported loopback modes. * host: libbladeRF: add bladerf_is_loopback_mode_supported() Tests if a given loopback mode is supported on a device --- .../libraries/libbladeRF/include/libbladeRF.h | 38 +++++++++++++ host/libraries/libbladeRF/src/bladerf.c | 27 ++++++++++ .../libbladeRF/src/board/bladerf1/bladerf1.c | 53 +++++++++++++++++++ .../libbladeRF/src/board/bladerf2/bladerf2.c | 29 ++++++++++ host/libraries/libbladeRF/src/board/board.h | 1 + 5 files changed, 148 insertions(+) diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 885f3c38..de9ad875 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -1178,6 +1178,44 @@ typedef enum { BLADERF_LB_AD9361_BIST, } bladerf_loopback; +/** + * Mapping of human-readable names to loopback modes + */ +struct bladerf_loopback_modes { + const char *name; /**< Name of loopback mode */ + bladerf_loopback mode; /**< Loopback mode enumeration */ +}; + +/** + * Get loopback modes + * + * Populates `modes` with a pointer to an array of structs containing the + * supported loopback modes. + * + * This function may be called with `NULL` for `modes` to determine the number + * of loopback modes supported. + * + * @param dev Device handle + * @param[out] modes Supported loopback modes + * + * @return Number of loopback modes on success, value from \ref RETCODES list + * on failure + */ +API_EXPORT +int CALL_CONV bladerf_get_loopback_modes( + struct bladerf *dev, struct bladerf_loopback_modes const **modes); + +/** + * Test if a given loopback mode is supported on this device. + * + * @param dev Device handle + * @param[in] mode bladerf_loopback enum to check + * + * @return true if supported, false if not (or on error) + */ +API_EXPORT bool CALL_CONV bladerf_is_loopback_mode_supported( + struct bladerf *dev, bladerf_loopback mode); + /** * Apply specified loopback mode * diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index f76b6195..68372c88 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -1312,6 +1312,33 @@ int bladerf_get_tuning_mode(struct bladerf *dev, bladerf_tuning_mode *mode) /* Loopback */ /******************************************************************************/ +int bladerf_get_loopback_modes(struct bladerf *dev, + struct bladerf_loopback_modes const **modes) +{ + int status; + + status = dev->board->get_loopback_modes(dev, modes); + + return status; +} + +bool bladerf_is_loopback_mode_supported(struct bladerf *dev, + bladerf_loopback mode) +{ + struct bladerf_loopback_modes modes; + struct bladerf_loopback_modes const *modesptr = &modes; + + int count = bladerf_get_loopback_modes(dev, &modesptr); + + for (int i = 0; i < count; ++i) { + if (modesptr[i].mode == mode) { + return true; + } + } + + return false; +} + int bladerf_set_loopback(struct bladerf *dev, bladerf_loopback l) { int status; diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c index ec9d6c4a..71cd8fcd 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c @@ -156,6 +156,7 @@ static const struct bladerf_range bladerf1_tx_gain_range = { }; /* RX gain modes */ + static const struct bladerf_gain_modes bladerf1_rx_gain_modes[] = { { FIELD_INIT(.name, "default"), @@ -257,6 +258,47 @@ static const struct bladerf_range bladerf1_xb200_frequency_range = { FIELD_INIT(.scale, 1), }; +/* Loopback modes */ + +static const struct bladerf_loopback_modes bladerf1_loopback_modes[] = { + { + FIELD_INIT(.name, "none"), + FIELD_INIT(.mode, BLADERF_LB_NONE) + }, + { + FIELD_INIT(.name, "firmware"), + FIELD_INIT(.mode, BLADERF_LB_FIRMWARE) + }, + { + FIELD_INIT(.name, "bb_txlpf_rxvga2"), + FIELD_INIT(.mode, BLADERF_LB_BB_TXLPF_RXVGA2) + }, + { + FIELD_INIT(.name, "bb_txlpf_rxlpf"), + FIELD_INIT(.mode, BLADERF_LB_BB_TXLPF_RXLPF) + }, + { + FIELD_INIT(.name, "bb_txvga1_rxvga2"), + FIELD_INIT(.mode, BLADERF_LB_BB_TXVGA1_RXVGA2) + }, + { + FIELD_INIT(.name, "bb_txvga1_rxlpf"), + FIELD_INIT(.mode, BLADERF_LB_BB_TXVGA1_RXLPF) + }, + { + FIELD_INIT(.name, "rf_lna1"), + FIELD_INIT(.mode, BLADERF_LB_RF_LNA1) + }, + { + FIELD_INIT(.name, "rf_lna2"), + FIELD_INIT(.mode, BLADERF_LB_RF_LNA2) + }, + { + FIELD_INIT(.name, "rf_lna3"), + FIELD_INIT(.mode, BLADERF_LB_RF_LNA3) + }, +}; + /******************************************************************************/ /* Low-level Initialization */ /******************************************************************************/ @@ -2438,6 +2480,16 @@ static int bladerf1_get_tuning_mode(struct bladerf *dev, bladerf_tuning_mode *mo /* Loopback */ /******************************************************************************/ +static int bladerf1_get_loopback_modes( + struct bladerf *dev, struct bladerf_loopback_modes const **modes) +{ + if (modes != NULL) { + *modes = bladerf1_loopback_modes; + } + + return ARRAY_SIZE(bladerf1_loopback_modes); +} + static int bladerf1_set_loopback(struct bladerf *dev, bladerf_loopback l) { struct bladerf1_board_data *board_data = dev->board_data; @@ -2927,6 +2979,7 @@ const struct board_fns bladerf1_board_fns = { FIELD_INIT(.device_reset, bladerf1_device_reset), FIELD_INIT(.set_tuning_mode, bladerf1_set_tuning_mode), FIELD_INIT(.get_tuning_mode, bladerf1_get_tuning_mode), + FIELD_INIT(.get_loopback_modes, bladerf1_get_loopback_modes), FIELD_INIT(.set_loopback, bladerf1_set_loopback), FIELD_INIT(.get_loopback, bladerf1_get_loopback), FIELD_INIT(.get_rx_mux, bladerf1_get_rx_mux), diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 0293d259..25c32fe7 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -513,6 +513,24 @@ static const struct band_port_map bladerf2_tx_band_port_map[] = { FIELD_INIT(.ad9361_port, TXA), }, }; + +/* Loopback modes */ + +static const struct bladerf_loopback_modes bladerf2_loopback_modes[] = { + { + FIELD_INIT(.name, "none"), + FIELD_INIT(.mode, BLADERF_LB_NONE) + }, + { + FIELD_INIT(.name, "firmware"), + FIELD_INIT(.mode, BLADERF_LB_FIRMWARE) + }, + { + FIELD_INIT(.name, "rf_bist"), + FIELD_INIT(.mode, BLADERF_LB_AD9361_BIST) + }, +}; + // clang-format on /******************************************************************************/ @@ -3340,6 +3358,16 @@ static int bladerf2_get_tuning_mode(struct bladerf *dev, /* Loopback */ /******************************************************************************/ +static int bladerf2_get_loopback_modes( + struct bladerf *dev, struct bladerf_loopback_modes const **modes) +{ + if (modes != NULL) { + *modes = bladerf2_loopback_modes; + } + + return ARRAY_SIZE(bladerf2_loopback_modes); +} + static int bladerf2_set_loopback(struct bladerf *dev, bladerf_loopback l) { struct bladerf2_board_data *board_data; @@ -3817,6 +3845,7 @@ const struct board_fns bladerf2_board_fns = { FIELD_INIT(.device_reset, bladerf2_device_reset), FIELD_INIT(.set_tuning_mode, bladerf2_set_tuning_mode), FIELD_INIT(.get_tuning_mode, bladerf2_get_tuning_mode), + FIELD_INIT(.get_loopback_modes, bladerf2_get_loopback_modes), FIELD_INIT(.set_loopback, bladerf2_set_loopback), FIELD_INIT(.get_loopback, bladerf2_get_loopback), FIELD_INIT(.get_rx_mux, bladerf2_get_rx_mux), diff --git a/host/libraries/libbladeRF/src/board/board.h b/host/libraries/libbladeRF/src/board/board.h index 9c2191d2..c17f7b72 100644 --- a/host/libraries/libbladeRF/src/board/board.h +++ b/host/libraries/libbladeRF/src/board/board.h @@ -251,6 +251,7 @@ struct board_fns { int (*get_tuning_mode)(struct bladerf *dev, bladerf_tuning_mode *mode); /* Loopback */ + int (*get_loopback_modes)(struct bladerf *dev, struct bladerf_loopback_modes const **modes); int (*set_loopback)(struct bladerf *dev, bladerf_loopback l); int (*get_loopback)(struct bladerf *dev, bladerf_loopback *l);