[Commit-gnuradio] r9273 - gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy

[trondeau]

Author: trondeau
Date: 2008-08-13 21:21:35 -0600 (Wed, 13 Aug 2008)
New Revision: 9273

Modified:
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.cc
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.h
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_basic.cc
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_tv_rx.cc
   
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_standard.cc
Log:
cleaning up

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.cc   
2008-08-14 02:07:39 UTC (rev 9272)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.cc   
2008-08-14 03:21:35 UTC (rev 9273)
@@ -347,9 +347,9 @@
     residual_freq = dxc_freq.ddc_freq - 
((usrp_standard_tx*)d_usrp)->tx_freq(chan);
   }
 
-  tune_result res = tune_result(baseband_freq, dxc_freq.ddc_freq, 
residual_freq, dxc_freq.inverted);
+  tune_result res = tune_result(baseband_freq, dxc_freq.ddc_freq, 
+                               residual_freq, dxc_freq.inverted);
   res.ok = true;
      
   return res;
 }
-

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.h    
2008-08-14 02:07:39 UTC (rev 9272)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_base.h    
2008-08-14 03:21:35 UTC (rev 9273)
@@ -32,7 +32,6 @@
 
 #define NUM_DAUGHTERBOARDS 1
 
-
 class tune_result
 {
 public:  

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_basic.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_basic.cc  
2008-08-14 02:07:39 UTC (rev 9272)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_basic.cc  
2008-08-14 03:21:35 UTC (rev 9273)
@@ -21,7 +21,7 @@
 #include <db_basic.h>
 
 
-/**************************************************************************************************/
+/******************************************************************************/
 
 db_basic_tx::db_basic_tx(usrp_basic *usrp, int which)
   : db_base(usrp, which, true)
@@ -155,9 +155,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.
   
-  struct freq_result_t args = {0, 0};
-  args.ok = true;
-  args.baseband_freq = 0.0;
+  struct freq_result_t args = {true, 0.0};
   return args;
 }
 

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc 
2008-08-14 02:07:39 UTC (rev 9272)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_flexrf.cc 
2008-08-14 03:21:35 UTC (rev 9273)
@@ -187,7 +187,6 @@
   return 64e6/_refclk_divisor();
 }
 
-//std::vector<float>
 struct freq_result_t
 flexrf_base::set_freq(float freq)
 {
@@ -197,7 +196,6 @@
     actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
   */
 
-  //std::vector<float> args(2, 0);
   struct freq_result_t args = {false, 0};
 
   // Offsetting the LO helps get the Tx carrier leakage out of the way.

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_tv_rx.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_tv_rx.cc  
2008-08-14 02:07:39 UTC (rev 9272)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/db_tv_rx.cc  
2008-08-14 03:21:35 UTC (rev 9273)
@@ -200,7 +200,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.
   
-  freq_result_t args = {0, 0};
+  freq_result_t args = {false, 0};
 
   float fmin = freq_min();
   float fmax = freq_max();

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_standard.cc 
    2008-08-14 02:07:39 UTC (rev 9272)
+++ 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_standard.cc 
    2008-08-14 03:21:35 UTC (rev 9273)
@@ -398,18 +398,6 @@
   return d_rx_freq[channel];
 }
 
-/*
-db_base_sptr 
-usrp_standard_rx::db(
-int which) const
-{
-  if(which > 1) {
-        throw std::invalid_argument("usrp_standard_tx::db which is not 0 or 
1");
-  }
-  return d_db[which];
-}
-*/
-
 bool
 usrp_standard_rx::set_fpga_mode (int mode)
 {
@@ -567,10 +555,6 @@
     d_coarse_mod[i] = CM_OFF;
     set_tx_freq (i, 0);
   }
-
-  // int usrp_basic::d_dbid[4] -->  daughterboard ID's; 2,3 for Tx
-  d_db[0] = instantiate_dbs(d_dbid[2], this, which_board);
-  d_db[1] = instantiate_dbs(d_dbid[3], this, which_board);
 }
 
 usrp_standard_tx::~usrp_standard_tx ()
@@ -839,17 +823,6 @@
   return d_tx_freq[channel];
 }
 
-/*
-db_base_sptr 
-usrp_standard_tx::db(int which) const
-{
-  if(which > 1) {
-    throw std::invalid_argument("usrp_standard_tx::db which is not 0 or 1");
-  }
-  return d_db[which];
-}
-*/
-
 usrp_standard_tx::coarse_mod_t
 usrp_standard_tx::coarse_modulator (int channel) const
 {