Changeset 9740

Show
Ignore:
Timestamp:
10/07/08 18:16:00
Author:
eb
Message:

Back changes out of usrp_standard.{h,cc}. Now identical to trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.cc

    r9733 r9740  
    2626#include "fpga_regs_common.h" 
    2727#include "fpga_regs_standard.h" 
    28 #include <db_boards.h> 
    2928#include <stdexcept> 
    3029#include <assert.h> 
    …… 
    103102  if (d_fpga_caps == OLD_CAPS_VAL) 
    104103    d_fpga_caps = DEFAULT_CAPS_VAL; 
    105  
    106104 
    107105  if (0){ 

  • gnuradio/branches/developers/eb/cppdb-wip/usrp/host/lib/legacy/usrp_standard.h

    r9733 r9740  
    5454  /*! 
    5555   * \brief number of digital upconverters implemented in the FPGA 
    56  
    5756   * This will be 0, 1, or 2. 
    5857   */ 
    5958  int nducs() const; 
    60    
    61   virtual bool set_rx_freq (int channel, double freq) { throw 0; } 
    62   virtual bool set_tx_freq (int channel, double freq) { throw 0; } 
    6359}; 
    6460 
    …… 
    7773  int                   d_hw_mux; 
    7874  double                d_rx_freq[MAX_CHAN]; 
    79   //db_base_sptr          d_db[2]; 
    8075 
    8176 protected: 
    …… 
    226221  int mux () const; 
    227222  unsigned int format () const; 
    228   //db_base_sptr db(int which) const; 
    229223 
    230224  // called in base class to derived class order 
    …… 
    260254  coarse_mod_t          d_coarse_mod[MAX_CHAN]; 
    261255  unsigned char         d_tx_modulator_shadow[MAX_CHAN]; 
    262   //db_base_sptr          d_db[2]; 
    263256 
    264257  virtual bool set_coarse_modulator (int channel, coarse_mod_t cm); 
    …… 
    365358  int nchannels () const; 
    366359  int mux () const; 
    367   //db_base_sptr db(int which) const; 
    368360 
    369361  // called in base class to derived class order