mirror of
https://github.com/RangeNetworks/openbts.git
synced 2025-10-23 16:13:52 +00:00
Matching UHD changes in gnuradio
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2817 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
#include "Threads.h"
|
#include "Threads.h"
|
||||||
#include "Logger.h"
|
#include "Logger.h"
|
||||||
#include <uhd/property_tree.hpp>
|
#include <uhd/property_tree.hpp>
|
||||||
#include <uhd/usrp/single_usrp.hpp>
|
#include <uhd/usrp/multi_usrp.hpp>
|
||||||
#include <uhd/utils/thread_priority.hpp>
|
#include <uhd/utils/thread_priority.hpp>
|
||||||
#include <uhd/utils/msg.hpp>
|
#include <uhd/utils/msg.hpp>
|
||||||
|
|
||||||
@@ -202,7 +202,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uhd::usrp::single_usrp::sptr usrp_dev;
|
uhd::usrp::multi_usrp::sptr usrp_dev;
|
||||||
enum busType bus;
|
enum busType bus;
|
||||||
|
|
||||||
double desired_smpl_rt, actual_smpl_rt;
|
double desired_smpl_rt, actual_smpl_rt;
|
||||||
@@ -437,7 +437,7 @@ bool uhd_device::open()
|
|||||||
// Use the first found device
|
// Use the first found device
|
||||||
LOG(INFO) << "Using discovered UHD device " << dev_addrs[0].to_string();
|
LOG(INFO) << "Using discovered UHD device " << dev_addrs[0].to_string();
|
||||||
try {
|
try {
|
||||||
usrp_dev = uhd::usrp::single_usrp::make(dev_addrs[0]);
|
usrp_dev = uhd::usrp::multi_usrp::make(dev_addrs[0]);
|
||||||
} catch(...) {
|
} catch(...) {
|
||||||
LOG(ALERT) << "UHD make failed";
|
LOG(ALERT) << "UHD make failed";
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user