[Commit-gnuradio] r9672 - gnuradio/branches/features/cppdb/usrp/host/lib/legacy

[trondeau]

Author: trondeau
Date: 2008-09-28 15:02:52 -0600 (Sun, 28 Sep 2008)
New Revision: 9672

Modified:
   gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dbs_rx.cc
Log:
wip: a bit of cleanup and fixes, but set_freq still not working.

Modified: gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dbs_rx.cc
===================================================================
--- gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dbs_rx.cc  
2008-09-28 20:48:43 UTC (rev 9671)
+++ gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dbs_rx.cc  
2008-09-28 21:02:52 UTC (rev 9672)
@@ -166,7 +166,7 @@
   m_min = int(ceil(_refclk_freq()/2.5e6));
   m_test = m_max;
   while(m_test >= m_min) {
-    fdac_test = int(round(((bw * m_test / _refclk_freq())-4)/.145));
+    fdac_test = static_cast<int>(round(((bw * m_test / 
_refclk_freq())-4)/.145));
     if(fdac_test > 127)
       m_test = m_test - 1;
     else
@@ -268,7 +268,7 @@
   }
    
   if(gain < 24) {
-    gc2 = int(round(31.0 * (1-gain/24.0)));
+    gc2 = static_cast<int>(round(31.0 * (1-gain/24.0)));
     gain = 0;
   }
   else {
@@ -284,6 +284,7 @@
   pga = gain;
   _set_gc1(gc1);
   _set_gc2(gc2);
+  _set_dl(dl);
   _set_pga(pga);
 
   return true;
@@ -328,7 +329,7 @@
 {
   assert(r>=0 && r<128);
   d_r = r;
-  d_r_int = int(round(log10(r)/log10(2)) - 1);
+  d_r_int = static_cast<int>(round(log10(r)/log10(2)) - 1);
   _send_reg(2);
 }
 
@@ -367,7 +368,7 @@
   
   freq_result_t args = {false, 0};
   
-  if(!(freq>=500e6 && freq<=2.6e9)) {
+  if(!(freq>=freq_min() && freq<=freq_max())) {
     return args;
   }
   
@@ -387,17 +388,17 @@
   int r = 2;
   int n = 0;
   int best_r = 2;
-  int best_n =0;
+  int best_n = 0;
   int best_delta = 10e6;
   int delta;
   
   while(r <= rmax) {
-    n = (int)rint(freq/(_refclk_freq()/r));
+    n = static_cast<int>(round(freq/(_refclk_freq()/r)));
     if(r<rmin || n<256) {
       r = r * 2;
       continue;
     }
-    delta = (int)fabsf(n*_refclk_freq()/r - freq);
+    delta = (int)fabs(n*_refclk_freq()/r - freq);
     if(delta < 75e3) {
       best_r = r;
       best_n = n;
@@ -412,7 +413,7 @@
   }
   _set_r(best_r);
 
-  _set_n(round(best_n));
+  _set_n(static_cast<int>(round(best_n)));
  
   int vco;
   if(vcofreq < 2433e6)