[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11057 - gnuradio/branches/developers/eb/vrt/gr-vrt/sr
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r11057 - gnuradio/branches/developers/eb/vrt/gr-vrt/src |
|
Date: |
Tue, 19 May 2009 00:47:22 -0600 (MDT) |
Author: eb
Date: 2009-05-19 00:47:22 -0600 (Tue, 19 May 2009)
New Revision: 11057
Modified:
gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am
gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_16sc_handler.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_32fc_handler.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.h
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.cc
gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.h
Log:
renaming guts of files: s/usrp2/vrt/
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am 2009-05-19
06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/Makefile.am 2009-05-19
06:47:22 UTC (rev 11057)
@@ -24,10 +24,10 @@
# ----------------------------------------------------------------------
# Local Python files, not installed
#
-# qa_usrp2.py
+# qa_vrt.py
# ----------------------------------------------------------------------
-noinst_PYTHON = qa_usrp2.py
+noinst_PYTHON = qa_vrt.py
# ----------------------------------------------------------------------
# Miscellaneous build operations
@@ -49,31 +49,31 @@
$(USRP2_INCLUDES) \
$(WITH_INCLUDES)
-lib_LTLIBRARIES = libgnuradio-usrp2.la
+lib_LTLIBRARIES = libgnuradio-vrt.la
-libgnuradio_usrp2_la_SOURCES = \
+libgnuradio_vrt_la_SOURCES = \
rx_16sc_handler.cc \
rx_32fc_handler.cc \
- usrp2_base.cc \
- usrp2_source_base.cc \
- usrp2_source_16sc.cc \
- usrp2_source_32fc.cc \
- usrp2_sink_base.cc \
- usrp2_sink_16sc.cc \
- usrp2_sink_32fc.cc
+ vrt_base.cc \
+ vrt_source_base.cc \
+ vrt_source_16sc.cc \
+ vrt_source_32fc.cc \
+ vrt_sink_base.cc \
+ vrt_sink_16sc.cc \
+ vrt_sink_32fc.cc
-libgnuradio_usrp2_la_LIBADD = \
+libgnuradio_vrt_la_LIBADD = \
$(USRP2_LA) \
$(GNURADIO_CORE_LA)
grinclude_HEADERS = \
- usrp2_base.h \
- usrp2_source_base.h \
- usrp2_source_32fc.h \
- usrp2_source_16sc.h \
- usrp2_sink_base.h \
- usrp2_sink_16sc.h \
- usrp2_sink_32fc.h
+ vrt_base.h \
+ vrt_source_base.h \
+ vrt_source_32fc.h \
+ vrt_source_16sc.h \
+ vrt_sink_base.h \
+ vrt_sink_16sc.h \
+ vrt_sink_32fc.h
noinst_HEADERS = \
rx_16sc_handler.h \
@@ -82,27 +82,27 @@
# ----------------------------------------------------------------------
# Python SWIG wrapper around C++ library
#
-# usrp2.py
-# _usrp2.so
+# vrt.py
+# _vrt.so
# ----------------------------------------------------------------------
TOP_SWIG_IFILES = \
- usrp2.i
+ vrt.i
# Install so that they end up available as:
-# import gnuradio.usrp2
+# import gnuradio.vrt
# This ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
-usrp2_pythondir_category = \
+vrt_pythondir_category = \
gnuradio
# additional arguments to the SWIG command
-usrp2_swig_args = \
+vrt_swig_args = \
$(USRP2_INCLUDES)
# additional libraries for linking with the SWIG-generated library
-usrp2_la_swig_libadd = \
- libgnuradio-usrp2.la
+vrt_la_swig_libadd = \
+ libgnuradio-vrt.la
include $(top_srcdir)/Makefile.swig
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_16sc_handler.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_16sc_handler.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_16sc_handler.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,10 +23,10 @@
#ifndef INCLUDED_RX_16SC_HANDLER_H
#define INCLUDED_RX_16SC_HANDLER_H
-#include <usrp2/rx_nop_handler.h>
-#include <usrp2/copiers.h>
+#include <vrt/rx_nop_handler.h>
+#include <vrt/copiers.h>
-class rx_16sc_handler : public usrp2::rx_nop_handler
+class rx_16sc_handler : public vrt::rx_nop_handler
{
std::complex<int16_t> *d_dest;
@@ -45,10 +45,10 @@
}
// Invoked by USRP2 API when samples are available
- bool operator()(const uint32_t *items, size_t nitems, const
usrp2::rx_metadata *metadata)
+ bool operator()(const uint32_t *items, size_t nitems, const vrt::rx_metadata
*metadata)
{
// Copy/reformat/endian swap USRP2 data to destination buffer
- usrp2::copy_u2_16sc_to_host_16sc(nitems, items, d_dest);
+ vrt::copy_u2_16sc_to_host_16sc(nitems, items, d_dest);
d_dest += nitems;
// FIXME: do something with metadata
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_32fc_handler.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_32fc_handler.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/rx_32fc_handler.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,11 +23,11 @@
#ifndef INCLUDED_RX_32FC_HANDLER_H
#define INCLUDED_RX_32FC_HANDLER_H
-#include <usrp2/rx_nop_handler.h>
-#include <usrp2/copiers.h>
+#include <vrt/rx_nop_handler.h>
+#include <vrt/copiers.h>
#include <gr_complex.h>
-class rx_32fc_handler : public usrp2::rx_nop_handler
+class rx_32fc_handler : public vrt::rx_nop_handler
{
gr_complex *d_dest;
@@ -46,10 +46,10 @@
}
// Invoked by USRP2 API when samples are available
- bool operator()(const uint32_t *items, size_t nitems, const
usrp2::rx_metadata *metadata)
+ bool operator()(const uint32_t *items, size_t nitems, const vrt::rx_metadata
*metadata)
{
// Copy/reformat/endian swap USRP2 data to destination buffer
- usrp2::copy_u2_16sc_to_host_32fc(nitems, items, d_dest);
+ vrt::copy_u2_16sc_to_host_32fc(nitems, items, d_dest);
d_dest += nitems;
// FIXME: do something with metadata
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.cc 2009-05-19
06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.cc 2009-05-19
06:47:22 UTC (rev 11057)
@@ -24,11 +24,11 @@
#include <config.h>
#endif
-#include <usrp2_base.h>
+#include <vrt_base.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_base::usrp2_base(const char *name,
+vrt_base::vrt_base(const char *name,
gr_io_signature_sptr input_signature,
gr_io_signature_sptr output_signature,
const std::string &ifc,
@@ -37,75 +37,75 @@
: gr_sync_block(name,
input_signature,
output_signature),
- d_u2(usrp2::usrp2::sptr())
+ d_u2(vrt::vrt::sptr())
{
- d_u2 = usrp2::usrp2::make(ifc, mac);
+ d_u2 = vrt::vrt::make(ifc, mac);
if (!d_u2)
throw std::runtime_error("Unable to initialize USRP2!");
}
-usrp2_base::~usrp2_base ()
+vrt_base::~vrt_base ()
{
// NOP
}
std::string
-usrp2_base::mac_addr() const
+vrt_base::mac_addr() const
{
return d_u2->mac_addr();
}
std::string
-usrp2_base::interface_name() const
+vrt_base::interface_name() const
{
return d_u2->interface_name();
}
bool
-usrp2_base::fpga_master_clock_freq(long *freq) const
+vrt_base::fpga_master_clock_freq(long *freq) const
{
return d_u2->fpga_master_clock_freq(freq);
}
bool
-usrp2_base::config_mimo(int flags)
+vrt_base::config_mimo(int flags)
{
return d_u2->config_mimo(flags);
}
bool
-usrp2_base::sync_to_pps()
+vrt_base::sync_to_pps()
{
return d_u2->sync_to_pps();
}
bool
-usrp2_base::sync_every_pps(bool enable)
+vrt_base::sync_every_pps(bool enable)
{
return d_u2->sync_every_pps(enable);
}
std::vector<uint32_t>
-usrp2_base::peek32(uint32_t addr, uint32_t words)
+vrt_base::peek32(uint32_t addr, uint32_t words)
{
return d_u2->peek32(addr, words);
}
bool
-usrp2_base::poke32(uint32_t addr, const std::vector<uint32_t> &data)
+vrt_base::poke32(uint32_t addr, const std::vector<uint32_t> &data)
{
return d_u2->poke32(addr, data);
}
bool
-usrp2_base::start()
+vrt_base::start()
{
// Default implementation is NOP
return true;
}
bool
-usrp2_base::stop()
+vrt_base::stop()
{
// Default implementation is NOP
return true;
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.h 2009-05-19
06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_base.h 2009-05-19
06:47:22 UTC (rev 11057)
@@ -24,7 +24,7 @@
#define INCLUDED_USRP2_BASE_H
#include <gr_sync_block.h>
-#include <usrp2/usrp2.h>
+#include <vrt/vrt.h>
#include <stdexcept>
// BIG ASS FIXME: get from lower layer MTU calculation
@@ -33,20 +33,20 @@
/*!
* Base class for all USRP2 blocks
*/
-class usrp2_base : public gr_sync_block
+class vrt_base : public gr_sync_block
{
protected:
- usrp2_base(const char *name,
+ vrt_base(const char *name,
gr_io_signature_sptr input_signature,
gr_io_signature_sptr output_signature,
const std::string &ifc,
const std::string &mac)
throw (std::runtime_error);
- usrp2::usrp2::sptr d_u2;
+ vrt::vrt::sptr d_u2;
public:
- ~usrp2_base();
+ ~vrt_base();
/*!
* \brief Get USRP2 hardware MAC address
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,40 +24,40 @@
#include <config.h>
#endif
-#include <usrp2_sink_16sc.h>
-#include <usrp2/metadata.h>
+#include <vrt_sink_16sc.h>
+#include <vrt/metadata.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_sink_16sc_sptr
-usrp2_make_sink_16sc(const std::string &ifc, const std::string &mac_addr)
+vrt_sink_16sc_sptr
+vrt_make_sink_16sc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
{
- return gnuradio::get_initial_sptr(new usrp2_sink_16sc(ifc, mac_addr));
+ return gnuradio::get_initial_sptr(new vrt_sink_16sc(ifc, mac_addr));
}
-usrp2_sink_16sc::usrp2_sink_16sc(const std::string &ifc, const std::string
&mac_addr)
+vrt_sink_16sc::vrt_sink_16sc(const std::string &ifc, const std::string
&mac_addr)
throw (std::runtime_error)
- : usrp2_sink_base("usrp2_sink_16sc",
+ : vrt_sink_base("vrt_sink_16sc",
gr_make_io_signature(1, 1, sizeof(std::complex<int16_t>)),
ifc, mac_addr)
{
// NOP
}
-usrp2_sink_16sc::~usrp2_sink_16sc()
+vrt_sink_16sc::~vrt_sink_16sc()
{
// NOP
}
int
-usrp2_sink_16sc::work(int noutput_items,
+vrt_sink_16sc::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
std::complex<int16_t> *in = (std::complex<int16_t> *)input_items[0];
- usrp2::tx_metadata metadata;
+ vrt::tx_metadata metadata;
metadata.timestamp = -1;
metadata.send_now = 1;
metadata.start_of_burst = 1;
@@ -65,7 +65,7 @@
bool ok = d_u2->tx_16sc(0, // FIXME: someday, streams will have channel
numbers
in, noutput_items, &metadata);
if (!ok){
- std::cerr << "usrp2_sink_16sc: tx_16sc failed" << std::endl;
+ std::cerr << "vrt_sink_16sc: tx_16sc failed" << std::endl;
return -1; // say we're done
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_16sc.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,30 +23,30 @@
#ifndef INCLUDED_USRP2_SINK_16SC_H
#define INCLUDED_USRP2_SINK_16SC_H
-#include <usrp2_sink_base.h>
+#include <vrt_sink_base.h>
-class usrp2_sink_16sc;
-typedef boost::shared_ptr<usrp2_sink_16sc> usrp2_sink_16sc_sptr;
+class vrt_sink_16sc;
+typedef boost::shared_ptr<vrt_sink_16sc> vrt_sink_16sc_sptr;
-usrp2_sink_16sc_sptr
-usrp2_make_sink_16sc(const std::string &ifc="eth0",
+vrt_sink_16sc_sptr
+vrt_make_sink_16sc(const std::string &ifc="eth0",
const std::string &mac="")
throw (std::runtime_error);
-class usrp2_sink_16sc : public usrp2_sink_base
+class vrt_sink_16sc : public vrt_sink_base
{
private:
- friend usrp2_sink_16sc_sptr
- usrp2_make_sink_16sc(const std::string &ifc,
+ friend vrt_sink_16sc_sptr
+ vrt_make_sink_16sc(const std::string &ifc,
const std::string &mac)
throw (std::runtime_error);
protected:
- usrp2_sink_16sc(const std::string &ifc, const std::string &mac)
+ vrt_sink_16sc(const std::string &ifc, const std::string &mac)
throw (std::runtime_error);
public:
- ~usrp2_sink_16sc();
+ ~vrt_sink_16sc();
int work(int noutput_items,
gr_vector_const_void_star &input_items,
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,40 +24,40 @@
#include <config.h>
#endif
-#include <usrp2_sink_32fc.h>
-#include <usrp2/metadata.h>
+#include <vrt_sink_32fc.h>
+#include <vrt/metadata.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc(const std::string &ifc, const std::string &mac_addr)
+vrt_sink_32fc_sptr
+vrt_make_sink_32fc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
{
- return gnuradio::get_initial_sptr(new usrp2_sink_32fc(ifc, mac_addr));
+ return gnuradio::get_initial_sptr(new vrt_sink_32fc(ifc, mac_addr));
}
-usrp2_sink_32fc::usrp2_sink_32fc(const std::string &ifc, const std::string
&mac_addr)
+vrt_sink_32fc::vrt_sink_32fc(const std::string &ifc, const std::string
&mac_addr)
throw (std::runtime_error)
- : usrp2_sink_base("usrp2_sink_32fc",
+ : vrt_sink_base("vrt_sink_32fc",
gr_make_io_signature(1, 1, sizeof(gr_complex)),
ifc, mac_addr)
{
// NOP
}
-usrp2_sink_32fc::~usrp2_sink_32fc()
+vrt_sink_32fc::~vrt_sink_32fc()
{
// NOP
}
int
-usrp2_sink_32fc::work(int noutput_items,
+vrt_sink_32fc::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
gr_complex *in = (gr_complex *)input_items[0];
- usrp2::tx_metadata metadata;
+ vrt::tx_metadata metadata;
metadata.timestamp = -1;
metadata.send_now = 1;
metadata.start_of_burst = 1;
@@ -65,7 +65,7 @@
bool ok = d_u2->tx_32fc(0, // FIXME: someday, streams will have channel
numbers
in, noutput_items, &metadata);
if (!ok){
- std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;
+ std::cerr << "vrt_sink_32fc: tx_32fc failed" << std::endl;
return -1; // say we're done
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_32fc.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,30 +23,30 @@
#ifndef INCLUDED_USRP2_SINK_32FC_H
#define INCLUDED_USRP2_SINK_32FC_H
-#include <usrp2_sink_base.h>
+#include <vrt_sink_base.h>
-class usrp2_sink_32fc;
-typedef boost::shared_ptr<usrp2_sink_32fc> usrp2_sink_32fc_sptr;
+class vrt_sink_32fc;
+typedef boost::shared_ptr<vrt_sink_32fc> vrt_sink_32fc_sptr;
-usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc(const std::string &ifc="eth0",
+vrt_sink_32fc_sptr
+vrt_make_sink_32fc(const std::string &ifc="eth0",
const std::string &mac="")
throw (std::runtime_error);
-class usrp2_sink_32fc : public usrp2_sink_base
+class vrt_sink_32fc : public vrt_sink_base
{
private:
- friend usrp2_sink_32fc_sptr
- usrp2_make_sink_32fc(const std::string &ifc,
+ friend vrt_sink_32fc_sptr
+ vrt_make_sink_32fc(const std::string &ifc,
const std::string &mac)
throw (std::runtime_error);
protected:
- usrp2_sink_32fc(const std::string &ifc, const std::string &mac)
+ vrt_sink_32fc(const std::string &ifc, const std::string &mac)
throw (std::runtime_error);
public:
- ~usrp2_sink_32fc();
+ ~vrt_sink_32fc();
int work(int noutput_items,
gr_vector_const_void_star &input_items,
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,16 +24,16 @@
#include <config.h>
#endif
-#include <usrp2_sink_base.h>
+#include <vrt_sink_base.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_sink_base::usrp2_sink_base(const char *name,
+vrt_sink_base::vrt_sink_base(const char *name,
gr_io_signature_sptr input_signature,
const std::string &ifc,
const std::string &mac)
throw (std::runtime_error)
- : usrp2_base(name,
+ : vrt_base(name,
input_signature,
gr_make_io_signature(0, 0, 0),
ifc, mac)
@@ -41,111 +41,111 @@
// NOP
}
-usrp2_sink_base::~usrp2_sink_base ()
+vrt_sink_base::~vrt_sink_base ()
{
// NOP
}
bool
-usrp2_sink_base::set_gain(double gain)
+vrt_sink_base::set_gain(double gain)
{
return d_u2->set_tx_gain(gain);
}
bool
-usrp2_sink_base::set_lo_offset(double frequency)
+vrt_sink_base::set_lo_offset(double frequency)
{
return d_u2->set_tx_lo_offset(frequency);
}
bool
-usrp2_sink_base::set_center_freq(double frequency, usrp2::tune_result *tr)
+vrt_sink_base::set_center_freq(double frequency, vrt::tune_result *tr)
{
return d_u2->set_tx_center_freq(frequency, tr);
}
bool
-usrp2_sink_base::set_interp(int interp_factor)
+vrt_sink_base::set_interp(int interp_factor)
{
return d_u2->set_tx_interp(interp_factor);
}
void
-usrp2_sink_base::default_scale_iq(int interp_factor, int *scale_i, int
*scale_q)
+vrt_sink_base::default_scale_iq(int interp_factor, int *scale_i, int *scale_q)
{
return d_u2->default_tx_scale_iq(interp_factor, scale_i, scale_q);
}
bool
-usrp2_sink_base::set_scale_iq(int scale_i, int scale_q)
+vrt_sink_base::set_scale_iq(int scale_i, int scale_q)
{
return d_u2->set_tx_scale_iq(scale_i, scale_q);
}
int
-usrp2_sink_base::interp()
+vrt_sink_base::interp()
{
return d_u2->tx_interp();
}
bool
-usrp2_sink_base::dac_rate(long *rate)
+vrt_sink_base::dac_rate(long *rate)
{
return d_u2->dac_rate(rate);
}
double
-usrp2_sink_base::gain_min()
+vrt_sink_base::gain_min()
{
return d_u2->tx_gain_min();
}
double
-usrp2_sink_base::gain_max()
+vrt_sink_base::gain_max()
{
return d_u2->tx_gain_max();
}
double
-usrp2_sink_base::gain_db_per_step()
+vrt_sink_base::gain_db_per_step()
{
return d_u2->tx_gain_db_per_step();
}
double
-usrp2_sink_base::freq_min()
+vrt_sink_base::freq_min()
{
return d_u2->tx_freq_min();
}
double
-usrp2_sink_base::freq_max()
+vrt_sink_base::freq_max()
{
return d_u2->tx_freq_max();
}
bool
-usrp2_sink_base::daughterboard_id(int *dbid)
+vrt_sink_base::daughterboard_id(int *dbid)
{
return d_u2->tx_daughterboard_id(dbid);
}
-bool usrp2_sink_base::set_gpio_ddr(uint16_t value, uint16_t mask)
+bool vrt_sink_base::set_gpio_ddr(uint16_t value, uint16_t mask)
{
- return d_u2->set_gpio_ddr(usrp2::GPIO_TX_BANK, value, mask);
+ return d_u2->set_gpio_ddr(vrt::GPIO_TX_BANK, value, mask);
}
-bool usrp2_sink_base::set_gpio_sels(std::string sels)
+bool vrt_sink_base::set_gpio_sels(std::string sels)
{
- return d_u2->set_gpio_sels(usrp2::GPIO_TX_BANK, sels);
+ return d_u2->set_gpio_sels(vrt::GPIO_TX_BANK, sels);
}
-bool usrp2_sink_base::write_gpio(uint16_t value, uint16_t mask)
+bool vrt_sink_base::write_gpio(uint16_t value, uint16_t mask)
{
- return d_u2->write_gpio(usrp2::GPIO_TX_BANK, value, mask);
+ return d_u2->write_gpio(vrt::GPIO_TX_BANK, value, mask);
}
-bool usrp2_sink_base::read_gpio(uint16_t *value)
+bool vrt_sink_base::read_gpio(uint16_t *value)
{
- return d_u2->read_gpio(usrp2::GPIO_TX_BANK, value);
+ return d_u2->read_gpio(vrt::GPIO_TX_BANK, value);
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_sink_base.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,22 +23,22 @@
#ifndef INCLUDED_USRP2_SINK_BASE_H
#define INCLUDED_USRP2_SINK_BASE_H
-#include <usrp2_base.h>
+#include <vrt_base.h>
/*!
* Base class for all USRP2 transmit blocks
*/
-class usrp2_sink_base : public usrp2_base
+class vrt_sink_base : public vrt_base
{
protected:
- usrp2_sink_base(const char *name,
+ vrt_sink_base(const char *name,
gr_io_signature_sptr input_signature,
const std::string &ifc,
const std::string &mac)
throw (std::runtime_error);
public:
- ~usrp2_sink_base();
+ ~vrt_sink_base();
/*!
* \brief Set transmitter gain
@@ -53,7 +53,7 @@
/*!
* \brief Set transmitter center frequency
*/
- bool set_center_freq(double frequency, usrp2::tune_result *tr);
+ bool set_center_freq(double frequency, vrt::tune_result *tr);
/*!
* \brief Set transmit interpolation rate
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,34 +24,34 @@
#include <config.h>
#endif
-#include <usrp2_source_16sc.h>
+#include <vrt_source_16sc.h>
#include <rx_16sc_handler.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_source_16sc_sptr
-usrp2_make_source_16sc(const std::string &ifc, const std::string &mac_addr)
+vrt_source_16sc_sptr
+vrt_make_source_16sc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
{
- return gnuradio::get_initial_sptr(new usrp2_source_16sc(ifc, mac_addr));
+ return gnuradio::get_initial_sptr(new vrt_source_16sc(ifc, mac_addr));
}
-usrp2_source_16sc::usrp2_source_16sc(const std::string &ifc, const std::string
&mac_addr)
+vrt_source_16sc::vrt_source_16sc(const std::string &ifc, const std::string
&mac_addr)
throw (std::runtime_error)
- : usrp2_source_base("usrp2_source_16sc",
+ : vrt_source_base("vrt_source_16sc",
gr_make_io_signature(1, 1, sizeof(std::complex<int16_t>)),
ifc, mac_addr)
{
set_output_multiple(USRP2_MIN_RX_SAMPLES);
}
-usrp2_source_16sc::~usrp2_source_16sc()
+vrt_source_16sc::~vrt_source_16sc()
{
// NOP
}
int
-usrp2_source_16sc::work(int noutput_items,
+vrt_source_16sc::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
@@ -61,7 +61,7 @@
bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number
instead of 0
if (!ok){
- std::cerr << "usrp2::rx_samples() failed" << std::endl;
+ std::cerr << "vrt::rx_samples() failed" << std::endl;
return -1; // say we're done
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_16sc.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,28 +23,28 @@
#ifndef INCLUDED_USRP2_SOURCE_16SC_H
#define INCLUDED_USRP2_SOURCE_16SC_H
-#include <usrp2_source_base.h>
+#include <vrt_source_base.h>
-class usrp2_source_16sc;
-typedef boost::shared_ptr<usrp2_source_16sc> usrp2_source_16sc_sptr;
+class vrt_source_16sc;
+typedef boost::shared_ptr<vrt_source_16sc> vrt_source_16sc_sptr;
-usrp2_source_16sc_sptr
-usrp2_make_source_16sc(const std::string &ifc="eth0",
+vrt_source_16sc_sptr
+vrt_make_source_16sc(const std::string &ifc="eth0",
const std::string &mac="")
throw (std::runtime_error);
-class usrp2_source_16sc : public usrp2_source_base
+class vrt_source_16sc : public vrt_source_base
{
private:
- friend usrp2_source_16sc_sptr
- usrp2_make_source_16sc(const std::string &ifc,
+ friend vrt_source_16sc_sptr
+ vrt_make_source_16sc(const std::string &ifc,
const std::string &mac) throw (std::runtime_error);
protected:
- usrp2_source_16sc(const std::string &ifc, const std::string &mac) throw
(std::runtime_error);
+ vrt_source_16sc(const std::string &ifc, const std::string &mac) throw
(std::runtime_error);
public:
- ~usrp2_source_16sc();
+ ~vrt_source_16sc();
int work(int noutput_items,
gr_vector_const_void_star &input_items,
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,34 +24,34 @@
#include "config.h"
#endif
-#include <usrp2_source_32fc.h>
+#include <vrt_source_32fc.h>
#include <rx_32fc_handler.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &ifc, const std::string &mac_addr)
+vrt_source_32fc_sptr
+vrt_make_source_32fc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
{
- return gnuradio::get_initial_sptr(new usrp2_source_32fc(ifc, mac_addr));
+ return gnuradio::get_initial_sptr(new vrt_source_32fc(ifc, mac_addr));
}
-usrp2_source_32fc::usrp2_source_32fc(const std::string &ifc, const std::string
&mac_addr)
+vrt_source_32fc::vrt_source_32fc(const std::string &ifc, const std::string
&mac_addr)
throw (std::runtime_error)
- : usrp2_source_base("usrp2_source_32fc",
+ : vrt_source_base("vrt_source_32fc",
gr_make_io_signature(1, 1, sizeof(gr_complex)),
ifc, mac_addr)
{
set_output_multiple(USRP2_MIN_RX_SAMPLES);
}
-usrp2_source_32fc::~usrp2_source_32fc()
+vrt_source_32fc::~vrt_source_32fc()
{
// NOP
}
int
-usrp2_source_32fc::work(int noutput_items,
+vrt_source_32fc::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
@@ -61,7 +61,7 @@
bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number
instead of 0
if (!ok){
- std::cerr << "usrp2::rx_samples() failed" << std::endl;
+ std::cerr << "vrt::rx_samples() failed" << std::endl;
return -1; // say we're done
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_32fc.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,28 +23,28 @@
#ifndef INCLUDED_USRP2_SOURCE_32FC_H
#define INCLUDED_USRP2_SOURCE_32FC_H
-#include <usrp2_source_base.h>
+#include <vrt_source_base.h>
-class usrp2_source_32fc;
-typedef boost::shared_ptr<usrp2_source_32fc> usrp2_source_32fc_sptr;
+class vrt_source_32fc;
+typedef boost::shared_ptr<vrt_source_32fc> vrt_source_32fc_sptr;
-usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &ifc="eth0",
+vrt_source_32fc_sptr
+vrt_make_source_32fc(const std::string &ifc="eth0",
const std::string &mac="")
throw (std::runtime_error);
-class usrp2_source_32fc : public usrp2_source_base
+class vrt_source_32fc : public vrt_source_base
{
private:
- friend usrp2_source_32fc_sptr
- usrp2_make_source_32fc(const std::string &ifc,
+ friend vrt_source_32fc_sptr
+ vrt_make_source_32fc(const std::string &ifc,
const std::string &mac) throw (std::runtime_error);
protected:
- usrp2_source_32fc(const std::string &ifc, const std::string &mac) throw
(std::runtime_error);
+ vrt_source_32fc(const std::string &ifc, const std::string &mac) throw
(std::runtime_error);
public:
- ~usrp2_source_32fc();
+ ~vrt_source_32fc();
int work(int noutput_items,
gr_vector_const_void_star &input_items,
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.cc
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.cc
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.cc
2009-05-19 06:47:22 UTC (rev 11057)
@@ -24,16 +24,16 @@
#include <config.h>
#endif
-#include <usrp2_source_base.h>
+#include <vrt_source_base.h>
#include <gr_io_signature.h>
#include <iostream>
-usrp2_source_base::usrp2_source_base(const char *name,
+vrt_source_base::vrt_source_base(const char *name,
gr_io_signature_sptr output_signature,
const std::string &ifc,
const std::string &mac)
throw (std::runtime_error)
- : usrp2_base(name,
+ : vrt_base(name,
gr_make_io_signature(0, 0, 0),
output_signature,
ifc, mac)
@@ -41,139 +41,139 @@
// NOP
}
-usrp2_source_base::~usrp2_source_base ()
+vrt_source_base::~vrt_source_base ()
{
// NOP
}
bool
-usrp2_source_base::set_gain(double gain)
+vrt_source_base::set_gain(double gain)
{
return d_u2->set_rx_gain(gain);
}
bool
-usrp2_source_base::set_lo_offset(double frequency)
+vrt_source_base::set_lo_offset(double frequency)
{
return d_u2->set_rx_lo_offset(frequency);
}
bool
-usrp2_source_base::set_center_freq(double frequency, usrp2::tune_result *tr)
+vrt_source_base::set_center_freq(double frequency, vrt::tune_result *tr)
{
return d_u2->set_rx_center_freq(frequency, tr);
}
bool
-usrp2_source_base::set_decim(int decimation_factor)
+vrt_source_base::set_decim(int decimation_factor)
{
return d_u2->set_rx_decim(decimation_factor);
}
bool
-usrp2_source_base::set_scale_iq(int scale_i, int scale_q)
+vrt_source_base::set_scale_iq(int scale_i, int scale_q)
{
return d_u2->set_rx_scale_iq(scale_i, scale_q);
}
int
-usrp2_source_base::decim()
+vrt_source_base::decim()
{
return d_u2->rx_decim();
}
bool
-usrp2_source_base::adc_rate(long *rate)
+vrt_source_base::adc_rate(long *rate)
{
return d_u2->adc_rate(rate);
}
double
-usrp2_source_base::gain_min()
+vrt_source_base::gain_min()
{
return d_u2->rx_gain_min();
}
double
-usrp2_source_base::gain_max()
+vrt_source_base::gain_max()
{
return d_u2->rx_gain_max();
}
double
-usrp2_source_base::gain_db_per_step()
+vrt_source_base::gain_db_per_step()
{
return d_u2->rx_gain_db_per_step();
}
double
-usrp2_source_base::freq_min()
+vrt_source_base::freq_min()
{
return d_u2->rx_freq_min();
}
double
-usrp2_source_base::freq_max()
+vrt_source_base::freq_max()
{
return d_u2->rx_freq_max();
}
bool
-usrp2_source_base::daughterboard_id(int *dbid)
+vrt_source_base::daughterboard_id(int *dbid)
{
return d_u2->rx_daughterboard_id(dbid);
}
unsigned int
-usrp2_source_base::overruns()
+vrt_source_base::overruns()
{
return d_u2->rx_overruns();
}
unsigned int
-usrp2_source_base::missing()
+vrt_source_base::missing()
{
return d_u2->rx_missing();
}
bool
-usrp2_source_base::start()
+vrt_source_base::start()
{
return d_u2->start_rx_streaming(0); // FIXME: someday sources will have
channel #s
}
bool
-usrp2_source_base::stop()
+vrt_source_base::stop()
{
return d_u2->stop_rx_streaming(0); // FIXME: someday sources will have
channel #s
}
bool
-usrp2_source_base::set_gpio_ddr(uint16_t value, uint16_t mask)
+vrt_source_base::set_gpio_ddr(uint16_t value, uint16_t mask)
{
- return d_u2->set_gpio_ddr(usrp2::GPIO_RX_BANK, value, mask);
+ return d_u2->set_gpio_ddr(vrt::GPIO_RX_BANK, value, mask);
}
bool
-usrp2_source_base::set_gpio_sels(std::string sels)
+vrt_source_base::set_gpio_sels(std::string sels)
{
- return d_u2->set_gpio_sels(usrp2::GPIO_RX_BANK, sels);
+ return d_u2->set_gpio_sels(vrt::GPIO_RX_BANK, sels);
}
bool
-usrp2_source_base::write_gpio(uint16_t value, uint16_t mask)
+vrt_source_base::write_gpio(uint16_t value, uint16_t mask)
{
- return d_u2->write_gpio(usrp2::GPIO_RX_BANK, value, mask);
+ return d_u2->write_gpio(vrt::GPIO_RX_BANK, value, mask);
}
bool
-usrp2_source_base::read_gpio(uint16_t *value)
+vrt_source_base::read_gpio(uint16_t *value)
{
- return d_u2->read_gpio(usrp2::GPIO_RX_BANK, value);
+ return d_u2->read_gpio(vrt::GPIO_RX_BANK, value);
}
bool
-usrp2_source_base::enable_gpio_streaming(int enable)
+vrt_source_base::enable_gpio_streaming(int enable)
{
- return d_u2->enable_gpio_streaming(usrp2::GPIO_RX_BANK, enable);
+ return d_u2->enable_gpio_streaming(vrt::GPIO_RX_BANK, enable);
}
Modified: gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.h
===================================================================
--- gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.h
2009-05-19 06:44:12 UTC (rev 11056)
+++ gnuradio/branches/developers/eb/vrt/gr-vrt/src/vrt_source_base.h
2009-05-19 06:47:22 UTC (rev 11057)
@@ -23,22 +23,22 @@
#ifndef INCLUDED_USRP2_SOURCE_BASE_H
#define INCLUDED_USRP2_SOURCE_BASE_H
-#include <usrp2_base.h>
+#include <vrt_base.h>
/*!
* Base class for all USRP2 source blocks
*/
-class usrp2_source_base : public usrp2_base
+class vrt_source_base : public vrt_base
{
protected:
- usrp2_source_base(const char *name,
+ vrt_source_base(const char *name,
gr_io_signature_sptr output_signature,
const std::string &ifc,
const std::string &mac)
throw (std::runtime_error);
public:
- ~usrp2_source_base();
+ ~vrt_source_base();
/*!
* \brief Set receiver gain
@@ -53,7 +53,7 @@
/*!
* \brief Set receiver center frequency
*/
- bool set_center_freq(double frequency, usrp2::tune_result *tr);
+ bool set_center_freq(double frequency, vrt::tune_result *tr);
/*!
* \brief Set receive decimation rate
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11057 - gnuradio/branches/developers/eb/vrt/gr-vrt/src,
eb <=