diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-11 12:19:03 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-11 12:19:03 -0800 |
commit | e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd (patch) | |
tree | 40276e2499f25816ba14456b8439b7caf9783c0d /host/lib/usrp/dboard | |
parent | b7b3e8288dcd64e47c242edbc5b009b9300615a2 (diff) | |
download | uhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.tar.gz uhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.tar.bz2 uhd-e0d84e8c8b4f0bb9fec22b48b7c61b9ca3eb8dbd.zip |
uhd: pulled in some worthwhile changes from flow control branch
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 5 | ||||
-rw-r--r-- | host/lib/usrp/dboard/db_dbsrx.cpp | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index f03dd43d1..73f894374 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -106,6 +106,11 @@ UHD_STATIC_BLOCK(reg_basic_and_lf_dboards){ **********************************************************************/ basic_rx::basic_rx(ctor_args_t args, double max_freq) : rx_dboard_base(args){ _max_freq = max_freq; + + //set GPIOs to output 0x0000 to decrease noise pickup + this->get_iface()->set_pin_ctrl(dboard_iface::UNIT_RX, 0x0000); + this->get_iface()->set_gpio_ddr(dboard_iface::UNIT_RX, 0xFFFF); + this->get_iface()->write_gpio(dboard_iface::UNIT_RX, 0x0000); } basic_rx::~basic_rx(void){ diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp index 85251bdf9..aa3eeb6b5 100644 --- a/host/lib/usrp/dboard/db_dbsrx.cpp +++ b/host/lib/usrp/dboard/db_dbsrx.cpp @@ -374,6 +374,9 @@ void dbsrx::set_lo_freq(double target_freq){ //update vco selection and check vtune send_reg(0x2, 0x2); read_reg(0x0, 0x0); + + //allow for setup time before checking condition again + boost::this_thread::sleep(boost::posix_time::milliseconds(1)); } if(dbsrx_debug) std::cerr << boost::format( |