diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
| commit | 1b70b3e70df40aae4d1e53037212d77af2fdc4e4 (patch) | |
| tree | dcde2a418b7cfb4672e5ef5e57bbf85ae3c2d4b1 /host/lib/usrp/dboard | |
| parent | 811444b126ed40aed115af4464422122afd0c607 (diff) | |
| parent | 006c321c552781501bcb0cff9e156c991c24ce45 (diff) | |
| download | uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.gz uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.bz2 uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/dboard')
| -rw-r--r-- | host/lib/usrp/dboard/db_ubx.cpp | 10 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_xcvr2450.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
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); 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 |