[Commit-gnuradio] r11067 - gnuradio/branches/developers/eb/vrt/gr-vrt/src

[eb]

Author: eb
Date: 2009-05-20 00:42:08 -0600 (Wed, 20 May 2009)
New Revision: 11067

Modified:
   gnuradio/branches/developers/eb/vrt/gr-vrt/src/
   gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am
   gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt.i
Log:
checkpoint


Property changes on: gnuradio/branches/developers/eb/vrt/gr-vrt/src
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
.libs
.deps
usrp2.py
usrp2.cc
run_tests
test_gr_usrp2
*.pyc

   + Makefile
Makefile.in
.libs
.deps
vrt.py
vrt.cc
run_tests
test_gr_usrp2
*.pyc


Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am  2009-05-20 
06:34:03 UTC (rev 11066)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am  2009-05-20 
06:42:08 UTC (rev 11067)
@@ -111,7 +111,7 @@
 vrt_la_swig_libadd =           \
        libgnuradio-vrt.la
 
-#include $(top_srcdir)/Makefile.swig
+include $(top_srcdir)/Makefile.swig
 
 # add some of the variables generated inside the Makefile.swig.gen
 BUILT_SOURCES = $(swig_built_sources)

Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt.i
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt.i        2009-05-20 
06:34:03 UTC (rev 11066)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt.i        2009-05-20 
06:42:08 UTC (rev 11067)
@@ -24,30 +24,19 @@
 %import <stdint.i>
 
 %{
-#include "vrt_source_16sc.h"
-#include "vrt_source_32fc.h"
-#include "vrt_sink_16sc.h"
-#include "vrt_sink_32fc.h"
+#include "vrt_quadradio_source_32fc.h"
+//#include "vrt_quadradio_source_16sc.h"
+//#include "vrt_sink_32fc.h"
+//#include "vrt_sink_16sc.h"
 %}
 
 %template(uint32_t_vector) std::vector<uint32_t>;
 
 // ----------------------------------------------------------------
 
-class vrt_base : public gr_sync_block 
+class vrt_source_base : public gr_sync_block
 {
 protected:
-  vrt_base() throw (std::runtime_error);
-
-public:
-  ~vrt_base();
-};
-
-// ----------------------------------------------------------------
-
-class vrt_source_base : public vrt_base 
-{
-protected:
   vrt_source_base() throw (std::runtime_error);
 
 public:
@@ -55,41 +44,32 @@
 
 };
 
-// ----------------------------------------------------------------
-
-%if 0
-GR_SWIG_BLOCK_MAGIC(vrt,source_32fc)
-
-vrt_source_32fc_sptr
-vrt_make_source_32fc(const std::string ifc="eth0", 
-                       const std::string mac="") 
-  throw (std::runtime_error);
-
-class vrt_source_32fc : public vrt_source_base 
+class vrt_source_32fc : public vrt_source_base
 {
 protected:
-  vrt_source_32fc(const std::string &ifc, const std::string &mac);
+  vrt_source_32fc() throw (std::runtime_error);
 
 public:
   ~vrt_source_32fc();
 };
 
+
 // ----------------------------------------------------------------
 
-GR_SWIG_BLOCK_MAGIC(vrt,source_16sc)
+GR_SWIG_BLOCK_MAGIC(vrt,quadradio_source_32fc)
 
-vrt_source_16sc_sptr
-vrt_make_source_16sc(const std::string ifc="eth0", 
-                      const std::string mac="") 
+vrt_quadradio_source_32fc_sptr
+vrt_make_quadradio_source_32fc(const std::string &ip,
+                              size_t rx_bufsize = 0)
   throw (std::runtime_error);
 
-class vrt_source_16sc : public vrt_source_base 
+class vrt_quadradio_source_32fc : public vrt_source_32fc
 {
 protected:
-  vrt_source_16sc(const std::string &ifc, const std::string &mac);
+  vrt_quadradio_source_32fc();
 
 public:
-  ~vrt_source_16sc();
+  ~vrt_quadradio_source_32fc();
 };
-%endif
 
+