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/n230/n230_resource_manager.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/n230/n230_resource_manager.hpp')
| -rw-r--r-- | host/lib/usrp/n230/n230_resource_manager.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp index 0a1178bd2..180f4f437 100644 --- a/host/lib/usrp/n230/n230_resource_manager.hpp +++ b/host/lib/usrp/n230/n230_resource_manager.hpp @@ -108,7 +108,7 @@ public: //Methods } } - inline boost::uint32_t get_version(n230_ver_src_t src, n230_version_t type) { + inline uint32_t get_version(n230_ver_src_t src, n230_version_t type) { switch (src) { case FPGA: return _fpga_version.get(type); case FIRMWARE: return _fw_version.get(type); @@ -210,11 +210,11 @@ public: //Methods private: struct ver_info_t { - boost::uint8_t compat_major; - boost::uint16_t compat_minor; - boost::uint32_t version_hash; + uint8_t compat_major; + uint16_t compat_minor; + uint32_t version_hash; - boost::uint32_t get(n230_version_t type) { + uint32_t get(n230_version_t type) { switch (type) { case COMPAT_MAJOR: return compat_major; case COMPAT_MINOR: return compat_minor; @@ -281,7 +281,7 @@ private: static boost::mutex _claimer_mutex; //All claims and checks in this process are serialized //Transport - boost::uint8_t _last_host_enpoint; + uint8_t _last_host_enpoint; //Radio settings interface radio_ctrl_core_3000::sptr _core_ctrl; |