diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-09 18:38:39 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-09 18:38:39 -0800 |
| commit | 3bca8c492514564a065e34d3284cb468873fcc8c (patch) | |
| tree | 73f11afc14eb62ac1c1ff5374dce9c3cb33c0278 /host/lib/usrp/usrp2/clock_ctrl.cpp | |
| parent | 073518083f2c7044d4b0c16948a192c5623d0752 (diff) | |
| parent | c0dfc2cf47b98734c4218427c7c6f5eb92025a9c (diff) | |
| download | uhd-3bca8c492514564a065e34d3284cb468873fcc8c.tar.gz uhd-3bca8c492514564a065e34d3284cb468873fcc8c.tar.bz2 uhd-3bca8c492514564a065e34d3284cb468873fcc8c.zip | |
Merge branch 'master' into usrp_e_next
Diffstat (limited to 'host/lib/usrp/usrp2/clock_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index 1e1c9b7b8..232f3b32a 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.cpp @@ -20,6 +20,7 @@ #include "usrp2_regs.hpp" //spi slave constants #include <uhd/utils/assert.hpp> #include <boost/cstdint.hpp> +#include <boost/lexical_cast.hpp> #include <iostream> using namespace uhd; @@ -83,8 +84,8 @@ public: } void enable_mimo_clock_out(bool enb){ - //FIXME TODO put this revision read in a common place - boost::uint8_t rev_hi = _iface->read_eeprom(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV_MSB, 1).at(0); + boost::uint16_t rev = boost::lexical_cast<boost::uint16_t>(_iface->mb_eeprom["rev"]); + boost::uint8_t rev_hi = boost::uint8_t(rev >> 8); //calculate the low and high dividers size_t divider = size_t(this->get_master_clock_rate()/10e6); |