summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-12-04 15:41:24 -0800
committerJosh Blum <josh@joshknows.com>2012-12-04 15:41:24 -0800
commited1afe02d02b6bb8fe760807bfc96e15108f10de (patch)
treea9b638e2ee35b327245b83ed6abcfc29ab10e0eb
parent011f63d19d6c614666ba7ee145b0685d36a8a0de (diff)
downloaduhd-ed1afe02d02b6bb8fe760807bfc96e15108f10de.tar.gz
uhd-ed1afe02d02b6bb8fe760807bfc96e15108f10de.tar.bz2
uhd-ed1afe02d02b6bb8fe760807bfc96e15108f10de.zip
xcvr2450: created xcvr2450 r21 that uses external divider
-rw-r--r--host/lib/usrp/dboard/db_xcvr2450.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 439e1b35e..af5af6894 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -190,6 +190,7 @@ static dboard_base::sptr make_xcvr2450(dboard_base::ctor_args_t args){
UHD_STATIC_BLOCK(reg_xcvr2450_dboard){
//register the factory function for the rx and tx dbids
dboard_manager::register_dboard(0x0061, 0x0060, &make_xcvr2450, "XCVR2450");
+ dboard_manager::register_dboard(0x0061, 0x0059, &make_xcvr2450, "XCVR2450 - r2.1");
}
/***********************************************************************
@@ -370,7 +371,7 @@ double xcvr2450::set_lo_freq_core(double target_freq){
//variables used in the calculation below
double scaler = xcvr2450::is_highband(target_freq)? (4.0/5.0) : (4.0/3.0);
- double ref_freq = this->get_iface()->get_clock_rate(dboard_iface::UNIT_TX);
+ double ref_freq = this->get_iface()->get_codec_rate(dboard_iface::UNIT_TX);
int R, intdiv, fracdiv;
//loop through values until we get a match
@@ -410,6 +411,16 @@ double xcvr2450::set_lo_freq_core(double target_freq){
//new band select settings and ad9515 divider
this->update_atr();
+ const bool div_ext(this->get_tx_id == 0x0059);
+ if (div_ext)
+ {
+ this->set_clock_rate(dboard_iface::UNIT_TX, ref_freq/_ad9515div);
+ }
+ else
+ {
+ this->set_clock_rate(dboard_iface::UNIT_TX, ref_freq);
+ }
+
//load new counters into registers
_max2829_regs.int_div_ratio_word = intdiv;
_max2829_regs.frac_div_ratio_lsb = fracdiv & 0x3;