From a5402b78d97e96124de3b7b48a187fac21578cdb Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Tue, 1 Jul 2014 22:44:32 -0400 Subject: [PATCH] libbladeRF: Fixed incorrect LMS LPF register configuration Two issues existed in the LMS LPF configuration: (1) The LPF bypass was not being disabled when switching to BLADERF_LPF_DISABLED. Therefore, its state would be different depending on whether the previous state was BLADERF_LPF_BYPASSED or BLADERF_LPF_NORMAL. (2) BLADERF_LPF_BYPASSED was leaving the LPF powered on. According to the TX/RX LPF block diagram (Figure 3.5, in v1.1r4) in the LMS6002D programming guide, this implies that the LPF was enabled while its input was shorted to its output. --- host/libraries/libbladeRF/src/lms.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/host/libraries/libbladeRF/src/lms.c b/host/libraries/libbladeRF/src/lms.c index 333f4722..9cb1a16a 100644 --- a/host/libraries/libbladeRF/src/lms.c +++ b/host/libraries/libbladeRF/src/lms.c @@ -369,14 +369,25 @@ int lms_lpf_set_mode(struct bladerf *dev, bladerf_module mod, return status; } - if (mode == BLADERF_LPF_DISABLED) { - data_l &= ~(1 << 1); /* Power down LPF */ - } else if (mode == BLADERF_LPF_BYPASSED) { - data_l |= (1 << 1); /* Enable LPF */ - data_h |= (1 << 6); /* Enable LPF bypass */ - } else { - data_l |= (1 << 1); /* Enable LPF */ - data_h &= ~(1 << 6); /* Disable LPF bypass */ + switch (mode) { + case BLADERF_LPF_NORMAL: + data_l |= (1 << 1); /* Enable LPF */ + data_h &= ~(1 << 6); /* Disable LPF bypass */ + break; + + case BLADERF_LPF_BYPASSED: + data_l &= ~(1 << 1); /* Power down LPF */ + data_h |= (1 << 6); /* Enable LPF bypass */ + break; + + case BLADERF_LPF_DISABLED: + data_l &= ~(1 << 1); /* Power down LPF */ + data_h &= ~(1 << 6); /* Disable LPF bypass */ + break; + + default: + log_debug("Invalid LPF mode: %d\n", mode); + return BLADERF_ERR_INVAL; } status = bladerf_lms_write(dev, reg, data_l);