From 60920644aa33d1a6f7a4dac30bdb890b9bc4301f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 26 Sep 2016 16:24:02 -0700 Subject: xcvr: Query ref clock, not ADC/DAC clock On the USRP2 and N2x0, these values are the same, but on the X3x0, they might differ. --- host/lib/usrp/dboard/db_xcvr2450.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host/lib/usrp/dboard') diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp index 4a3f69f69..aa0bae8b8 100644 --- a/host/lib/usrp/dboard/db_xcvr2450.cpp +++ b/host/lib/usrp/dboard/db_xcvr2450.cpp @@ -371,7 +371,7 @@ double xcvr2450::set_lo_freq_core(double target_freq){ //variables used in the calculation below double scaler = xcvr2450::is_highband(target_freq)? (4.0/5.0) : (4.0/3.0); - double ref_freq = this->get_iface()->get_codec_rate(dboard_iface::UNIT_TX); + double ref_freq = this->get_iface()->get_clock_rate(dboard_iface::UNIT_TX); int R, intdiv, fracdiv; //loop through values until we get a match -- cgit v1.2.3 From 006c321c552781501bcb0cff9e156c991c24ce45 Mon Sep 17 00:00:00 2001 From: Nicolas Cuervo Date: Wed, 5 Oct 2016 20:21:25 -0700 Subject: UBX: changed default performance parameters --- host/lib/usrp/dboard/db_ubx.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'host/lib/usrp/dboard') diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp index 7416de735..05a02c321 100644 --- a/host/lib/usrp/dboard/db_ubx.cpp +++ b/host/lib/usrp/dboard/db_ubx.cpp @@ -1146,17 +1146,17 @@ private: set_cpld_field(RXLNA1_FORCEON, 1); set_cpld_field(RXLNA2_FORCEON, 1); - /* // Placeholders in case some components need to be forced on to // reduce settling time. Note that some FORCEON lines are still gated // by other bits in the CPLD register are are asserted during // frequency tuning. - set_cpld_field(RXAMP_FORCEON, 0); - set_cpld_field(RXDEMOD_FORCEON, 0); + set_cpld_field(RXAMP_FORCEON, 1); + set_cpld_field(RXDEMOD_FORCEON, 1); set_cpld_field(RXDRV_FORCEON, 0); set_cpld_field(RXMIXER_FORCEON, 0); - set_cpld_field(RXLO1_FORCEON, 0); - set_cpld_field(RXLO2_FORCEON, 0); + set_cpld_field(RXLO1_FORCEON, 1); + set_cpld_field(RXLO2_FORCEON, 1); + /* //set_cpld_field(TXDRV_FORCEON, 1); // controlled by RX antenna selection set_cpld_field(TXMOD_FORCEON, 0); set_cpld_field(TXMIXER_FORCEON, 0); -- cgit v1.2.3