aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2/dboard_iface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_iface.cpp')
-rw-r--r--host/lib/usrp/usrp2/dboard_iface.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp
index 2621d43b4..feee0a970 100644
--- a/host/lib/usrp/usrp2/dboard_iface.cpp
+++ b/host/lib/usrp/usrp2/dboard_iface.cpp
@@ -33,7 +33,7 @@ using namespace boost::assign;
class usrp2_dboard_iface : public dboard_iface{
public:
- usrp2_dboard_iface(usrp2_iface::sptr iface, clock_ctrl::sptr clock_ctrl);
+ usrp2_dboard_iface(usrp2_iface::sptr iface, usrp2_clock_ctrl::sptr clock_ctrl);
~usrp2_dboard_iface(void);
void write_aux_dac(unit_t, int, float);
@@ -68,7 +68,7 @@ public:
private:
usrp2_iface::sptr _iface;
- clock_ctrl::sptr _clock_ctrl;
+ usrp2_clock_ctrl::sptr _clock_ctrl;
boost::uint32_t _ddr_shadow;
boost::uint32_t _gpio_shadow;
@@ -81,7 +81,7 @@ private:
**********************************************************************/
dboard_iface::sptr make_usrp2_dboard_iface(
usrp2_iface::sptr iface,
- clock_ctrl::sptr clock_ctrl
+ usrp2_clock_ctrl::sptr clock_ctrl
){
return dboard_iface::sptr(new usrp2_dboard_iface(iface, clock_ctrl));
}
@@ -89,7 +89,10 @@ dboard_iface::sptr make_usrp2_dboard_iface(
/***********************************************************************
* Structors
**********************************************************************/
-usrp2_dboard_iface::usrp2_dboard_iface(usrp2_iface::sptr iface, clock_ctrl::sptr clock_ctrl){
+usrp2_dboard_iface::usrp2_dboard_iface(
+ usrp2_iface::sptr iface,
+ usrp2_clock_ctrl::sptr clock_ctrl
+){
_iface = iface;
_clock_ctrl = clock_ctrl;
_ddr_shadow = 0;
@@ -114,7 +117,7 @@ usrp2_dboard_iface::~usrp2_dboard_iface(void){
* Clocks
**********************************************************************/
double usrp2_dboard_iface::get_clock_rate(unit_t){
- return _iface->get_master_clock_freq();
+ return _clock_ctrl->get_master_clock_rate();
}
void usrp2_dboard_iface::set_clock_enabled(unit_t unit, bool enb){