[Commit-gnuradio] r9740 - gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy

[eb]

Author: eb
Date: 2008-10-07 18:16:00 -0600 (Tue, 07 Oct 2008)
New Revision: 9740

Modified:
   
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc
   
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.h
Log:
Back changes out of usrp_standard.{h,cc}.  Now identical to trunk

Modified: 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc
===================================================================
--- 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc 
    2008-10-08 00:14:46 UTC (rev 9739)
+++ 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc 
    2008-10-08 00:16:00 UTC (rev 9740)
@@ -25,7 +25,6 @@
 #include "usrp_prims.h"
 #include "fpga_regs_common.h"
 #include "fpga_regs_standard.h"
-#include <db_boards.h>
 #include <stdexcept>
 #include <assert.h>
 #include <math.h>
@@ -103,7 +102,6 @@
   if (d_fpga_caps == OLD_CAPS_VAL)
     d_fpga_caps = DEFAULT_CAPS_VAL;
 
-
   if (0){
     fprintf(stdout, "has_rx_halfband = %d\n", has_rx_halfband());
     fprintf(stdout, "nddcs           = %d\n", nddcs());

Modified: 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.h
===================================================================
--- 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.h  
    2008-10-08 00:14:46 UTC (rev 9739)
+++ 
gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.h  
    2008-10-08 00:16:00 UTC (rev 9740)
@@ -53,13 +53,9 @@
 
   /*!
    * \brief number of digital upconverters implemented in the FPGA
-
    * This will be 0, 1, or 2.
    */
   int nducs() const;
-  
-  virtual bool set_rx_freq (int channel, double freq) { throw 0; }
-  virtual bool set_tx_freq (int channel, double freq) { throw 0; }
 };
 
 /*!
@@ -76,7 +72,6 @@
   int                  d_sw_mux;
   int                  d_hw_mux;
   double               d_rx_freq[MAX_CHAN];
-  //db_base_sptr          d_db[2];
 
  protected:
   usrp_standard_rx (int which_board,
@@ -225,7 +220,6 @@
   int nchannels () const;
   int mux () const;
   unsigned int format () const;
-  //db_base_sptr db(int which) const;
 
   // called in base class to derived class order
   bool start ();
@@ -259,7 +253,6 @@
   double               d_tx_freq[MAX_CHAN];
   coarse_mod_t         d_coarse_mod[MAX_CHAN];
   unsigned char                d_tx_modulator_shadow[MAX_CHAN];
-  //db_base_sptr          d_db[2];
 
   virtual bool set_coarse_modulator (int channel, coarse_mod_t cm);
   usrp_standard_tx::coarse_mod_t coarse_modulator (int channel) const;
@@ -364,7 +357,6 @@
   double tx_freq (int channel) const;
   int nchannels () const;
   int mux () const;
-  //db_base_sptr db(int which) const;
 
   // called in base class to derived class order
   bool start ();