paulmataruso/UHD-Fairwaves
1
0
Fork 0
mirror of https://github.com/fairwaves/UHD-Fairwaves.git synced 2025-10-23 07:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

host: change UHD pointer types based on UHD version

Browse Source 
Follow-up: 58b4d869d4
This commit is contained in:
Dmitry Sharshakov
2023-11-13 11:05:27 +03:00
committed by Alexander Chemeris
parent dbbedb55b3
commit 4867d84b1e
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
host/umtrx_common.hpp Normal file
View File

@@ -0,0 +1,12 @@
#ifndef INCLUDED_UMTRX_COMMON_HPP
#define INCLUDED_UMTRX_COMMON_HPP
#include <uhd/version.hpp>
#if UHD_VERSION >= 4000000
#define UMTRX_UHD_PTR_NAMESPACE std
#else
#define UMTRX_UHD_PTR_NAMESPACE boost
#endif
#endif /* INCLUDED_UMTRX_COMMON_HPP */

4
host/umtrx_fifo_ctrl.hpp
View File

@@ -27,6 +27,8 @@
#include <uhd/types/wb_iface.hpp> #include <uhd/types/wb_iface.hpp>
#include <string> #include <string>
#include "umtrx_common.hpp"
/*! /*!
* The umtrx FIFO control class: * The umtrx FIFO control class:
* Provide high-speed peek/poke interface. * Provide high-speed peek/poke interface.
@@ -34,7 +36,7 @@
class umtrx_fifo_ctrl : public uhd::wb_iface, public uhd::spi_iface class umtrx_fifo_ctrl : public uhd::wb_iface, public uhd::spi_iface
{ {
public: public:
typedef std::shared_ptr<umtrx_fifo_ctrl> sptr; typedef UMTRX_UHD_PTR_NAMESPACE::shared_ptr<umtrx_fifo_ctrl> sptr;
//! Make a new FIFO control object //! Make a new FIFO control object
static sptr make(uhd::transport::zero_copy_if::sptr xport, const boost::uint32_t sid, const size_t window_size); static sptr make(uhd::transport::zero_copy_if::sptr xport, const boost::uint32_t sid, const size_t window_size);

4
host/umtrx_iface.hpp
View File

@@ -27,6 +27,8 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <string> #include <string>
#include "umtrx_common.hpp"
/*! /*!
* The umtrx interface class: * The umtrx interface class:
* Provides a set of functions to implementation layer. * Provides a set of functions to implementation layer.
@@ -34,7 +36,7 @@
*/ */
class umtrx_iface : public uhd::wb_iface, public uhd::spi_iface, public uhd::i2c_iface{ class umtrx_iface : public uhd::wb_iface, public uhd::spi_iface, public uhd::i2c_iface{
public: public:
typedef std::shared_ptr<umtrx_iface> sptr; typedef UMTRX_UHD_PTR_NAMESPACE::shared_ptr<umtrx_iface> sptr;
/*! /*!
* Make a new umtrx interface with the control transport. * Make a new umtrx interface with the control transport.
* \param ctrl_transport the udp transport object * \param ctrl_transport the udp transport object

5
host/umtrx_impl.hpp
View File

@@ -20,6 +20,7 @@
#define INCLUDED_UMTRX_IMPL_HPP #define INCLUDED_UMTRX_IMPL_HPP
#include "usrp2/fw_common.h" #include "usrp2/fw_common.h"
#include "umtrx_common.hpp"
#include "umtrx_iface.hpp" #include "umtrx_iface.hpp"
#include "umtrx_fifo_ctrl.hpp" #include "umtrx_fifo_ctrl.hpp"
#include "lms6002d_ctrl.hpp" #include "lms6002d_ctrl.hpp"
@@ -236,8 +237,8 @@ private:
void client_query_handle1(const boost::property_tree::ptree &request, boost::property_tree::ptree &response); void client_query_handle1(const boost::property_tree::ptree &request, boost::property_tree::ptree &response);
//streaming //streaming
std::vector<std::weak_ptr<uhd::rx_streamer> > _rx_streamers; std::vector<UMTRX_UHD_PTR_NAMESPACE::weak_ptr<uhd::rx_streamer> > _rx_streamers;
std::vector<std::weak_ptr<uhd::tx_streamer> > _tx_streamers; std::vector<UMTRX_UHD_PTR_NAMESPACE::weak_ptr<uhd::tx_streamer> > _tx_streamers;
boost::mutex _setupMutex; boost::mutex _setupMutex;
}; };

20
host/umtrx_io_impl.cpp
View File

@@ -105,8 +105,8 @@ void umtrx_impl::update_rates(void)
void umtrx_impl::update_rx_samp_rate(const size_t dsp, const double rate) void umtrx_impl::update_rx_samp_rate(const size_t dsp, const double rate)
{ {
std::shared_ptr<sph::recv_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::recv_packet_streamer> my_streamer =
std::dynamic_pointer_cast<sph::recv_packet_streamer>(_rx_streamers[dsp].lock()); UMTRX_UHD_PTR_NAMESPACE::dynamic_pointer_cast<sph::recv_packet_streamer>(_rx_streamers[dsp].lock());
if (not my_streamer) return; if (not my_streamer) return;
my_streamer->set_samp_rate(rate); my_streamer->set_samp_rate(rate);
@@ -116,8 +116,8 @@ void umtrx_impl::update_rx_samp_rate(const size_t dsp, const double rate)
void umtrx_impl::update_tx_samp_rate(const size_t dsp, const double rate) void umtrx_impl::update_tx_samp_rate(const size_t dsp, const double rate)
{ {
std::shared_ptr<sph::send_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::send_packet_streamer> my_streamer =
std::dynamic_pointer_cast<sph::send_packet_streamer>(_tx_streamers[dsp].lock()); UMTRX_UHD_PTR_NAMESPACE::dynamic_pointer_cast<sph::send_packet_streamer>(_tx_streamers[dsp].lock());
if (not my_streamer) return; if (not my_streamer) return;
my_streamer->set_samp_rate(rate); my_streamer->set_samp_rate(rate);
@@ -130,15 +130,15 @@ void umtrx_impl::update_tick_rate(const double rate)
//update the tick rate on all existing streamers -> thread safe //update the tick rate on all existing streamers -> thread safe
for (size_t i = 0; i < _rx_streamers.size(); i++) for (size_t i = 0; i < _rx_streamers.size(); i++)
{ {
std::shared_ptr<sph::recv_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::recv_packet_streamer> my_streamer =
std::dynamic_pointer_cast<sph::recv_packet_streamer>(_rx_streamers[i].lock()); UMTRX_UHD_PTR_NAMESPACE::dynamic_pointer_cast<sph::recv_packet_streamer>(_rx_streamers[i].lock());
if (not my_streamer) continue; if (not my_streamer) continue;
my_streamer->set_tick_rate(rate); my_streamer->set_tick_rate(rate);
} }
for (size_t i = 0; i < _tx_streamers.size(); i++) for (size_t i = 0; i < _tx_streamers.size(); i++)
{ {
std::shared_ptr<sph::send_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::send_packet_streamer> my_streamer =
std::dynamic_pointer_cast<sph::send_packet_streamer>(_tx_streamers[i].lock()); UMTRX_UHD_PTR_NAMESPACE::dynamic_pointer_cast<sph::send_packet_streamer>(_tx_streamers[i].lock());
if (not my_streamer) continue; if (not my_streamer) continue;
my_streamer->set_tick_rate(rate); my_streamer->set_tick_rate(rate);
} }
@@ -228,7 +228,7 @@ uhd::rx_streamer::sptr umtrx_impl::get_rx_stream(const uhd::stream_args_t &args_
const size_t spp = unsigned(args.args.cast<double>("spp", bpp/bpi)); const size_t spp = unsigned(args.args.cast<double>("spp", bpp/bpi));
//make the new streamer given the samples per packet //make the new streamer given the samples per packet
std::shared_ptr<sph::recv_packet_streamer> my_streamer = std::make_shared<sph::recv_packet_streamer>(spp); UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::recv_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::make_shared<sph::recv_packet_streamer>(spp);
//init some streamer stuff //init some streamer stuff
my_streamer->resize(args.channels.size()); my_streamer->resize(args.channels.size());
@@ -454,7 +454,7 @@ uhd::tx_streamer::sptr umtrx_impl::get_tx_stream(const uhd::stream_args_t &args_
const size_t spp = bpp/convert::get_bytes_per_item(args.otw_format); const size_t spp = bpp/convert::get_bytes_per_item(args.otw_format);
//make the new streamer given the samples per packet //make the new streamer given the samples per packet
std::shared_ptr<sph::send_packet_streamer> my_streamer = std::make_shared<sph::send_packet_streamer>(spp); UMTRX_UHD_PTR_NAMESPACE::shared_ptr<sph::send_packet_streamer> my_streamer = UMTRX_UHD_PTR_NAMESPACE::make_shared<sph::send_packet_streamer>(spp);
//init some streamer stuff //init some streamer stuff
my_streamer->resize(args.channels.size()); my_streamer->resize(args.channels.size());