[Commit-gnuradio] r9432 - usrp2/trunk/host-ng/gr-usrp2

[jcorgan]

Author: jcorgan
Date: 2008-08-27 13:17:12 -0600 (Wed, 27 Aug 2008)
New Revision: 9432

Modified:
   usrp2/trunk/host-ng/gr-usrp2/usrp2.i
   usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc
   usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h
   usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc
   usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h
Log:
wip

Modified: usrp2/trunk/host-ng/gr-usrp2/usrp2.i
===================================================================
--- usrp2/trunk/host-ng/gr-usrp2/usrp2.i        2008-08-27 03:47:40 UTC (rev 
9431)
+++ usrp2/trunk/host-ng/gr-usrp2/usrp2.i        2008-08-27 19:17:12 UTC (rev 
9432)
@@ -26,11 +26,11 @@
 %import "gnuradio.i"                           // the common stuff
 
 %{
-#include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
-#include "usrp2_sink_c.h"
+  //#include "usrp2_sink_c.h"
 #include "usrp2_source_c.h"
 %}
 
+#if 0
 // ----------------------------------------------------------------
 
 class usrp2_sink_base : public gr_sync_block {
@@ -44,6 +44,7 @@
   ~usrp2_sink_base();
 
 };
+#endif
 
 // ----------------------------------------------------------------
 
@@ -59,6 +60,7 @@
 
 };
 
+#if 0
 // ----------------------------------------------------------------
 
 GR_SWIG_BLOCK_MAGIC(usrp2,sink_c)
@@ -75,7 +77,7 @@
   ~usrp2_sink_c();
 
 };
-
+#endif
 // ----------------------------------------------------------------
 
 GR_SWIG_BLOCK_MAGIC(usrp2,source_c)
@@ -94,4 +96,7 @@
 public:
   ~usrp2_source_c();
 
+  bool set_gain(double gain);
+  bool set_center_freq(double frequency);
+  bool set_decim(int decimation_factor);
 };

Modified: usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc
===================================================================
--- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc   2008-08-27 03:47:40 UTC 
(rev 9431)
+++ usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.cc   2008-08-27 19:17:12 UTC 
(rev 9432)
@@ -66,11 +66,3 @@
 {
   return d_u2->set_rx_decim(decimation_factor);
 }
-
-int
-usrp2_source_base::work(int noutput_items,
-                       gr_vector_const_void_star &input_items,
-                       gr_vector_void_star &output_items)
-{
-  return noutput_items;
-}

Modified: usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h
===================================================================
--- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h    2008-08-27 03:47:40 UTC 
(rev 9431)
+++ usrp2/trunk/host-ng/gr-usrp2/usrp2_source_base.h    2008-08-27 19:17:12 UTC 
(rev 9432)
@@ -61,9 +61,12 @@
    */
   bool set_decim(int decimation_factor);
 
-  int work(int noutput_items,
-          gr_vector_const_void_star &input_items,
-          gr_vector_void_star &output_items);
+  /*!
+   * \brief Derived class must override this
+   */
+  virtual int work(int noutput_items,
+                  gr_vector_const_void_star &input_items,
+                  gr_vector_void_star &output_items) = 0;
 };
 
 #endif /* INCLUDED_USRP2_SOURCE_BASE_H */

Modified: usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc
===================================================================
--- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc      2008-08-27 03:47:40 UTC 
(rev 9431)
+++ usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.cc      2008-08-27 19:17:12 UTC 
(rev 9432)
@@ -47,3 +47,11 @@
 usrp2_source_c::~usrp2_source_c()
 {
 }
+
+int
+usrp2_source_c::work(int noutput_items,
+                    gr_vector_const_void_star &input_items,
+                    gr_vector_void_star &output_items)
+{
+  return noutput_items;
+}

Modified: usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h
===================================================================
--- usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h       2008-08-27 03:47:40 UTC 
(rev 9431)
+++ usrp2/trunk/host-ng/gr-usrp2/usrp2_source_c.h       2008-08-27 19:17:12 UTC 
(rev 9432)
@@ -39,13 +39,17 @@
   friend usrp2_source_c_sptr
   usrp2_make_source_c(const std::string &ifc,
                      const std::string &mac) throw (std::runtime_error);
-
+  
 protected:
   usrp2_source_c(const std::string &ifc="eth0",
                 const std::string &mac="") throw (std::runtime_error);
 
 public:
   ~usrp2_source_c();
+
+  int work(int noutput_items,
+          gr_vector_const_void_star &input_items,
+          gr_vector_void_star &output_items);
 };
 
 #endif /* INCLUDED_USRP2_SOURCE_C_H */