Changeset 9432
- Timestamp:
- 08/27/08 13:17:12
- Files:
-
- usrp2/trunk/host-ng/gr-usrp2/usrp2.i (modified) (5 diffs)
- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc (modified) (1 diff)
- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h (modified) (1 diff)
- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc (modified) (1 diff)
- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
usrp2/trunk/host-ng/gr-usrp2/usrp2.i
r9430 r9432 27 27 28 28 %{ 29 #include "gnuradio_swig_bug_workaround.h" // mandatory bug fix 30 #include "usrp2_sink_c.h" 29 //#include "usrp2_sink_c.h" 31 30 #include "usrp2_source_c.h" 32 31 %} 33 32 33 #if 0 34 34 // ---------------------------------------------------------------- 35 35 … … 45 45 46 46 }; 47 #endif 47 48 48 49 // ---------------------------------------------------------------- … … 60 61 }; 61 62 63 #if 0 62 64 // ---------------------------------------------------------------- 63 65 … … 76 78 77 79 }; 78 80 #endif 79 81 // ---------------------------------------------------------------- 80 82 … … 95 97 ~usrp2_source_c(); 96 98 99 bool set_gain(double gain); 100 bool set_center_freq(double frequency); 101 bool set_decim(int decimation_factor); 97 102 }; usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc
r9430 r9432 67 67 return d_u2->set_rx_decim(decimation_factor); 68 68 } 69 70 int71 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 62 62 bool set_decim(int decimation_factor); 63 63 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; 67 70 }; 68 71 usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc
r9430 r9432 48 48 { 49 49 } 50 51 int 52 usrp2_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 40 40 usrp2_make_source_c(const std::string &ifc, 41 41 const std::string &mac) throw (std::runtime_error); 42 42 43 43 protected: 44 44 usrp2_source_c(const std::string &ifc="eth0", … … 47 47 public: 48 48 ~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); 49 53 }; 50 54
