diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 6644b57a..b26edb17 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -1039,6 +1039,63 @@ int CALL_CONV bladerf_set_tuning_mode(struct bladerf *dev, /** @} (End of FN_TUNING) */ +/** + * @defgroup FN_RF_PORTS RF Ports + * + * These functions provide the ability to select various RF ports for RX and TX + * channels. + * + * These functions are thread-safe. + * + * @{ + */ + +/** + * Set the RF port + * + * @param dev Device handle + * @param ch Channel + * @param port RF port name + * + * @return 0 on success, value from \ref RETCODES list on failure + */ +API_EXPORT +int CALL_CONV bladerf_set_rf_port(struct bladerf *dev, bladerf_channel ch, + const char *port); + +/** + * Get the RF port + * + * @param dev Device handle + * @param ch Channel + * @param port RF port name + * + * @return 0 on success, value from \ref RETCODES list on failure + */ +API_EXPORT +int CALL_CONV bladerf_get_rf_port(struct bladerf *dev, bladerf_channel ch, + const char **port); + +/** + * Get available RF ports + * + * This function may be called with `NULL` for `ports`, or 0 for `count`, to + * determine the number of RF ports. + * + * @param dev Device handle + * @param ch Channel + * @param ports RF port names + * @param count Number to populate + * + * @return Number of RF ports on success, value from \ref RETCODES list on + * failure + */ +API_EXPORT +int CALL_CONV bladerf_get_rf_ports(struct bladerf *dev, bladerf_channel ch, + const char **ports, unsigned int count); + +/** @} (End of FN_RF_PORTS) */ + /** * @defgroup FN_TRIG Triggers * diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 35a2ea0e..d40576e1 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -700,6 +700,46 @@ int bladerf_select_band(struct bladerf *dev, bladerf_channel ch, return status; } +/******************************************************************************/ +/* RF Ports*/ +/******************************************************************************/ + +int bladerf_set_rf_port(struct bladerf *dev, bladerf_channel ch, + const char *port) +{ + int status; + MUTEX_LOCK(&dev->lock); + + status = dev->board->set_rf_port(dev, ch, port); + + MUTEX_UNLOCK(&dev->lock); + return status; +} + +int bladerf_get_rf_port(struct bladerf *dev, bladerf_channel ch, + const char **port) +{ + int status; + MUTEX_LOCK(&dev->lock); + + status = dev->board->get_rf_port(dev, ch, port); + + MUTEX_UNLOCK(&dev->lock); + return status; +} + +int bladerf_get_rf_ports(struct bladerf *dev, bladerf_channel ch, + const char **ports, unsigned int count) +{ + int status; + MUTEX_LOCK(&dev->lock); + + status = dev->board->get_rf_ports(dev, ch, ports, count); + + MUTEX_UNLOCK(&dev->lock); + return status; +} + /******************************************************************************/ /* Scheduled Tuning */ /******************************************************************************/ diff --git a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c index f61314be..c8f8f714 100644 --- a/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c +++ b/host/libraries/libbladeRF/src/board/bladerf1/bladerf1.c @@ -1322,6 +1322,25 @@ static int bladerf1_select_band(struct bladerf *dev, bladerf_channel ch, uint64_ return band_select(dev, ch, frequency < BLADERF1_BAND_HIGH); } +/******************************************************************************/ +/* RF ports */ +/******************************************************************************/ + +static int bladerf1_set_rf_port(struct bladerf *dev, bladerf_channel ch, const char *port) +{ + return BLADERF_ERR_UNSUPPORTED; +} + +static int bladerf1_get_rf_port(struct bladerf *dev, bladerf_channel ch, const char **port) +{ + return BLADERF_ERR_UNSUPPORTED; +} + +static int bladerf1_get_rf_ports(struct bladerf *dev, bladerf_channel ch, const char **ports, unsigned int count) +{ + return BLADERF_ERR_UNSUPPORTED; +} + /******************************************************************************/ /* Scheduled Tuning */ /******************************************************************************/ @@ -2266,6 +2285,9 @@ const struct board_fns bladerf1_board_fns = { FIELD_INIT(.get_frequency_range, bladerf1_get_frequency_range), FIELD_INIT(.set_frequency, bladerf1_set_frequency), FIELD_INIT(.select_band, bladerf1_select_band), + FIELD_INIT(.set_rf_port, bladerf1_set_rf_port), + FIELD_INIT(.get_rf_port, bladerf1_get_rf_port), + FIELD_INIT(.get_rf_ports, bladerf1_get_rf_ports), FIELD_INIT(.get_quick_tune, bladerf1_get_quick_tune), FIELD_INIT(.schedule_retune, bladerf1_schedule_retune), FIELD_INIT(.cancel_scheduled_retunes, bladerf1_cancel_scheduled_retunes), diff --git a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c index 73a9439a..830f7333 100644 --- a/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c +++ b/host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c @@ -763,6 +763,25 @@ static int bladerf2_select_band(struct bladerf *dev, bladerf_channel ch, uint64_ return BLADERF_ERR_UNSUPPORTED; } +/******************************************************************************/ +/* RF ports */ +/******************************************************************************/ + +static int bladerf2_set_rf_port(struct bladerf *dev, bladerf_channel ch, const char *port) +{ + return BLADERF_ERR_UNSUPPORTED; +} + +static int bladerf2_get_rf_port(struct bladerf *dev, bladerf_channel ch, const char **port) +{ + return BLADERF_ERR_UNSUPPORTED; +} + +static int bladerf2_get_rf_ports(struct bladerf *dev, bladerf_channel ch, const char **ports, unsigned int count) +{ + return BLADERF_ERR_UNSUPPORTED; +} + /******************************************************************************/ /* Scheduled Tuning */ /******************************************************************************/ @@ -1197,6 +1216,9 @@ const struct board_fns bladerf2_board_fns = { FIELD_INIT(.get_frequency_range, bladerf2_get_frequency_range), FIELD_INIT(.set_frequency, bladerf2_set_frequency), FIELD_INIT(.select_band, bladerf2_select_band), + FIELD_INIT(.set_rf_port, bladerf2_set_rf_port), + FIELD_INIT(.get_rf_port, bladerf2_get_rf_port), + FIELD_INIT(.get_rf_ports, bladerf2_get_rf_ports), FIELD_INIT(.get_quick_tune, bladerf2_get_quick_tune), FIELD_INIT(.schedule_retune, bladerf2_schedule_retune), FIELD_INIT(.cancel_scheduled_retunes, bladerf2_cancel_scheduled_retunes), diff --git a/host/libraries/libbladeRF/src/board/board.h b/host/libraries/libbladeRF/src/board/board.h index 13507292..9e964733 100644 --- a/host/libraries/libbladeRF/src/board/board.h +++ b/host/libraries/libbladeRF/src/board/board.h @@ -103,6 +103,11 @@ struct board_fns { int (*get_frequency_range)(struct bladerf *dev, bladerf_channel ch, struct bladerf_range *range); int (*select_band)(struct bladerf *dev, bladerf_channel ch, uint64_t frequency); + /* RF Ports */ + int (*set_rf_port)(struct bladerf *dev, bladerf_channel ch, const char *port); + int (*get_rf_port)(struct bladerf *dev, bladerf_channel ch, const char **port); + int (*get_rf_ports)(struct bladerf *dev, bladerf_channel ch, const char **ports, unsigned int count); + /* Scheduled Tuning */ int (*get_quick_tune)(struct bladerf *dev, bladerf_channel ch, struct bladerf_quick_tune *quick_tune); int (*schedule_retune)(struct bladerf *dev, bladerf_channel ch, uint64_t timestamp, uint64_t frequency, struct bladerf_quick_tune *quick_tune);