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/adf4001_ctrl.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/adf4001_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/common/adf4001_ctrl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/common/adf4001_ctrl.hpp b/host/lib/usrp/common/adf4001_ctrl.hpp index e801ae0c4..c6813f43c 100644 --- a/host/lib/usrp/common/adf4001_ctrl.hpp +++ b/host/lib/usrp/common/adf4001_ctrl.hpp @@ -25,7 +25,7 @@ #include "spi_core_3000.hpp" #include <uhd/types/serial.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/thread/thread.hpp> namespace uhd { namespace usrp { @@ -34,14 +34,14 @@ class adf4001_regs_t { public: /* Function prototypes */ - boost::uint32_t get_reg(boost::uint8_t addr); + uint32_t get_reg(uint8_t addr); adf4001_regs_t(void); /* Register values / addresses */ - boost::uint16_t ref_counter; //14 bits - boost::uint16_t n; //13 bits - boost::uint8_t charge_pump_current_1; //3 bits - boost::uint8_t charge_pump_current_2; //3 bits + uint16_t ref_counter; //14 bits + uint16_t n; //13 bits + uint8_t charge_pump_current_1; //3 bits + uint8_t charge_pump_current_2; //3 bits enum anti_backlash_width_t { ANTI_BACKLASH_WIDTH_2_9NS = 0, @@ -133,7 +133,7 @@ private: adf4001_regs_t adf4001_regs; void program_regs(void); - void write_reg(boost::uint8_t addr); + void write_reg(uint8_t addr); }; }} |