diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-08-31 16:45:49 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-31 16:45:49 -0700 |
commit | 0616872e35ac6429c19c2495bf4e378551bdd60e (patch) | |
tree | 6116f992f4f6d1f8d701aca6bf1526a85d8bda89 /host/lib/usrp/usrp1/dboard_iface.cpp | |
parent | b96088b692a5c44974919ee36e253b6ea8c51972 (diff) | |
parent | 9a3217cbbeb39d677a439fe0982a7ac4d7f251c2 (diff) | |
download | uhd-0616872e35ac6429c19c2495bf4e378551bdd60e.tar.gz uhd-0616872e35ac6429c19c2495bf4e378551bdd60e.tar.bz2 uhd-0616872e35ac6429c19c2495bf4e378551bdd60e.zip |
Merge branch 'usrp1' of ettus.sourcerepo.com:ettus/uhdpriv into usrp1
Diffstat (limited to 'host/lib/usrp/usrp1/dboard_iface.cpp')
-rw-r--r-- | host/lib/usrp/usrp1/dboard_iface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp index b2221e221..4791b55ce 100644 --- a/host/lib/usrp/usrp1/dboard_iface.cpp +++ b/host/lib/usrp/usrp1/dboard_iface.cpp @@ -49,8 +49,8 @@ public: _codec = codec; //init the clock rate shadows - this->set_clock_rate(UNIT_RX, _clock->get_master_clock_freq()); - this->set_clock_rate(UNIT_TX, _clock->get_master_clock_freq()); + this->set_clock_rate(UNIT_RX, this->get_clock_rates(UNIT_RX).front()); + this->set_clock_rate(UNIT_TX, this->get_clock_rates(UNIT_TX).front()); } ~usrp1_dboard_iface() @@ -134,7 +134,7 @@ void usrp1_dboard_iface::set_clock_rate(unit_t unit, double rate) _clock_rates[unit] = rate; if (unit == UNIT_RX && _rx_dboard_id == dbsrx_classic_id){ - size_t divider = size_t(rate/_clock->get_master_clock_freq()); + size_t divider = size_t(_clock->get_master_clock_freq()/rate); switch(_dboard_slot){ case usrp1_impl::DBOARD_SLOT_A: _iface->poke32(FR_RX_A_REFCLK, (divider & 0x7f) | 0x80); |