summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-30 18:42:45 -0700
committerJosh Blum <josh@joshknows.com>2010-08-30 18:42:45 -0700
commitaf0543a8b72e924c26503d838976e249d8ca6fbb (patch)
tree7d2064ea7f1243755aec5145fc5f1e6fb265ec1f /host/lib/usrp/usrp1
parentf5c62a46cbc44e254c0214b463d51f06675c17ab (diff)
downloaduhd-af0543a8b72e924c26503d838976e249d8ca6fbb.tar.gz
uhd-af0543a8b72e924c26503d838976e249d8ca6fbb.tar.bz2
uhd-af0543a8b72e924c26503d838976e249d8ca6fbb.zip
usrp1: work on gpio clock divider for dbsrx, still not locking
Diffstat (limited to 'host/lib/usrp/usrp1')
-rw-r--r--host/lib/usrp/usrp1/dboard_iface.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp1/dboard_iface.cpp b/host/lib/usrp/usrp1/dboard_iface.cpp
index b2221e221..454de3ece 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,14 +134,14 @@ 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);
+ _iface->poke32(FR_RX_A_REFCLK, (2*divider & 0x7f) | 0x80);
break;
case usrp1_impl::DBOARD_SLOT_B:
- _iface->poke32(FR_RX_B_REFCLK, (divider & 0x7f) | 0x80);
+ _iface->poke32(FR_RX_B_REFCLK, (2*divider & 0x7f) | 0x80);
break;
}
}
@@ -151,7 +151,7 @@ std::vector<double> usrp1_dboard_iface::get_clock_rates(unit_t unit)
{
std::vector<double> rates;
if (unit == UNIT_RX && _rx_dboard_id == dbsrx_classic_id){
- for (size_t div = 1; div <= 127; div++)
+ for (size_t div = 8; div <= 127; div++)
rates.push_back(_clock->get_master_clock_freq() / div);
}
else{