[Commit-gnuradio] r10325 - gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy

[eb]

Author: eb
Date: 2009-01-27 18:12:27 -0700 (Tue, 27 Jan 2009)
New Revision: 10325

Modified:
   
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.cc
   
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.h
   
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.i
   
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.cc
   
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.h
Log:
ready to test

Modified: 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.cc
===================================================================
--- 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.cc 
    2009-01-28 00:43:11 UTC (rev 10324)
+++ 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.cc 
    2009-01-28 01:12:27 UTC (rev 10325)
@@ -38,7 +38,7 @@
 /*****************************************************************************/
 
 db_base::db_base(usrp_basic_sptr usrp, int which)
-  : d_is_shutdown(false), d_raw_usrp(usrp.get()), d_which(which), 
d_lo_offset(0.0)
+  : d_is_shutdown(false), d_raw_usrp(usrp.get()), d_which(which), 
d_lo_offset(0.0), d_magic0(0)
 {
 }
 

Modified: 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.h
===================================================================
--- 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.h  
    2009-01-28 00:43:11 UTC (rev 10324)
+++ 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.h  
    2009-01-28 01:12:27 UTC (rev 10325)
@@ -49,6 +49,7 @@
   usrp_basic                  *d_raw_usrp;
   int                          d_which;
   double                       d_lo_offset;
+  double                       d_magic0;
 
   void _enable_refclk(bool enable);
   virtual double _refclk_freq();
@@ -76,6 +77,8 @@
   bool set_lo_offset(double offset);
   double lo_offset() { return d_lo_offset; }
 
+  double magic0() { return d_magic0; }
+  void set_magic0(double magic) { d_magic0 = magic; }
 
   ////////////////////////////////////////////////////////
   // derived classes should override the following methods

Modified: 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.i
===================================================================
--- 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.i  
    2009-01-28 00:43:11 UTC (rev 10324)
+++ 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_base.i  
    2009-01-28 01:12:27 UTC (rev 10325)
@@ -68,6 +68,9 @@
   bool set_lo_offset(double offset);
   double lo_offset() { return d_lo_offset; }
 
+  double magic0();
+  void set_magic0(double magic);
+
   virtual float gain_min() = 0;
   virtual float gain_max() = 0;
   virtual float gain_db_per_step() = 0;

Modified: 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.cc
===================================================================
--- 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.cc
 2009-01-28 00:43:11 UTC (rev 10324)
+++ 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.cc
 2009-01-28 01:12:27 UTC (rev 10325)
@@ -453,7 +453,7 @@
   
 
 struct freq_result_t
-xcvr2450::set_freq(double target_freq)
+xcvr2450::set_freq(double target_freq, double threshold)
 {
   struct freq_result_t args = {false, 0};
 
@@ -472,7 +472,8 @@
     scaler = 4.0/3.0;
   }
 
-  if(target_freq > 5.27e9) {
+  //if(target_freq > 5.27e9) {
+  if(target_freq > threshold) {        // KLUDGE
     d_highband = 1;
   }
   else {
@@ -634,6 +635,7 @@
    * @type which: int
    */
   
+  d_magic0 = 5.27e9;   // KLUDGE
   d_xcvr = _get_or_make_xcvr2450(usrp, which);
 }
 
@@ -649,7 +651,7 @@
    * ok is True or False and indicates success or failure,
    * actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
    */
-  return d_xcvr->set_freq(target_freq+d_lo_offset);
+  return d_xcvr->set_freq(target_freq+d_lo_offset, d_magic0);
 }
 
 bool

Modified: 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.h
===================================================================
--- 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.h
  2009-01-28 00:43:11 UTC (rev 10324)
+++ 
gnuradio/branches/developers/matt/xcvr2450-hack/usrp/host/lib/legacy/db_xcvr2450.h
  2009-01-28 01:12:27 UTC (rev 10325)
@@ -161,7 +161,7 @@
   bool set_rx_gain(float gain);
   bool set_tx_gain(float gain);
 
-  struct freq_result_t set_freq(double target_freq);
+  struct freq_result_t set_freq(double target_freq, double magic0);
 };