aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/x300
diff options
context:
space:
mode:
authorAshish Chaudhari <ashish@ettus.com>2016-05-06 12:21:41 -0700
committerAshish Chaudhari <ashish@ettus.com>2016-05-16 11:52:06 -0700
commit36075f38e6c8b4f641ba3d1fd97cfd72dcc05e7b (patch)
tree694ac18f5eaf6e10cfa1c664e31a66a99535acce /host/lib/usrp/x300
parent1c9aea4e15d7e68be56529b78050910ca73b8d0e (diff)
downloaduhd-36075f38e6c8b4f641ba3d1fd97cfd72dcc05e7b.tar.gz
uhd-36075f38e6c8b4f641ba3d1fd97cfd72dcc05e7b.tar.bz2
uhd-36075f38e6c8b4f641ba3d1fd97cfd72dcc05e7b.zip
dboard_iface: Added FE name input to set_fe_connection
- A dboard_base class can have multiple frontends (subdevs) and the set_fe_connection needs to be able to distinguish between them
Diffstat (limited to 'host/lib/usrp/x300')
-rw-r--r--host/lib/usrp/x300/x300_dboard_iface.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/host/lib/usrp/x300/x300_dboard_iface.cpp b/host/lib/usrp/x300/x300_dboard_iface.cpp
index 884848624..87f537874 100644
--- a/host/lib/usrp/x300/x300_dboard_iface.cpp
+++ b/host/lib/usrp/x300/x300_dboard_iface.cpp
@@ -1,5 +1,5 @@
//
-// Copyright 2013,2015 Ettus Research LLC
+// Copyright 2013,2015,2016 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -80,7 +80,11 @@ public:
boost::uint32_t data,
size_t num_bits
);
- void set_fe_connection(unit_t unit, const fe_connection_t& fe_conn);
+ void set_fe_connection(
+ unit_t unit,
+ const std::string& fe_name,
+ const fe_connection_t& fe_conn
+ );
const x300_dboard_iface_config_t _config;
uhd::dict<unit_t, ad5623_regs_t> _dac_regs;
@@ -371,7 +375,9 @@ void x300_dboard_iface::set_command_time(const uhd::time_spec_t& t)
_config.cmd_time_ctrl->set_time(t);
}
-void x300_dboard_iface::set_fe_connection(unit_t unit, const fe_connection_t& fe_conn)
+void x300_dboard_iface::set_fe_connection(
+ unit_t unit, const std::string& /*fe_name*/,
+ const fe_connection_t& fe_conn)
{
if (unit == UNIT_RX) {
_config.rx_dsp->set_mux(fe_conn);