diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/common/max287x.hpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/common/max287x.hpp')
| -rw-r--r-- | host/lib/usrp/common/max287x.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/common/max287x.hpp b/host/lib/usrp/common/max287x.hpp index 540f5207f..9022e0f02 100644 --- a/host/lib/usrp/common/max287x.hpp +++ b/host/lib/usrp/common/max287x.hpp @@ -40,7 +40,7 @@ class max287x_iface public: typedef boost::shared_ptr<max287x_iface> sptr; - typedef boost::function<void(std::vector<boost::uint32_t>)> write_fn; + typedef boost::function<void(std::vector<uint32_t>)> write_fn; /** * LD Pin Modes @@ -207,7 +207,7 @@ public: * Set phase * @param phase the phase offset */ - virtual void set_phase(boost::uint16_t phase) = 0; + virtual void set_phase(uint16_t phase) = 0; /** * Write values configured by the set_* functions. @@ -251,7 +251,7 @@ public: virtual void set_clock_divider_mode(clock_divider_mode_t mode); virtual void set_cycle_slip_mode(bool enabled); virtual void set_low_noise_and_spur(low_noise_and_spur_t mode); - virtual void set_phase(boost::uint16_t phase); + virtual void set_phase(uint16_t phase); virtual void commit(); virtual bool can_sync(); virtual void config_for_sync(bool enable); @@ -877,7 +877,7 @@ void max287x<max287x_regs_t>::set_low_noise_and_spur(low_noise_and_spur_t mode) } template <typename max287x_regs_t> -void max287x<max287x_regs_t>::set_phase(boost::uint16_t phase) +void max287x<max287x_regs_t>::set_phase(uint16_t phase) { _regs.phase_12_bit = phase & 0xFFF; } @@ -885,26 +885,26 @@ void max287x<max287x_regs_t>::set_phase(boost::uint16_t phase) template <typename max287x_regs_t> void max287x<max287x_regs_t>::commit() { - std::vector<boost::uint32_t> regs; - std::set<boost::uint32_t> changed_regs; + std::vector<uint32_t> regs; + std::set<uint32_t> changed_regs; // Get only regs with changes if (_write_all_regs) { for (int addr = 5; addr >= 0; addr--) - regs.push_back(_regs.get_reg(boost::uint32_t(addr))); + regs.push_back(_regs.get_reg(uint32_t(addr))); } else { try { - changed_regs = _regs.template get_changed_addrs<boost::uint32_t> (); + changed_regs = _regs.template get_changed_addrs<uint32_t> (); for (int addr = 5; addr >= 0; addr--) { - if (changed_regs.find(boost::uint32_t(addr)) != changed_regs.end()) - regs.push_back(_regs.get_reg(boost::uint32_t(addr))); + if (changed_regs.find(uint32_t(addr)) != changed_regs.end()) + regs.push_back(_regs.get_reg(uint32_t(addr))); } } catch (uhd::runtime_error&) { // No saved state - write all regs for (int addr = 5; addr >= 0; addr--) - regs.push_back(_regs.get_reg(boost::uint32_t(addr))); + regs.push_back(_regs.get_reg(uint32_t(addr))); } } |