diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index 683f3d74..64c274c4 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -153,6 +153,15 @@ typedef enum { BLADERF_LNA_GAIN_MAX /**< LNA Max Gain */ } bladerf_lna_gain; +/** + * LPF mode + */ +typedef enum { + BLADERF_LPF_NORMAL, /**< LPF connected and enabled */ + BLADERF_LPF_BYPASSED, /**< LPF bypassed */ + BLADERF_LPF_DISABLED /**< LPF disabled */ +} bladerf_lpf_mode; + /** * Module selection for those which have both RX and TX constituents */ @@ -571,6 +580,30 @@ API_EXPORT int bladerf_set_bandwidth(struct bladerf *dev, bladerf_module module, API_EXPORT int bladerf_get_bandwidth(struct bladerf *dev, bladerf_module module, unsigned int *bandwidth); +/** + * Set the LMS LPF mode to bypass or disable it + * + * @param dev Device handle + * @param module Module for mode request + * @param mode Mode to be set + * + * @return 0 on success, value from \ref RETCODES list on failure + */ +API_EXPORT int bladerf_set_lpf_mode(struct bladerf *dev, bladerf_module module, + bladerf_lpf_mode mode); + +/** + * Get the current mode of the LMS LPF + * + * @param dev Device handle + * @param module Module for mode request + * @param mode Current mode of the LPF + * + * @return 0 on success, value from \ref RETCODES list on failure + */ +API_EXPORT int bladerf_get_lpf_mode(struct bladerf *dev, bladerf_module module, + bladerf_lpf_mode *mode); + /** * Select the appropriate band path given a frequency in Hz. * diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 983434b1..94e31bd3 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -394,6 +394,22 @@ int bladerf_get_bandwidth(struct bladerf *dev, bladerf_module module, return 0; } +int bladerf_set_lpf_mode(struct bladerf *dev, bladerf_module module, + bladerf_lpf_mode mode) +{ + /* TODO: Make return values for lms call and return it for failure */ + lms_lpf_set_mode( dev, module, mode ); + return 0; +} + +int bladerf_get_lpf_mode(struct bladerf *dev, bladerf_module module, + bladerf_lpf_mode *mode) +{ + /* TODO: Make return values for lms call and return it for failure */ + lms_lpf_get_mode( dev, module, mode ); + return 0; +} + int bladerf_select_band(struct bladerf *dev, bladerf_module module, unsigned int frequency) { diff --git a/host/libraries/libbladeRF/src/lms.c b/host/libraries/libbladeRF/src/lms.c index 7f6c8950..032b013d 100644 --- a/host/libraries/libbladeRF/src/lms.c +++ b/host/libraries/libbladeRF/src/lms.c @@ -91,25 +91,41 @@ void lms_lpf_enable(struct bladerf *dev, bladerf_module mod, lms_bw_t bw) return; } -void lms_lpf_bypass(struct bladerf *dev, bladerf_module mod) -{ - uint8_t reg = (mod == BLADERF_MODULE_RX) ? 0x55 : 0x35; - uint8_t data; - bladerf_lms_read(dev, reg, &data); - data |= (1<<6); - bladerf_lms_write(dev, reg, data); - return; -} - -// Disable the LPF for a specific module -void lms_lpf_disable(struct bladerf *dev, bladerf_module mod) +void lms_lpf_get_mode(struct bladerf *dev, bladerf_module mod, bladerf_lpf_mode *mode) { uint8_t reg = (mod == BLADERF_MODULE_RX) ? 0x54 : 0x34; uint8_t data; + bladerf_lms_read(dev, reg, &data); - data &= ~(1<<6); - bladerf_lms_write(dev, reg, data); - return; + if (!(data&(1<<6))) { + *mode = BLADERF_LPF_DISABLED; + } else { + bladerf_lms_read(dev, reg+1, &data); + if (data&(1<<6)) { + *mode = BLADERF_LPF_BYPASSED; + } else { + *mode = BLADERF_LPF_NORMAL; + } + } +} + +void lms_lpf_set_mode(struct bladerf *dev, bladerf_module mod, bladerf_lpf_mode mode) +{ + uint8_t reg = (mod == BLADERF_MODULE_RX) ? 0x54 : 0x34; + uint8_t data_l, data_h; + bladerf_lms_read(dev, reg, &data_l); + bladerf_lms_read(dev, reg+1, &data_h); + if (mode == BLADERF_LPF_DISABLED) { + data_l &= ~(1<<6); + } else if (mode == BLADERF_LPF_BYPASSED) { + data_l |= (1<<6); + data_h |= (1<<6); + } else { + data_l |= (1<<6); + data_h &= ~(1<<6); + } + bladerf_lms_write(dev, reg , data_l); + bladerf_lms_write(dev, reg+1, data_h); } // Get the bandwidth for the selected module @@ -500,7 +516,7 @@ void lms_loopback_enable(struct bladerf *dev, bladerf_loopback mode) case BLADERF_LB_BB_VGA2: // Disable RXLPF first - lms_lpf_disable(dev, BLADERF_MODULE_RX); + lms_lpf_set_mode(dev, BLADERF_MODULE_RX, BLADERF_LPF_DISABLED); // Enable TX and RX loopback lms_tx_loopback_enable(dev, TXLB_BB); @@ -511,7 +527,7 @@ void lms_loopback_enable(struct bladerf *dev, bladerf_loopback mode) // Disable RXLPF, RXVGA2, and RXVGA1 lms_rxvga1_disable(dev); lms_rxvga2_disable(dev); - lms_lpf_disable(dev, BLADERF_MODULE_RX); + lms_lpf_set_mode(dev, BLADERF_MODULE_RX, BLADERF_LPF_DISABLED); // Enable TX and RX loopback lms_tx_loopback_enable(dev, TXLB_BB); diff --git a/host/libraries/libbladeRF/src/lms.h b/host/libraries/libbladeRF/src/lms.h index 3c01be70..fcdba3bb 100644 --- a/host/libraries/libbladeRF/src/lms.h +++ b/host/libraries/libbladeRF/src/lms.h @@ -123,20 +123,24 @@ unsigned int lms_bw2uint(lms_bw_t bw); void lms_lpf_enable(struct bladerf *dev, bladerf_module mod, lms_bw_t bw); /** - * Explicitly bypass the low-pass filter - * + * Set the LPF mode + * * @param[in] dev Device handle * @param[in] mod Module to change + * @param[in] mode Mode to set to */ -void lms_lpf_bypass(struct bladerf *dev, bladerf_module mod); +void lms_lpf_set_mode(struct bladerf *dev, bladerf_module mod, + bladerf_lpf_mode mode); /** - * Disable the LPF for a specific module - * + * Get the LPF mode + * * @param[in] dev Device handle * @param[in] mod Module to change + * @param[out] mode Current LPF mode */ -void lms_lpf_disable(struct bladerf *dev, bladerf_module mod); +void lms_lpf_get_mode(struct bladerf *dev, bladerf_module mod, + bladerf_lpf_mode *mode); /** * Get the bandwidth for the selected module