DBSRX: Fixed some ASSERT statements.

1 files changed, 8 insertions, 8 deletions

diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 327cb5f75..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;
 
@@ -280,10 +279,10 @@ void dbsrx::set_lo_freq(double target_freq){
     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));
+    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 (current: %f, new: %f) and m_divider %d"
@@ -351,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;
@@ -365,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;
@@ -403,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);