diff options
| author | Josh Blum | 2011-02-25 16:11:48 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-02-25 16:11:48 -0800 |
| commit | a02bb131f68d5aa66093310c393562671e389778 (patch) | |
| tree | cc234438359b7e734bb00ac08083c2582b0db86b /gr-uhd/swig/uhd_swig.i | |
| parent | da9e63bf4110c06d9a38f2bde3a665f1ae4addae (diff) | |
| parent | 5bb8acf24e4913d2a969db70476af65c498b032f (diff) | |
| download | gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.gz gnuradio-a02bb131f68d5aa66093310c393562671e389778.tar.bz2 gnuradio-a02bb131f68d5aa66093310c393562671e389778.zip | |
Merge branch 'gr_uhd_next' into next
Diffstat (limited to 'gr-uhd/swig/uhd_swig.i')
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 3c317beb4..b814471b2 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -53,10 +53,8 @@ // block headers //////////////////////////////////////////////////////////////////////// %{ -#include <uhd_multi_usrp_source.h> -#include <uhd_multi_usrp_sink.h> -#include <uhd_single_usrp_source.h> -#include <uhd_single_usrp_sink.h> +#include <gr_uhd_usrp_source.h> +#include <gr_uhd_usrp_sink.h> %} //////////////////////////////////////////////////////////////////////// @@ -93,20 +91,25 @@ %include <uhd/device.hpp> %template(device_addr_vector_t) std::vector<uhd::device_addr_t>; +%include <uhd/types/sensors.hpp> + //////////////////////////////////////////////////////////////////////// -// block magic +// swig dboard_iface for python access //////////////////////////////////////////////////////////////////////// -GR_SWIG_BLOCK_MAGIC(uhd,multi_usrp_source) -%include <uhd_multi_usrp_source.h> +%include stdint.i +%include <uhd/types/serial.hpp> +%include <uhd/usrp/dboard_iface.hpp> -GR_SWIG_BLOCK_MAGIC(uhd,multi_usrp_sink) -%include <uhd_multi_usrp_sink.h> +%template(dboard_iface_sptr) boost::shared_ptr<uhd::usrp::dboard_iface>; -GR_SWIG_BLOCK_MAGIC(uhd,single_usrp_source) -%include <uhd_single_usrp_source.h> +//////////////////////////////////////////////////////////////////////// +// block magic +//////////////////////////////////////////////////////////////////////// +GR_SWIG_BLOCK_MAGIC(uhd,usrp_source) +%include <gr_uhd_usrp_source.h> -GR_SWIG_BLOCK_MAGIC(uhd,single_usrp_sink) -%include <uhd_single_usrp_sink.h> +GR_SWIG_BLOCK_MAGIC(uhd,usrp_sink) +%include <gr_uhd_usrp_sink.h> //////////////////////////////////////////////////////////////////////// // helpful constants |