Changeset 9717

Show
Ignore:
Timestamp:
10/04/08 13:29:45
Author:
trondeau
Message:

Adding holder object for dboard pointers in base classes to export as db[x][y]. I'm not hugely fond of this, but it's the only way I could get it to work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.h

    r9656 r9717  
    7272  virtual ~usrp1_base (); 
    7373 
    74   virtual std::vector<db_base_sptr> db(int which)  
    75   { throw std::runtime_error("db called from base class\n"); } 
     74  std::vector< std::vector<db_base_sptr> > db; 
     75   
     76  virtual std::vector<db_base_sptr> dboard(int which)  
     77  { throw std::runtime_error("dboard called from base class\n"); } 
    7678   
    7779  virtual unsigned int determine_tx_mux_value(const std::vector<int> &subdev_spec)  

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.i

    r9656 r9717  
    2929// ================================================================ 
    3030namespace std { 
    31   %template() vector<db_base_sptr>;  
     31  %template() vector<db_base_sptr>; 
     32  %template(vect_vect_db) vector< vector<db_base_sptr> >; 
    3233} 
    3334 
    …… 
    4546  static const int READ_FAILED = -99999; 
    4647 
     48  std::vector< std::vector<db_base_sptr> > db; 
     49 
    4750  virtual ~usrp1_base (); 
    4851 
    49   virtual std::vector<db_base_sptr> db(int which); 
     52  virtual std::vector<db_base_sptr> dboard(int which); 
    5053 
    5154  virtual int determine_tx_mux_value(const std::vector<int> &subdev_spec); 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink.i

    r9688 r9717  
    4949 public: 
    5050  ~usrp1_sink_base (); 
    51  
    52   //std::vector<db_base_sptr> db(int which); 
    5351 
    5452  bool set_interp_rate (unsigned int rate); 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.cc

    r9656 r9717  
    5353    throw std::runtime_error ("can't open usrp1"); 
    5454 
     55  db = d_usrp->db(); 
     56 
    5557  // All calls to d_usrp->write must be multiples of 512 bytes. 
    5658 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h

    r9688 r9717  
    7777  // These must be included in here and not usrp1_base because of 
    7878  // usrp_standard_common used in that class 
    79   std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); } 
     79  std::vector<db_base_sptr> dboard(int which) { return d_usrp->db(which); } 
    8080  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);   
    8181  unsigned int determine_tx_mux_value(const std::vector<int> &subdev_spec); 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i

    r9688 r9717  
    3030  usrp1_source_base (const std::string &name, 
    3131                     gr_io_signature_sptr output_signature, 
    32                      int which_board, 
     32                     int which, 
    3333                     unsigned int decim_rate, 
    3434                     int nchan, 
    …… 
    134134 
    135135usrp1_source_c_sptr 
    136 usrp1_make_source_c (int which_board=0, 
     136usrp1_make_source_c (int which=0, 
    137137                     unsigned int decim_rate=64, 
    138138                     int nchan=1, 
    …… 
    147147class usrp1_source_c : public usrp1_source_base { 
    148148 protected: 
    149   usrp1_source_c (int which_board, unsigned int decim_rate, 
     149  usrp1_source_c (int which, unsigned int decim_rate, 
    150150                  int nchan, int mux, int mode, int fusb_block_size, int fusb_nblocks, 
    151151                  const std::string fpga_filename, const std::string fgpa_filename); 
    …… 
    161161 
    162162usrp1_source_s_sptr 
    163 usrp1_make_source_s (int which_board=0, 
     163usrp1_make_source_s (int which=0, 
    164164                     unsigned int decim_rate=64, 
    165165                     int nchan=1, 
    …… 
    175175class usrp1_source_s : public usrp1_source_base { 
    176176 protected: 
    177   usrp1_source_s (int which_board, unsigned int decim_rate, 
     177  usrp1_source_s (int which, unsigned int decim_rate, 
    178178                  int nchan, int mux, int mode, int fusb_block_size, int fusb_nblocks, 
    179179                  const std::string fpga_filename, const std::string firmware_filename); 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.cc

    r9656 r9717  
    3434usrp1_source_base::usrp1_source_base (const std::string &name, 
    3535                                      gr_io_signature_sptr output_signature, 
    36                                       int which_board, 
     36                                      int which, 
    3737                                      unsigned int decim_rate, 
    3838                                      int nchan, 
    …… 
    4646  : usrp1_base(name, gr_make_io_signature (0, 0, 0), output_signature), 
    4747    d_noverruns (0),  
    48     d_usrp(usrp_standard_rx::make (which_board, decim_rate,nchan, mux, mode, 
     48    d_usrp(usrp_standard_rx::make (which, decim_rate,nchan, mux, mode, 
    4949                                   fusb_block_size, fusb_nblocks, 
    5050                                   fpga_filename, firmware_filename)) 
    …… 
    5353    throw std::runtime_error ("can't open usrp1"); 
    5454 
    55   std::vector<db_base_sptr> dbtmp = d_usrp->db(0); 
     55  db = d_usrp->db(); 
    5656   
    5757  // All calls to d_usrp->read must be multiples of 512 bytes. 

  • gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h

    r9688 r9717  
    3838  usrp1_source_base (const std::string &name, 
    3939                     gr_io_signature_sptr output_signature, 
    40                      int which_board, 
     40                     int which, 
    4141                     unsigned int decim_rate, 
    4242                     int nchan, 
    …… 
    9393  // These must be included in here and not usrp1_base because of 
    9494  // usrp_standard_common used in that class 
    95   std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); }   
     95  std::vector<db_base_sptr> dboard(int which) { return d_usrp->db(which); }   
    9696  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec); 
    9797  unsigned int determine_rx_mux_value(const std::vector<int> &subdev_spec); 
    …… 
    100100  tune_result tune(int chan, db_base_sptr db, double target_freq) 
    101101  { return db->tune(chan, target_freq); } 
    102  
    103102  int work (int noutput_items, 
    104103            gr_vector_const_void_star &input_items,