Changeset 9672

Show
Ignore:
Timestamp:
09/28/08 15:02:52
Author:
trondeau
Message:

wip: a bit of cleanup and fixes, but set_freq still not working.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/features/cppdb/usrp/host/lib/legacy/db_dbs_rx.cc

    r9670 r9672  
    167167  m_test = m_max; 
    168168  while(m_test >= m_min) { 
    169     fdac_test = int(round(((bw * m_test / _refclk_freq())-4)/.145)); 
     169    fdac_test = static_cast<int>(round(((bw * m_test / _refclk_freq())-4)/.145)); 
    170170    if(fdac_test > 127) 
    171171      m_test = m_test - 1; 
    …… 
    269269    
    270270  if(gain < 24) { 
    271     gc2 = int(round(31.0 * (1-gain/24.0))); 
     271    gc2 = static_cast<int>(round(31.0 * (1-gain/24.0))); 
    272272    gain = 0; 
    273273  } 
    …… 
    285285  _set_gc1(gc1); 
    286286  _set_gc2(gc2); 
     287  _set_dl(dl); 
    287288  _set_pga(pga); 
    288289 
    …… 
    329330  assert(r>=0 && r<128); 
    330331  d_r = r; 
    331   d_r_int = int(round(log10(r)/log10(2)) - 1); 
     332  d_r_int = static_cast<int>(round(log10(r)/log10(2)) - 1); 
    332333  _send_reg(2); 
    333334} 
    …… 
    368369  freq_result_t args = {false, 0}; 
    369370   
    370   if(!(freq>=500e6 && freq<=2.6e9)) { 
     371  if(!(freq>=freq_min() && freq<=freq_max())) { 
    371372    return args; 
    372373  } 
    …… 
    388389  int n = 0; 
    389390  int best_r = 2; 
    390   int best_n =0; 
     391  int best_n = 0; 
    391392  int best_delta = 10e6; 
    392393  int delta; 
    393394   
    394395  while(r <= rmax) { 
    395     n = (int)rint(freq/(_refclk_freq()/r)); 
     396    n = static_cast<int>(round(freq/(_refclk_freq()/r))); 
    396397    if(r<rmin || n<256) { 
    397398      r = r * 2; 
    398399      continue; 
    399400    } 
    400     delta = (int)fabsf(n*_refclk_freq()/r - freq); 
     401    delta = (int)fabs(n*_refclk_freq()/r - freq); 
    401402    if(delta < 75e3) { 
    402403      best_r = r; 
    …… 
    413414  _set_r(best_r); 
    414415 
    415   _set_n(round(best_n)); 
     416  _set_n(static_cast<int>(round(best_n))); 
    416417  
    417418  int vco;