Changeset 9432

Show
Ignore:
Timestamp:
08/27/08 13:17:12
Author:
jcorgan
Message:

wip

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • usrp2/trunk/host-ng/gr-usrp2/usrp2.i

    r9430 r9432  
    2727 
    2828%{ 
    29 #include "gnuradio_swig_bug_workaround.h"       // mandatory bug fix 
    30 #include "usrp2_sink_c.h" 
     29  //#include "usrp2_sink_c.h" 
    3130#include "usrp2_source_c.h" 
    3231%} 
    3332 
     33#if 0 
    3434// ---------------------------------------------------------------- 
    3535 
     
    4545 
    4646}; 
     47#endif 
    4748 
    4849// ---------------------------------------------------------------- 
     
    6061}; 
    6162 
     63#if 0 
    6264// ---------------------------------------------------------------- 
    6365 
     
    7678 
    7779}; 
    78  
     80#endif 
    7981// ---------------------------------------------------------------- 
    8082 
     
    9597  ~usrp2_source_c(); 
    9698 
     99  bool set_gain(double gain); 
     100  bool set_center_freq(double frequency); 
     101  bool set_decim(int decimation_factor); 
    97102}; 
  • usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc

    r9430 r9432  
    6767  return d_u2->set_rx_decim(decimation_factor); 
    6868} 
    69  
    70 int 
    71 usrp2_source_base::work(int noutput_items, 
    72                         gr_vector_const_void_star &input_items, 
    73                         gr_vector_void_star &output_items) 
    74 { 
    75   return noutput_items; 
    76 } 
  • usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h

    r9430 r9432  
    6262  bool set_decim(int decimation_factor); 
    6363 
    64   int work(int noutput_items, 
    65            gr_vector_const_void_star &input_items, 
    66            gr_vector_void_star &output_items); 
     64  /*! 
     65   * \brief Derived class must override this 
     66   */ 
     67  virtual int work(int noutput_items, 
     68                   gr_vector_const_void_star &input_items, 
     69                   gr_vector_void_star &output_items) = 0; 
    6770}; 
    6871 
  • usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc

    r9430 r9432  
    4848{ 
    4949} 
     50 
     51int 
     52usrp2_source_c::work(int noutput_items, 
     53                     gr_vector_const_void_star &input_items, 
     54                     gr_vector_void_star &output_items) 
     55{ 
     56  return noutput_items; 
     57} 
  • usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h

    r9430 r9432  
    4040  usrp2_make_source_c(const std::string &ifc, 
    4141                      const std::string &mac) throw (std::runtime_error); 
    42  
     42   
    4343protected: 
    4444  usrp2_source_c(const std::string &ifc="eth0", 
     
    4747public: 
    4848  ~usrp2_source_c(); 
     49 
     50  int work(int noutput_items, 
     51           gr_vector_const_void_star &input_items, 
     52           gr_vector_void_star &output_items); 
    4953}; 
    5054