Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

2 files changed, 15 insertions, 13 deletions

diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 23cafea53..99137dda3 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -239,7 +239,6 @@ void dbsrx::set_lo_freq(double target_freq){
     double actual_freq=0.0, pfd_freq=0.0, ref_clock=0.0;
     int R=0, N=0, r=0, m=0;
     bool update_filter_settings = false;
-
     //choose refclock
     std::vector<double> clock_rates = this->get_iface()->get_clock_rates(dboard_iface::UNIT_RX);
     BOOST_FOREACH(ref_clock, std::reversed(std::sorted(clock_rates))){
@@ -251,7 +250,7 @@ void dbsrx::set_lo_freq(double target_freq){
 
         if(dbsrx_debug) std::cerr << boost::format(
             "DBSRX: trying ref_clock %f and m_divider %d"
-        ) % (this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX)) % m << std::endl;
+        ) % (ref_clock) % m << std::endl;
 
         if (m >= 32) continue;
 
@@ -277,15 +276,17 @@ void dbsrx::set_lo_freq(double target_freq){
         }
     } 
 
-    //Assert because we failed to find a suitable combination of ref_clock, R and N 
-    UHD_ASSERT_THROW(ref_clock/(1 << m) < 1e6 or ref_clock/(1 << m) > 2.5e6);
-    UHD_ASSERT_THROW((pfd_freq < dbsrx_pfd_freq_range.min) or (pfd_freq > dbsrx_pfd_freq_range.max));
-    UHD_ASSERT_THROW((N < 256) or (N > 32768));
     done_loop:
 
+    //Assert because we failed to find a suitable combination of ref_clock, R and N 
+    UHD_ASSERT_THROW(ref_clock <= 27.0e6 and ref_clock >= 0.0);
+    UHD_ASSERT_THROW(ref_clock/m >= 1e6 and ref_clock/m <= 2.5e6);
+    UHD_ASSERT_THROW((pfd_freq >= dbsrx_pfd_freq_range.min) and (pfd_freq <= dbsrx_pfd_freq_range.max));
+    UHD_ASSERT_THROW((N >= 256) and (N <= 32768));
+
     if(dbsrx_debug) std::cerr << boost::format(
-        "DBSRX: choose ref_clock %f and m_divider %d"
-    ) % (this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX)) % m << std::endl;
+        "DBSRX: choose ref_clock (current: %f, new: %f) and m_divider %d"
+    ) % (this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX)) % ref_clock % m << std::endl;
 
     //if ref_clock or m divider changed, we need to update the filter settings
     if (ref_clock != this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX) or m != _max2118_write_regs.m_divider) update_filter_settings = true;
@@ -349,7 +350,7 @@ void dbsrx::set_lo_freq(double target_freq){
                         "DBSRX: Tuning exceeded vco range, _max2118_write_regs.osc_band == %d\n" 
                         ) % int(_max2118_write_regs.osc_band))
                 );
-                UHD_ASSERT_THROW(_max2118_read_regs.adc == 0);
+                UHD_ASSERT_THROW(_max2118_read_regs.adc != 0); //just to cause a throw
             }
             if (_max2118_write_regs.osc_band <= 0) break;
             _max2118_write_regs.osc_band -= 1;
@@ -363,7 +364,7 @@ void dbsrx::set_lo_freq(double target_freq){
                         "DBSRX: Tuning exceeded vco range, _max2118_write_regs.osc_band == %d\n" 
                         ) % int(_max2118_write_regs.osc_band))
                 );
-                UHD_ASSERT_THROW(_max2118_read_regs.adc == 0);
+                UHD_ASSERT_THROW(_max2118_read_regs.adc != 7); //just to cause a throw
             }
             if (_max2118_write_regs.osc_band >= 7) break;
             _max2118_write_regs.osc_band += 1;
@@ -401,6 +402,7 @@ void dbsrx::set_lo_freq(double target_freq){
         << boost::format("    Ref    Freq=%fMHz\n") % (ref_clock/1e6)
         << boost::format("    Target Freq=%fMHz\n") % (target_freq/1e6)
         << boost::format("    Actual Freq=%fMHz\n") % (_lo_freq/1e6)
+        << boost::format("    VCO    Freq=%fMHz\n") % (vco_freq/1e6)
         << std::endl;
 
     if (update_filter_settings) set_bandwidth(_bandwidth);
diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp
index b1fc2ea76..10be8d1c3 100644
--- a/host/lib/usrp/dboard/db_tvrx.cpp
+++ b/host/lib/usrp/dboard/db_tvrx.cpp
@@ -58,7 +58,7 @@ static const bool tvrx_debug = false;
 
 static const freq_range_t tvrx_freq_range(50e6, 860e6);
 
-static const prop_names_t tvrx_antennas = list_of(""); //only got one
+static const prop_names_t tvrx_antennas = list_of("RX");
 
 static const uhd::dict<std::string, freq_range_t> tvrx_freq_ranges = map_list_of
     ("VHFLO", freq_range_t(50e6, 158e6))
@@ -73,7 +73,7 @@ static const boost::array<double, 17> vhflo_gains_db =
      50.30000, 50.30000}};
 
 static const boost::array<double, 17> vhfhi_gains_db =
-    {{13.3000,  -13.3000,  -13.3000,   -1.0000,    7.7000,
+    {{-13.3000,  -13.3000,  -13.3000,   -1.0000,    7.7000,
     11.0000,   14.7000,   19.3000,   26.1000,   36.0000,
     42.7000,   46.0000,   47.0000,   47.8000,   48.2000,
     48.2000,   48.2000}};
@@ -436,7 +436,7 @@ void tvrx::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_ANTENNA:
-        val = std::string("");
+        val = tvrx_antennas.front(); //there's only one
         return;
 
     case SUBDEV_PROP_ANTENNA_NAMES: