summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-05-09 01:12:49 +0100
committerJosh Blum <josh@joshknows.com>2011-05-09 01:12:49 +0100
commitd11bb4e7ba957f14c6449f519576ab7cd85b60bd (patch)
treed00d49581cffa254fd6aa87a1a626e3fde05d593
parent6855e940f5cfa24de2e1ba294bd8b8f833967e85 (diff)
downloaduhd-d11bb4e7ba957f14c6449f519576ab7cd85b60bd.tar.gz
uhd-d11bb4e7ba957f14c6449f519576ab7cd85b60bd.tar.bz2
uhd-d11bb4e7ba957f14c6449f519576ab7cd85b60bd.zip
usrp-e100: added soft sync for ad9522 clock control
-rw-r--r--host/lib/usrp/usrp_e100/clock_ctrl.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e100/clock_ctrl.cpp b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
index 460fc5548..968c2ea04 100644
--- a/host/lib/usrp/usrp_e100/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
@@ -181,6 +181,7 @@ public:
_ad9522_regs.ld_pin_control = 0x00; //dld
_ad9522_regs.refmon_pin_control = 0x12; //show ref2
_ad9522_regs.lock_detect_counter = ad9522_regs_t::LOCK_DETECT_COUNTER_16CYC;
+ _ad9522_regs.divider0_ignore_sync = 1; // master FPGA clock ignores sync (always on, cannot be disabled by sync pulse)
this->use_internal_ref();
@@ -358,7 +359,7 @@ public:
);
this->send_reg(0x199);
this->send_reg(0x19a);
- this->latch_regs();
+ this->soft_sync();
}
double get_rx_clock_rate(void){
@@ -393,7 +394,7 @@ public:
);
this->send_reg(0x196);
this->send_reg(0x197);
- this->latch_regs();
+ this->soft_sync();
}
double get_tx_clock_rate(void){
@@ -486,6 +487,15 @@ private:
UHD_MSG(error) << "USRP-E100 clock control: lock detection timeout" << std::endl;
}
+ void soft_sync(void){
+ _ad9522_regs.soft_sync = 1;
+ this->send_reg(0x230);
+ this->latch_regs();
+ _ad9522_regs.soft_sync = 0;
+ this->send_reg(0x230);
+ this->latch_regs();
+ }
+
void send_all_regs(void){
//setup a list of register ranges to write
typedef std::pair<boost::uint16_t, boost::uint16_t> range_t;